* lisp/emacs-lisp/lisp-mode.el (lisp-mode-variables): Unbreak bootstrap.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 861b3ba..b93d9ff 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+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 f1eae18..0b02c2f 100644 (file)
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -474,9 +474,10 @@ font-lock keywords will not be case sensitive."
           . lisp-font-lock-syntactic-face-function)))
   (setq-local prettify-symbols-alist lisp--prettify-symbols-alist)
   ;; electric
-  (when elisp
-    (setq-local electric-pair-text-pairs
-                (cons '(?\` . ?\') electric-pair-text-pairs)))
+  (and elisp
+       (boundp 'electric-pair-text-pairs)
+       (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))