[Emacs-diffs] trunk r115136: * lisp/electric.el (electric-indent-mode-map): Remove.

[Stefan Monnier]

------------------------------------------------------------
revno: 115136
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=15915
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Sun 2013-11-17 21:01:34 -0500
message:
  * lisp/electric.el (electric-indent-mode-map): Remove.
  (electric-indent-mode): Change the global-map instead.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/electric.el               electric.el-20091113204419-o5vbwnq5f7feedwu-47

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-11-18 01:48:46 +0000
+++ b/lisp/ChangeLog    2013-11-18 02:01:34 +0000
@@ -1,6 +1,10 @@
 2013-11-18  Stefan Monnier  <address@hidden>
 
-       * textmodes/text-mode.el (paragraph-indent-minor-mode): Use 
add-function.
+       * electric.el (electric-indent-mode-map): Remove.
+       (electric-indent-mode): Change the global-map instead (bug#15915).
+
+       * textmodes/text-mode.el (paragraph-indent-minor-mode):
+       Use add-function.
 
 2013-11-17  Stefan Monnier  <address@hidden>
 

=== modified file 'lisp/electric.el'
--- a/lisp/electric.el  2013-11-06 03:37:03 +0000
+++ b/lisp/electric.el  2013-11-18 02:01:34 +0000
@@ -273,12 +273,6 @@
   (let ((electric-indent-mode nil))
     (newline arg 'interactive)))
 
-(defvar electric-indent-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map [?\C-j] 'electric-indent-just-newline)
-    map)
-  "Keymap used for `electric-mode-mode'.")
-
 ;;;###autoload
 (define-minor-mode electric-indent-mode
   "Toggle on-the-fly reindentation (Electric Indent mode).
@@ -291,8 +285,14 @@
 insert a character from `electric-indent-chars'."
   :global t :group 'electricity
   (if (not electric-indent-mode)
-      (remove-hook 'post-self-insert-hook
-                   #'electric-indent-post-self-insert-function)
+      (progn
+        (when (eq (lookup-key global-map [?\C-j])
+                  'electric-indent-just-newline)
+          (define-key global-map [?\C-j] 'newline-and-indent))
+        (remove-hook 'post-self-insert-hook
+                     #'electric-indent-post-self-insert-function))
+    (when (eq (lookup-key global-map [?\C-j]) 'newline-and-indent)
+      (define-key global-map [?\C-j] 'electric-indent-just-newline))
     ;; post-self-insert-hooks interact in non-trivial ways.
     ;; It turns out that electric-indent-mode generally works better if run
     ;; late, but still before blink-paren.