diff options
| author | João Távora | 2017-08-17 10:44:38 +0100 |
|---|---|---|
| committer | João Távora | 2017-08-18 23:43:48 +0100 |
| commit | 7098823b422c8334ef34664a9033b519f73ea7e1 (patch) | |
| tree | b1734a450fc2dfe2e915db5e83c6f013ba40bc98 | |
| parent | 39e6692efe6797c4462a9b0cd0177c289fa9989b (diff) | |
| download | emacs-7098823b422c8334ef34664a9033b519f73ea7e1.tar.gz emacs-7098823b422c8334ef34664a9033b519f73ea7e1.zip | |
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, electric-pair-text-pairs):
Use backquote and comma.
| -rw-r--r-- | lisp/elec-pair.el | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lisp/elec-pair.el b/lisp/elec-pair.el index f990851185b..2a4895eb2bf 100644 --- a/lisp/elec-pair.el +++ b/lisp/elec-pair.el | |||
| @@ -28,9 +28,9 @@ | |||
| 28 | ;;; Electric pairing. | 28 | ;;; Electric pairing. |
| 29 | 29 | ||
| 30 | (defcustom electric-pair-pairs | 30 | (defcustom electric-pair-pairs |
| 31 | '((?\" . ?\") | 31 | `((?\" . ?\") |
| 32 | ((nth 0 electric-quote-chars) . (nth 1 electric-quote-chars)) | 32 | (,(nth 0 electric-quote-chars) . ,(nth 1 electric-quote-chars)) |
| 33 | ((nth 2 electric-quote-chars) . (nth 3 electric-quote-chars))) | 33 | (,(nth 2 electric-quote-chars) . ,(nth 3 electric-quote-chars))) |
| 34 | "Alist of pairs that should be used regardless of major mode. | 34 | "Alist of pairs that should be used regardless of major mode. |
| 35 | 35 | ||
| 36 | Pairs of delimiters in this list are a fallback in case they have | 36 | Pairs of delimiters in this list are a fallback in case they have |
| @@ -43,9 +43,9 @@ See also the variable `electric-pair-text-pairs'." | |||
| 43 | :type '(repeat (cons character character))) | 43 | :type '(repeat (cons character character))) |
| 44 | 44 | ||
| 45 | (defcustom electric-pair-text-pairs | 45 | (defcustom electric-pair-text-pairs |
| 46 | '((?\" . ?\" ) | 46 | `((?\" . ?\") |
| 47 | ((nth 0 electric-quote-chars) . (nth 1 electric-quote-chars)) | 47 | (,(nth 0 electric-quote-chars) . ,(nth 1 electric-quote-chars)) |
| 48 | ((nth 2 electric-quote-chars) . (nth 3 electric-quote-chars))) | 48 | (,(nth 2 electric-quote-chars) . ,(nth 3 electric-quote-chars))) |
| 49 | "Alist of pairs that should always be used in comments and strings. | 49 | "Alist of pairs that should always be used in comments and strings. |
| 50 | 50 | ||
| 51 | Pairs of delimiters in this list are a fallback in case they have | 51 | Pairs of delimiters in this list are a fallback in case they have |