[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 6fa99f0: * lisp/emacs-lisp/lisp.el (insert-pair-ali
From: |
Juri Linkov |
Subject: |
[Emacs-diffs] master 6fa99f0: * lisp/emacs-lisp/lisp.el (insert-pair-alist): Turn defvar into defcustom. |
Date: |
Mon, 6 May 2019 15:32:34 -0400 (EDT) |
branch: master
commit 6fa99f06b92b593082d7181ba59ab7eebda45f81
Author: Juri Linkov <address@hidden>
Commit: Juri Linkov <address@hidden>
* lisp/emacs-lisp/lisp.el (insert-pair-alist): Turn defvar into defcustom.
Revert to old default value. (Bug#35480)
---
lisp/emacs-lisp/lisp.el | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el
index f73dbb2..38df920 100644
--- a/lisp/emacs-lisp/lisp.el
+++ b/lisp/emacs-lisp/lisp.el
@@ -645,14 +645,8 @@ Interactively, the behavior depends on
`narrow-to-defun-include-comments'."
(re-search-backward "^\n" (- (point) 1) t)
(narrow-to-region beg end))))
-(defvar insert-pair-alist
- (append '((?\< ?\>) (?\" ?\") (?\' ?\') (?\` ?\'))
- (let (alist)
- (map-char-table
- (lambda (open close)
- (when (< open close) (push (list open close) alist)))
- (unicode-property-table-internal 'paired-bracket))
- (nreverse alist)))
+(defcustom insert-pair-alist
+ '((?\( ?\)) (?\[ ?\]) (?\{ ?\}) (?\< ?\>) (?\" ?\") (?\' ?\') (?\` ?\'))
"Alist of paired characters inserted by `insert-pair'.
Each element looks like (OPEN-CHAR CLOSE-CHAR) or (COMMAND-CHAR
OPEN-CHAR CLOSE-CHAR). The characters OPEN-CHAR and CLOSE-CHAR
@@ -661,7 +655,16 @@ or without modifiers, are inserted by `insert-pair'.
If COMMAND-CHAR is specified, it is a character that triggers the
insertion of the open/close pair, and COMMAND-CHAR itself isn't
-inserted.")
+inserted."
+ :type '(repeat (choice (list :tag "Pair"
+ (character :tag "Open")
+ (character :tag "Close"))
+ (list :tag "Triple"
+ (character :tag "Command")
+ (character :tag "Open")
+ (character :tag "Close"))))
+ :group 'lisp
+ :version "27.1")
(defun insert-pair (&optional arg open close)
"Enclose following ARG sexps in a pair of OPEN and CLOSE characters.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 6fa99f0: * lisp/emacs-lisp/lisp.el (insert-pair-alist): Turn defvar into defcustom.,
Juri Linkov <=