diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2012-11-13 11:59:34 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2012-11-13 11:59:34 -0500 |
| commit | fa470af020b518efb92a7213ac805a9d5d0b6061 (patch) | |
| tree | bc8ce17844d15213832b7c5909de8f4f8fb41fa9 /lisp | |
| parent | 3c442f8b25bf6acc52c45a1f9966b8529ea936d2 (diff) | |
| download | emacs-fa470af020b518efb92a7213ac805a9d5d0b6061.tar.gz | |
* lisp/woman.el (woman-file-name): Don't mess with unread-command-events.
Fixes: debbugs:12861
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 9 | ||||
| -rw-r--r-- | lisp/woman.el | 12 |
2 files changed, 12 insertions, 9 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 72754190cf3..7ebd3632dda 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2012-11-13 Stefan Monnier <monnier@iro.umontreal.ca> + * woman.el (woman-file-name): Don't mess with unread-command-events + (bug#12861). + * emacs-lisp/advice.el: Layer on top of nadvice.el. Remove out of date self-require hack. (ad-do-advised-functions): Use simple `dolist'. @@ -7,9 +10,9 @@ (ad-advice-definition): Redefine as functions. (ad-advice-classes): Move before first use. (ad-make-origname, ad-set-orig-definition, ad-clear-orig-definition) - (ad-make-mapped-call, ad-make-advised-docstring, ad-make-plain-docstring) + (ad-make-mapped-call, ad-make-advised-docstring,ad-make-plain-docstring) (ad--defalias-fset): Remove functions. - (ad-make-advicefunname, ad-clear-advicefunname-definition): New functions. + (ad-make-advicefunname, ad-clear-advicefunname-definition): New funs. (ad-get-orig-definition): Rewrite. (ad-make-advised-definition-docstring): Change base docstring. (ad-real-orig-definition): Rewrite. @@ -17,7 +20,7 @@ (ad--make-advised-docstring): Redirect `function' from ad-Advice-... (ad-make-advised-definition): Simplify. (ad-assemble-advised-definition): Tweak for new calling context. - (ad-activate-advised-definition): Setup ad-Advice-* instead of ad-Orig-*. + (ad-activate-advised-definition): Setup ad-Advice-* i.s.o ad-Orig-*. (ad--defalias-fset): Rename from ad-handle-definition. Make it set the function and call ad-activate if needed. (ad-activate, ad-deactivate): Don't call ad-handle-definition any more. diff --git a/lisp/woman.el b/lisp/woman.el index 974a7d72465..46b6b680440 100644 --- a/lisp/woman.el +++ b/lisp/woman.el @@ -1303,12 +1303,12 @@ cache to be re-read." ((null (cdr files)) (car (car files))) ; only 1 file for topic. (t ;; Multiple files for topic, so must select 1. - ;; Unread the command event (TAB = ?\t = 9) that runs the command - ;; `minibuffer-complete' in order to automatically complete the - ;; minibuffer contents as far as possible. - (setq unread-command-events '(9)) ; and delete any type-ahead! - (completing-read "Manual file: " files nil 1 - (try-completion "" files) 'woman-file-history)))))) + ;; Run the command `minibuffer-complete' in order to automatically + ;; complete the minibuffer contents as far as possible. + (minibuffer-with-setup-hook + (lambda () (let ((this-command this-command)) (minibuffer-complete))) + (completing-read "Manual file: " files nil 1 + (try-completion "" files) 'woman-file-history))))))) (defun woman-select (predicate list) "Select unique elements for which PREDICATE is true in LIST. |