* lisp/electric.el (electric-pair-post-self-insert-function): Let user

turn it off buffer-locally.

Fixes: debbugs:9932

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 83a27336855360eb8c22044e09b0a2443cabbd8d..8f00ef7077637cb0d6dfa6081043f0c2faf4b817 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2011-11-09  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * electric.el (electric-pair-post-self-insert-function): Let user
+       turn it off buffer-locally (bug#9932).
+
        * progmodes/python.el (python-beginning-of-statement):
        Rewrite (bug#2703).
 

diff --git a/lisp/electric.el b/lisp/electric.el
index 26fba20ea129b365b7cfe7f34129b0ed268d6ec5..3d7c1fd8ac461fca97a67a8032f3fa376e200cc3 100644 (file)
--- a/lisp/electric.el
+++ b/lisp/electric.el
@@ -284,6 +284,7 @@ This can be convenient for people who find it easier to hit ) than C-f."
 
 (defun electric-pair-post-self-insert-function ()
   (let* ((syntax (and (eq (char-before) last-command-event) ; Sanity check.
+                      electric-pair-mode
                       (let ((x (assq last-command-event electric-pair-pairs)))
                         (cond
                          (x (if (eq (car x) (cdr x)) ?\" ?\())