From 39e6692efe6797c4462a9b0cd0177c289fa9989b Mon Sep 17 00:00:00 2001 From: Noam Postavsky Date: Thu, 17 Aug 2017 07:06:47 -0400 Subject: [PATCH] * lisp/elec-pair.el (electric-pair-text-pairs): Don't autoload (Bug#24901). * lisp/progmodes/elisp-mode.el (emacs-lisp-mode): Require `elec-pair' explicitly in the interactive case. --- lisp/elec-pair.el | 1 - lisp/progmodes/elisp-mode.el | 9 ++++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lisp/elec-pair.el b/lisp/elec-pair.el index 87e82e24fb1..f990851185b 100644 --- a/lisp/elec-pair.el +++ b/lisp/elec-pair.el @@ -42,7 +42,6 @@ See also the variable `electric-pair-text-pairs'." :group 'electricity :type '(repeat (cons character character))) -;;;###autoload (defcustom electric-pair-text-pairs '((?\" . ?\" ) ((nth 0 electric-quote-chars) . (nth 1 electric-quote-chars)) diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el index 47739f59572..0bf88579601 100644 --- a/lisp/progmodes/elisp-mode.el +++ b/lisp/progmodes/elisp-mode.el @@ -231,9 +231,12 @@ Blank lines separate paragraphs. Semicolons start comments. (defvar project-vc-external-roots-function) (lisp-mode-variables nil nil 'elisp) (add-hook 'after-load-functions #'elisp--font-lock-flush-elisp-buffers) - (setq-local electric-pair-text-pairs - (append '((?\` . ?\') (?‘ . ?’)) electric-pair-text-pairs)) - (setq-local electric-quote-string t) + (unless noninteractive + (require 'elec-pair) + (defvar electric-pair-text-pairs) + (setq-local electric-pair-text-pairs + (append '((?\` . ?\') (?‘ . ?’)) electric-pair-text-pairs)) + (setq-local electric-quote-string t)) (setq imenu-case-fold-search nil) (add-function :before-until (local 'eldoc-documentation-function) #'elisp-eldoc-documentation-function) -- 2.39.2