From b1797e3eebf2f5c428a187d41dfa3dd7a396a505 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 27 Dec 2013 12:24:25 -0800 Subject: [PATCH] * lisp/emacs-lisp/lisp-mode.el (lisp-mode-variables): Unbreak bootstrap. --- lisp/ChangeLog | 4 ++++ lisp/emacs-lisp/lisp-mode.el | 7 ++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 861b3ba3d60..b93d9ff4e98 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2013-12-27 Glenn Morris + + * emacs-lisp/lisp-mode.el (lisp-mode-variables): Unbreak bootstrap. + 2013-12-27 Lars Ingebrigtsen * 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 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)) -- 2.39.2