From cf6057cb5bf6a44d718349776e370b225bc7079f Mon Sep 17 00:00:00 2001 From: Noam Postavsky Date: Sun, 7 Jul 2019 12:22:37 -0400 Subject: [PATCH] Don't load elec-pair in elisp-mode (Bug#36539) * lisp/progmodes/elisp-mode.el (emacs-lisp-set-electric-text-pairs): New function. (emacs-lisp-mode): Add it to electric-pair-mode-hook. --- lisp/progmodes/elisp-mode.el | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el index c86277a309..7c77c34b50 100644 --- a/lisp/progmodes/elisp-mode.el +++ b/lisp/progmodes/elisp-mode.el @@ -233,6 +233,12 @@ emacs-lisp-mode-hook :type 'hook :group 'lisp) +(defun emacs-lisp-set-electric-text-pairs () + (defvar electric-pair-text-pairs) + (setq-local electric-pair-text-pairs + (append '((?\` . ?\') (?‘ . ?’)) electric-pair-text-pairs)) + (remove-hook 'electric-pair-mode-hook #'emacs-lisp-set-electric-text-pairs t)) + ;;;###autoload (define-derived-mode emacs-lisp-mode prog-mode "Emacs-Lisp" "Major mode for editing Lisp code to run in Emacs. @@ -245,12 +251,8 @@ emacs-lisp-mode (defvar project-vc-external-roots-function) (lisp-mode-variables nil nil 'elisp) (add-hook 'after-load-functions #'elisp--font-lock-flush-elisp-buffers) - (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)) + (add-hook 'electric-pair-mode-hook #'emacs-lisp-set-electric-text-pairs t) + (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.11.0