bug#36570: [PATCH] Fix warning in electric-tests.el

bug#36570: [PATCH] Fix warning in electric-tests.el

[Stefan Kangas]

This patch fixes this warning in make check:

  ELC      lisp/electric-tests.elc

In plainer-c-mode:
lisp/electric-tests.el:898:37:Warning: function `plainer-c-mode' defined
    multiple times in this file

(I'll send the patch in a separate message once this is assigned a bug
number.)

Thanks,
Stefan Kangas

bug#36570: [PATCH] Fix warning in electric-tests.el

[Stefan Kangas]

[-- Attachment #1: Type: text/plain, Size: 166 bytes --]

Stefan Kangas <stefan@marxist.se> writes:
> (I'll send the patch in a separate message once this is assigned a bug
> number.)

Patch attached.

Thanks,
Stefan Kangas

[-- Attachment #2: 0001-Fix-warning-in-electric-tests.el-Bug-36570.patch --]
[-- Type: application/octet-stream, Size: 1215 bytes --]

From 56c759adb5cc101112257fdfb3a2f9d00b2d716d Mon Sep 17 00:00:00 2001
From: Stefan Kangas <stefankangas@gmail.com>
Date: Wed, 10 Jul 2019 03:50:48 +0200
Subject: [PATCH] Fix warning in electric-tests.el (Bug#36570)

* test/lisp/electric-tests.el (plainer-c-mode): Remove duplicate
definition.
---
 test/lisp/electric-tests.el | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/test/lisp/electric-tests.el b/test/lisp/electric-tests.el
index 86c9eff9cd..0e4ac99052 100644
--- a/test/lisp/electric-tests.el
+++ b/test/lisp/electric-tests.el
@@ -895,15 +895,6 @@ electric-layout-control-reindentation
     (call-interactively 'newline)
     (should (equal (buffer-string) "int main () {\n\n  \n}"))))
 
-(define-derived-mode plainer-c-mode c-mode "pC"
-  "A plainer/saner C-mode with no internal electric machinery."
-  (c-toggle-electric-state -1)
-  (setq-local electric-indent-local-mode-hook nil)
-  (setq-local electric-indent-mode-hook nil)
-  (electric-indent-local-mode 1)
-  (dolist (key '(?\" ?\' ?\{ ?\} ?\( ?\) ?\[ ?\]))
-    (local-set-key (vector key) 'self-insert-command)))
-
 (ert-deftest electric-modes-int-main-allman-style ()
   (ert-with-test-buffer ()
     (plainer-c-mode)
-- 
2.21.0

bug#36570: [PATCH] Fix warning in electric-tests.el

[Basil L. Contovounesios]

tags 36570 fixed
close 36570 27.1
quit

Stefan Kangas <stefan@marxist.se> writes:

> Patch attached.

Thanks, I pushed it to master[1] and am therefore closing this report.

[1]: Fix warning in electric-tests.el (Bug#36570)
faedbe4665 2019-07-10 11:11:39 +0100
https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=faedbe46654e10c92c30e9f4ea847e682668b249

> Subject: [PATCH] Fix warning in electric-tests.el (Bug#36570)
>
> * test/lisp/electric-tests.el (plainer-c-mode): Remove duplicate
> definition.

This seems to have been caused by an accidental commit and its
subsequent revert.

-- 
Basil