From a96f9ed05edfe619f7bc4edf5485c937e3df4d1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20T=C3=A1vora?= Date: Thu, 17 Aug 2017 10:44:38 +0100 Subject: [PATCH 2/2] Fix default value of electric-pair-pairs and electric-pair-text-pairs Fixes: debbugs:24901 A previous change, titled "Add support for curly quotation marks to electric-pair-mode", attempted to add these characters to the default value of these variables. But it did so in a quoted list, preventing evaluation of the relevant expressions and resulting in an invalid format. * lisp/elec-pair.el (electric-pair-pairs): Use backquote and comma. (electric-pair-text-pairs): Use backquote and comma. --- lisp/elec-pair.el | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lisp/elec-pair.el b/lisp/elec-pair.el index f990851185..236f5f1283 100644 --- a/lisp/elec-pair.el +++ b/lisp/elec-pair.el @@ -28,9 +28,9 @@ ;;; Electric pairing. (defcustom electric-pair-pairs - '((?\" . ?\") - ((nth 0 electric-quote-chars) . (nth 1 electric-quote-chars)) - ((nth 2 electric-quote-chars) . (nth 3 electric-quote-chars))) + `((?\" . ?\") + (,(nth 0 electric-quote-chars) . ,(nth 1 electric-quote-chars)) + (,(nth 2 electric-quote-chars) . ,(nth 3 electric-quote-chars))) "Alist of pairs that should be used regardless of major mode. Pairs of delimiters in this list are a fallback in case they have @@ -43,9 +43,9 @@ electric-pair-pairs :type '(repeat (cons character character))) (defcustom electric-pair-text-pairs - '((?\" . ?\" ) - ((nth 0 electric-quote-chars) . (nth 1 electric-quote-chars)) - ((nth 2 electric-quote-chars) . (nth 3 electric-quote-chars))) + `((?\" . ?\" ) + (,(nth 0 electric-quote-chars) . ,(nth 1 electric-quote-chars)) + (,(nth 2 electric-quote-chars) . ,(nth 3 electric-quote-chars))) "Alist of pairs that should always be used in comments and strings. Pairs of delimiters in this list are a fallback in case they have -- 2.11.0