[Emacs-diffs] trunk r115777: Revert unnecessary earlier change

[Glenn Morris]

------------------------------------------------------------
revno: 115777
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2013-12-27 16:03:17 -0800
message:
  Revert unnecessary earlier change
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/emacs-lisp/lisp-mode.el   lispmode.el-20091113204419-o5vbwnq5f7feedwu-205

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-12-27 20:58:21 +0000
+++ b/lisp/ChangeLog    2013-12-28 00:03:17 +0000
@@ -4,10 +4,6 @@
        the current buffer's directory, on systems in which this behaviour
        is the default (windows-nt, ms-dos).
 
-2013-12-27  Glenn Morris  <address@hidden>
-
-       * emacs-lisp/lisp-mode.el (lisp-mode-variables): Unbreak bootstrap.
-
 2013-12-27  Lars Ingebrigtsen  <address@hidden>
 
        * net/shr.el (shr-insert): Don't infloop if the width is zero.

=== modified file 'lisp/emacs-lisp/lisp-mode.el'
--- a/lisp/emacs-lisp/lisp-mode.el      2013-12-27 20:24:25 +0000
+++ b/lisp/emacs-lisp/lisp-mode.el      2013-12-28 00:03:17 +0000
@@ -474,10 +474,9 @@
           . lisp-font-lock-syntactic-face-function)))
   (setq-local prettify-symbols-alist lisp--prettify-symbols-alist)
   ;; electric
-  (and elisp
-       (boundp 'electric-pair-text-pairs)
-       (setq-local electric-pair-text-pairs
-                  (cons '(?\` . ?\') electric-pair-text-pairs)))
+  (when elisp
+    (setq-local electric-pair-text-pairs
+                (cons '(?\` . ?\') electric-pair-text-pairs)))
   (setq-local electric-pair-skip-whitespace 'chomp)
   (setq-local electric-pair-open-newline-between-pairs nil))