aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Wiegley2022-08-08 17:42:58 -0700
committerGitHub2022-08-08 17:42:58 -0700
commit3dd5bee4aacf048c28c8d4cdb6b2a27ff5c4b79b (patch)
tree11bc3311e82ab1ca11a2091cfa6061fa3ae40190
parente8626100f335a6b3bb5bb5cdee353b2b30435be7 (diff)
parent53c1889342af1e087208bb7ef4f5c7d0acb61d45 (diff)
downloademacs-3dd5bee4aacf048c28c8d4cdb6b2a27ff5c4b79b.tar.gz
emacs-3dd5bee4aacf048c28c8d4cdb6b2a27ff5c4b79b.zip
Merge pull request from tarsiiformes/quote-quote
GitHub-reference: https://github.com/jwiegley/use-package/issues/990
-rw-r--r--lisp/use-package/bind-key.el26
-rw-r--r--lisp/use-package/use-package-core.el4
-rw-r--r--lisp/use-package/use-package-ensure.el2
3 files changed, 16 insertions, 16 deletions
diff --git a/lisp/use-package/bind-key.el b/lisp/use-package/bind-key.el
index df76c39ceed..bf5785ff5b4 100644
--- a/lisp/use-package/bind-key.el
+++ b/lisp/use-package/bind-key.el
@@ -160,7 +160,7 @@ For example:
160 160
161 (bind-key \"M-h\" #'some-interactive-function my-mode-map) 161 (bind-key \"M-h\" #'some-interactive-function my-mode-map)
162 162
163 (bind-key \"M-h\" #'some-interactive-function 'my-mode-map) 163 (bind-key \"M-h\" #'some-interactive-function \\='my-mode-map)
164 164
165If PREDICATE is non-nil, it is a form evaluated to determine when 165If PREDICATE is non-nil, it is a form evaluated to determine when
166a key should be bound. It must return non-nil in such cases. 166a key should be bound. It must return non-nil in such cases.
@@ -262,16 +262,16 @@ Accepts keyword arguments:
262:repeat-docstring STR - docstring for the repeat-map variable 262:repeat-docstring STR - docstring for the repeat-map variable
263:repeat-map MAP - name of the repeat map that should be created 263:repeat-map MAP - name of the repeat map that should be created
264 for these bindings. If specified, the 264 for these bindings. If specified, the
265 'repeat-map property of each command bound 265 `repeat-map' property of each command bound
266 (within the scope of the :repeat-map keyword) 266 (within the scope of the `:repeat-map' keyword)
267 is set to this map. 267 is set to this map.
268:exit BINDINGS - Within the scope of :repeat-map will bind the 268:exit BINDINGS - Within the scope of `:repeat-map' will bind the
269 key in the repeat map, but will not set the 269 key in the repeat map, but will not set the
270 'repeat-map property of the bound command. 270 `repeat-map' property of the bound command.
271:continue BINDINGS - Within the scope of :repeat-map forces the 271:continue BINDINGS - Within the scope of `:repeat-map' forces the
272 same behaviour as if no special keyword had 272 same behaviour as if no special keyword had
273 been used (that is, the command is bound, and 273 been used (that is, the command is bound, and
274 it's 'repeat-map property set) 274 it's `repeat-map' property set)
275:filter FORM - optional form to determine when bindings apply 275:filter FORM - optional form to determine when bindings apply
276 276
277The rest of the arguments are conses of keybinding string and a 277The rest of the arguments are conses of keybinding string and a
@@ -409,16 +409,16 @@ Accepts keyword arguments:
409:repeat-docstring STR - docstring for the repeat-map variable 409:repeat-docstring STR - docstring for the repeat-map variable
410:repeat-map MAP - name of the repeat map that should be created 410:repeat-map MAP - name of the repeat map that should be created
411 for these bindings. If specified, the 411 for these bindings. If specified, the
412 'repeat-map property of each command bound 412 `repeat-map' property of each command bound
413 (within the scope of the :repeat-map keyword) 413 (within the scope of the `:repeat-map' keyword)
414 is set to this map. 414 is set to this map.
415:exit BINDINGS - Within the scope of :repeat-map will bind the 415:exit BINDINGS - Within the scope of `:repeat-map' will bind the
416 key in the repeat map, but will not set the 416 key in the repeat map, but will not set the
417 'repeat-map property of the bound command. 417 `repeat-map' property of the bound command.
418:continue BINDINGS - Within the scope of :repeat-map forces the 418:continue BINDINGS - Within the scope of `:repeat-map' forces the
419 same behaviour as if no special keyword had 419 same behaviour as if no special keyword had
420 been used (that is, the command is bound, and 420 been used (that is, the command is bound, and
421 it's 'repeat-map property set) 421 it's `repeat-map' property set)
422:filter FORM - optional form to determine when bindings apply 422:filter FORM - optional form to determine when bindings apply
423 423
424The rest of the arguments are conses of keybinding string and a 424The rest of the arguments are conses of keybinding string and a
diff --git a/lisp/use-package/use-package-core.el b/lisp/use-package/use-package-core.el
index 2859e3382ca..ab35131e4f4 100644
--- a/lisp/use-package/use-package-core.el
+++ b/lisp/use-package/use-package-core.el
@@ -908,12 +908,12 @@ If RECURSED is non-nil, recurse into sublists."
908 "A predicate that recognizes functional constructions: 908 "A predicate that recognizes functional constructions:
909 nil 909 nil
910 sym 910 sym
911 'sym 911 \\='sym
912 (quote sym) 912 (quote sym)
913 #'sym 913 #'sym
914 (function sym) 914 (function sym)
915 (lambda () ...) 915 (lambda () ...)
916 '(lambda () ...) 916 \\='(lambda () ...)
917 (quote (lambda () ...)) 917 (quote (lambda () ...))
918 #'(lambda () ...) 918 #'(lambda () ...)
919 (function (lambda () ...))" 919 (function (lambda () ...))"
diff --git a/lisp/use-package/use-package-ensure.el b/lisp/use-package/use-package-ensure.el
index 50005a9e990..cb31b4b7dd4 100644
--- a/lisp/use-package/use-package-ensure.el
+++ b/lisp/use-package/use-package-ensure.el
@@ -93,7 +93,7 @@ The default value uses package.el to install the package."
93(defun use-package-archive-exists-p (archive) 93(defun use-package-archive-exists-p (archive)
94 "Check if a given ARCHIVE is enabled. 94 "Check if a given ARCHIVE is enabled.
95 95
96ARCHIVE can be a string or a symbol or 'manual to indicate a 96ARCHIVE can be a string or a symbol or `manual' to indicate a
97manually updated package." 97manually updated package."
98 (if (member archive '(manual "manual")) 98 (if (member archive '(manual "manual"))
99 't 99 't