summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2013-12-27 16:03:17 -0800
committerGlenn Morris <rgm@gnu.org>2013-12-27 16:03:17 -0800
commitf1a85e52c8aac3d84a723b0da7402450a463baa0 (patch)
tree5db0b294d5c5445f986dcd853adf005b089c518d /lisp/emacs-lisp
parent9cadbf5a9330759892197a6932ad41e805194fc5 (diff)
downloademacs-f1a85e52c8aac3d84a723b0da7402450a463baa0.tar.gz
emacs-f1a85e52c8aac3d84a723b0da7402450a463baa0.tar.bz2
emacs-f1a85e52c8aac3d84a723b0da7402450a463baa0.zip
Revert unnecessary earlier change
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/lisp-mode.el7
1 files changed, 3 insertions, 4 deletions
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))