masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-06 12:19:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request from tarsiiformes/quote-quote

Browse source 
GitHub-reference: https://github.com/jwiegley/use-package/issues/990
This commit is contained in:
John Wiegley 2022-08-08 17:42:58 -07:00 • committed by GitHub
commit 3dd5bee4aa
3 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

26
lisp/use-package/bind-key.el
View file

@ -160,7 +160,7 @@ For example:
(bind-key \"M-h\" #'some-interactive-function my-mode-map) (bind-key \"M-h\" #'some-interactive-function my-mode-map)
(bind-key \"M-h\" #'some-interactive-function 'my-mode-map) (bind-key \"M-h\" #'some-interactive-function \\='my-mode-map)
If PREDICATE is non-nil, it is a form evaluated to determine when If PREDICATE is non-nil, it is a form evaluated to determine when
a key should be bound. It must return non-nil in such cases. a key should be bound. It must return non-nil in such cases.
@ -262,16 +262,16 @@ Accepts keyword arguments:
:repeat-docstring STR - docstring for the repeat-map variable :repeat-docstring STR - docstring for the repeat-map variable
:repeat-map MAP - name of the repeat map that should be created :repeat-map MAP - name of the repeat map that should be created
for these bindings. If specified, the for these bindings. If specified, the
'repeat-map property of each command bound `repeat-map' property of each command bound
(within the scope of the :repeat-map keyword) (within the scope of the `:repeat-map' keyword)
is set to this map. is set to this map.
:exit BINDINGS - Within the scope of :repeat-map will bind the :exit BINDINGS - Within the scope of `:repeat-map' will bind the
key in the repeat map, but will not set the key in the repeat map, but will not set the
'repeat-map property of the bound command. `repeat-map' property of the bound command.
:continue BINDINGS - Within the scope of :repeat-map forces the :continue BINDINGS - Within the scope of `:repeat-map' forces the
same behaviour as if no special keyword had same behaviour as if no special keyword had
been used (that is, the command is bound, and been used (that is, the command is bound, and
it's 'repeat-map property set) it's `repeat-map' property set)
:filter FORM - optional form to determine when bindings apply :filter FORM - optional form to determine when bindings apply
The rest of the arguments are conses of keybinding string and a The rest of the arguments are conses of keybinding string and a
@ -409,16 +409,16 @@ Accepts keyword arguments:
:repeat-docstring STR - docstring for the repeat-map variable :repeat-docstring STR - docstring for the repeat-map variable
:repeat-map MAP - name of the repeat map that should be created :repeat-map MAP - name of the repeat map that should be created
for these bindings. If specified, the for these bindings. If specified, the
'repeat-map property of each command bound `repeat-map' property of each command bound
(within the scope of the :repeat-map keyword) (within the scope of the `:repeat-map' keyword)
is set to this map. is set to this map.
:exit BINDINGS - Within the scope of :repeat-map will bind the :exit BINDINGS - Within the scope of `:repeat-map' will bind the
key in the repeat map, but will not set the key in the repeat map, but will not set the
'repeat-map property of the bound command. `repeat-map' property of the bound command.
:continue BINDINGS - Within the scope of :repeat-map forces the :continue BINDINGS - Within the scope of `:repeat-map' forces the
same behaviour as if no special keyword had same behaviour as if no special keyword had
been used (that is, the command is bound, and been used (that is, the command is bound, and
it's 'repeat-map property set) it's `repeat-map' property set)
:filter FORM - optional form to determine when bindings apply :filter FORM - optional form to determine when bindings apply
The rest of the arguments are conses of keybinding string and a The rest of the arguments are conses of keybinding string and a

4
lisp/use-package/use-package-core.el
View file

@ -908,12 +908,12 @@ If RECURSED is non-nil, recurse into sublists."
"A predicate that recognizes functional constructions: "A predicate that recognizes functional constructions:
nil nil
sym sym
'sym \\='sym
(quote sym) (quote sym)
#'sym #'sym
(function sym) (function sym)
(lambda () ...) (lambda () ...)
'(lambda () ...) \\='(lambda () ...)
(quote (lambda () ...)) (quote (lambda () ...))
#'(lambda () ...) #'(lambda () ...)
(function (lambda () ...))" (function (lambda () ...))"

2
lisp/use-package/use-package-ensure.el
View file

@ -93,7 +93,7 @@ The default value uses package.el to install the package."
(defun use-package-archive-exists-p (archive) (defun use-package-archive-exists-p (archive)
"Check if a given ARCHIVE is enabled. "Check if a given ARCHIVE is enabled.
ARCHIVE can be a string or a symbol or 'manual to indicate a ARCHIVE can be a string or a symbol or `manual' to indicate a
manually updated package." manually updated package."
(if (member archive '(manual "manual")) (if (member archive '(manual "manual"))
't 't