Revert unnecessary earlier change

2 files changed, 3 insertions, 8 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 988322d4f40..573b326058c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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  <rgm@gnu.org>
-
-        * emacs-lisp/lisp-mode.el (lisp-mode-variables): Unbreak bootstrap.
-
 2013-12-27  Lars Ingebrigtsen  <larsi@gnus.org>
 
         * net/shr.el (shr-insert): Don't infloop if the width is zero.
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index 0b02c2f8c16..f1eae18c507 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -474,10 +474,9 @@ font-lock keywords will not be case sensitive."
            . 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))