diff options
| author | Paul Eggert | 2016-06-19 00:47:00 +0200 |
|---|---|---|
| committer | Paul Eggert | 2016-06-19 00:47:00 +0200 |
| commit | 68cb71c0928eb8b10487a125192f43923e8bfe7f (patch) | |
| tree | 053133358af1bd991d60ed6c29590ad84b29fed0 /doc | |
| parent | 87c9d8fcec183c8f4933e218c1895b6a0722b1e1 (diff) | |
| parent | 9ae514a9b7ed368ea97ddefa806079b6423833cb (diff) | |
| download | emacs-68cb71c0928eb8b10487a125192f43923e8bfe7f.tar.gz emacs-68cb71c0928eb8b10487a125192f43923e8bfe7f.zip | |
Merge from origin/emacs-25
9ae514a * etc/AUTHORS: Update the AUTHORS file
3ca428e add entries to authors.el
66d556b Fix eldoc-related freezes in python mode
d59bcbc Handle mouse leaving initial window in `mouse-set-region' (Bu...
27fe1e4 org.el: Fix bindings of < and > for calendar scrolling
a813487 Fix undo boundary in recursive edit (Bug#23632)
1f85b7c Doc fixes re alist-get. (Bug#23548)
ba3f206 * lisp/progmodes/python.el (inferior-python-mode): Avoid tabs...
56fa055 * src/syntax.c (syms_of_syntax) <comment-end-can-be-escaped>:...
4c1370a * lisp/help-fns.el (describe-function-1): Fix handling of fil...
a3f7ae8 * lisp/emacs-lisp/cl-macs.el (cl-loop): Doc fix re "by".
601b9b2 * doc/misc/cl.texi (Mapping over Sequences): Fix cl-notevery.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/lispref/lists.texi | 12 | ||||
| -rw-r--r-- | doc/misc/cl.texi | 2 |
2 files changed, 9 insertions, 5 deletions
diff --git a/doc/lispref/lists.texi b/doc/lispref/lists.texi index c18c408209a..e7a739f88f3 100644 --- a/doc/lispref/lists.texi +++ b/doc/lispref/lists.texi | |||
| @@ -1556,12 +1556,16 @@ keys may not be symbols: | |||
| 1556 | @end smallexample | 1556 | @end smallexample |
| 1557 | @end defun | 1557 | @end defun |
| 1558 | 1558 | ||
| 1559 | @defun alist-get key value &optional default | 1559 | @defun alist-get key value &optional default remove |
| 1560 | This function is like @code{assq}, but instead of returning the entire | 1560 | This function is like @code{assq}, but instead of returning the entire |
| 1561 | association for @var{key}, @code{(@var{key} . @var{value})}, it | 1561 | association for @var{key}, @code{(@var{key} . @var{value})}, it |
| 1562 | returns just the @var{value}. It returns @var{default} if @var{key} | 1562 | returns just the @var{value}. If @var{key} is not found in |
| 1563 | is not found in @var{alist}, defaulting to @code{nil} if @var{default} | 1563 | @var{alist} it returns @var{default}. |
| 1564 | is omitted. | 1564 | |
| 1565 | This is a generalized variable (@pxref{Generalized Variables}) that | ||
| 1566 | can be used to change a value with @code{setf}. When using it to set | ||
| 1567 | a value, optional argument @var{remove} non-nil means to remove | ||
| 1568 | @var{key} from @var{alist} if the new value is @code{eql} to @var{default}. | ||
| 1565 | @end defun | 1569 | @end defun |
| 1566 | 1570 | ||
| 1567 | @defun rassq value alist | 1571 | @defun rassq value alist |
diff --git a/doc/misc/cl.texi b/doc/misc/cl.texi index 4137a95b3b2..a98d0ac455b 100644 --- a/doc/misc/cl.texi +++ b/doc/misc/cl.texi | |||
| @@ -3364,7 +3364,7 @@ was @code{nil} for all elements. | |||
| 3364 | @defun cl-notevery predicate seq &rest more-seqs | 3364 | @defun cl-notevery predicate seq &rest more-seqs |
| 3365 | This function calls @var{predicate} on each element of the sequence(s) | 3365 | This function calls @var{predicate} on each element of the sequence(s) |
| 3366 | in turn; it returns a non-@code{nil} value as soon as @var{predicate} | 3366 | in turn; it returns a non-@code{nil} value as soon as @var{predicate} |
| 3367 | returns @code{nil} for any element, or @code{t} if the predicate was | 3367 | returns @code{nil} for any element, or @code{nil} if the predicate was |
| 3368 | true for all elements. | 3368 | true for all elements. |
| 3369 | @end defun | 3369 | @end defun |
| 3370 | 3370 | ||