diff options
| author | Bastien Guerry | 2012-09-11 18:45:31 +0200 |
|---|---|---|
| committer | Bastien Guerry | 2012-09-11 18:45:31 +0200 |
| commit | baa26ea03380c3c5f17e9e0c2f47e7509a69895a (patch) | |
| tree | 6c6174ac5e9601f7c28e05042e6f7502ead482a3 /lisp | |
| parent | d73e321cc241c0029e6874501cf32ee63643825c (diff) | |
| download | emacs-baa26ea03380c3c5f17e9e0c2f47e7509a69895a.tar.gz emacs-baa26ea03380c3c5f17e9e0c2f47e7509a69895a.zip | |
* subr.el (set-temporary-overlay-map): Add a docstring. (bug#12346)
Bug #12346 is not closed as this commit does not document
`set-temporary-overlay-map' in the manual.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/subr.el | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5864f61403b..cdc021d192f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,10 @@ | |||
| 1 | 2012-09-11 Bastien Guerry <bzg@gnu.org> | 1 | 2012-09-11 Bastien Guerry <bzg@gnu.org> |
| 2 | 2 | ||
| 3 | * subr.el (set-temporary-overlay-map): Add a docstring. | ||
| 4 | (bug#12346) | ||
| 5 | |||
| 6 | 2012-09-11 Bastien Guerry <bzg@gnu.org> | ||
| 7 | |||
| 3 | * minibuffer.el (completion-table-subvert): Fix docstring. | 8 | * minibuffer.el (completion-table-subvert): Fix docstring. |
| 4 | (bug#12347) | 9 | (bug#12347) |
| 5 | 10 | ||
diff --git a/lisp/subr.el b/lisp/subr.el index be785ff8fba..23b62b25c9c 100644 --- a/lisp/subr.el +++ b/lisp/subr.el | |||
| @@ -3911,6 +3911,11 @@ The properties used on SYMBOL are `composefunc', `sendfunc', | |||
| 3911 | (put symbol 'hookvar (or hookvar 'mail-send-hook))) | 3911 | (put symbol 'hookvar (or hookvar 'mail-send-hook))) |
| 3912 | 3912 | ||
| 3913 | (defun set-temporary-overlay-map (map &optional keep-pred) | 3913 | (defun set-temporary-overlay-map (map &optional keep-pred) |
| 3914 | "Set MAP as a temporary overlay map. | ||
| 3915 | When KEEP-PRED is `t', using a key from the temporary keymap | ||
| 3916 | leaves this keymap activated. KEEP-PRED can also be a function, | ||
| 3917 | which will have the same effect when it returns `t'. | ||
| 3918 | When KEEP-PRED is nil, the temporary keymap is used only once." | ||
| 3914 | (let* ((clearfunsym (make-symbol "clear-temporary-overlay-map")) | 3919 | (let* ((clearfunsym (make-symbol "clear-temporary-overlay-map")) |
| 3915 | (overlaysym (make-symbol "t")) | 3920 | (overlaysym (make-symbol "t")) |
| 3916 | (alist (list (cons overlaysym map))) | 3921 | (alist (list (cons overlaysym map))) |