summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2013-12-27 12:24:25 -0800
committerGlenn Morris <rgm@gnu.org>2013-12-27 12:24:25 -0800
commitb1797e3eebf2f5c428a187d41dfa3dd7a396a505 (patch)
treeed61f800698a95cf59cc9a94628ba2155960b171 /lisp/emacs-lisp
parent5eedd0b92daed0c4178a5bea79e95962edd0874b (diff)
downloademacs-b1797e3eebf2f5c428a187d41dfa3dd7a396a505.tar.gz
* lisp/emacs-lisp/lisp-mode.el (lisp-mode-variables): Unbreak bootstrap.
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/lisp-mode.el7
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index f1eae18c507..0b02c2f8c16 100644
--- 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))