[Emacs-diffs] /srv/bzr/emacs/trunk r110885: * lisp/woman.el (woman-file-name): Don't mess with unread-command-events.

[Stefan Monnier]

------------------------------------------------------------
revno: 110885
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=12861
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Tue 2012-11-13 11:59:34 -0500
message:
  * lisp/woman.el (woman-file-name): Don't mess with unread-command-events.
modified:
  lisp/ChangeLog
  lisp/woman.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-11-13 14:12:46 +0000
+++ b/lisp/ChangeLog    2012-11-13 16:59:34 +0000
@@ -1,5 +1,8 @@
 2012-11-13  Stefan Monnier  <address@hidden>
 
+       * 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.

=== modified file 'lisp/woman.el'
--- a/lisp/woman.el     2012-11-06 01:49:44 +0000
+++ b/lisp/woman.el     2012-11-13 16:59:34 +0000
@@ -1303,12 +1303,12 @@
        ((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.