Revert unnecessary earlier change

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.

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))