procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clarify lexvar restrictions for add-to-ordered-list, add-to-history

Browse source 
* lisp/subr.el (add-to-ordered-list, add-to-history):
* doc/lispref/lists.texi (List Variables):
* doc/lispref/minibuf.texi (Minibuffer History):
Note in the doc string and manual that the variable arguments to
add-to-ordered-list and add-to-history cannot refer to a lexical
variable (bug#39373).
This commit is contained in:
Mattias Engdegård 2020-02-02 12:48:51 +01:00
parent 32763dac46
commit f27187f963
3 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
doc/lispref/lists.texi
View file

@ -832,6 +832,7 @@ and unlike @code{setq}. Quote the argument yourself if necessary.
The ordering information is stored in a hash table on @var{symbol}'s The ordering information is stored in a hash table on @var{symbol}'s
@code{list-order} property. @code{list-order} property.
@var{symbol} cannot refer to a lexical variable.
@end defun @end defun
Here's a scenario showing how to use @code{add-to-ordered-list}: Here's a scenario showing how to use @code{add-to-ordered-list}:

1
doc/lispref/minibuf.texi
View file

@ -572,6 +572,7 @@ and returns the updated history list. It limits the list length to
the value of @var{maxelt} (if non-@code{nil}) or @code{history-length} the value of @var{maxelt} (if non-@code{nil}) or @code{history-length}
(described below). The possible values of @var{maxelt} have the same (described below). The possible values of @var{maxelt} have the same
meaning as the values of @code{history-length}. meaning as the values of @code{history-length}.
@var{history-var} cannot refer to a lexical variable.
Normally, @code{add-to-history} removes duplicate members from the Normally, @code{add-to-history} removes duplicate members from the
history list if @code{history-delete-duplicates} is non-@code{nil}. history list if @code{history-delete-duplicates} is non-@code{nil}.

4
lisp/subr.el
View file

@ -1935,6 +1935,7 @@ of ELEMENT if it has one.
The list order for each element is stored in LIST-VAR's The list order for each element is stored in LIST-VAR's
`list-order' property. `list-order' property.
LIST-VAR cannot refer to a lexical variable.
The return value is the new value of LIST-VAR." The return value is the new value of LIST-VAR."
(let ((ordering (get list-var 'list-order))) (let ((ordering (get list-var 'list-order)))
@ -1963,7 +1964,8 @@ variable. The possible values of maximum length have the same meaning as
the values of `history-length'. the values of `history-length'.
Remove duplicates of NEWELT if `history-delete-duplicates' is non-nil. Remove duplicates of NEWELT if `history-delete-duplicates' is non-nil.
If optional fourth arg KEEP-ALL is non-nil, add NEWELT to history even If optional fourth arg KEEP-ALL is non-nil, add NEWELT to history even
if it is empty or duplicates the most recent entry in the history." if it is empty or duplicates the most recent entry in the history.
HISTORY-VAR cannot refer to a lexical variable."
(unless maxelt (unless maxelt
(setq maxelt (or (get history-var 'history-length) (setq maxelt (or (get history-var 'history-length)
history-length))) history-length)))