[Emacs-diffs] /srv/bzr/emacs/emacs-23 r99824: * lisp/man.el (Man-completion-table): Let the user type "-k ".

[Stefan Monnier]

------------------------------------------------------------
revno: 99824
committer: Stefan Monnier <address@hidden>
branch nick: emacs-23
timestamp: Mon 2010-05-31 12:16:02 -0400
message:
  * lisp/man.el (Man-completion-table): Let the user type "-k ".
modified:
  lisp/ChangeLog
  lisp/man.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-05-31 15:24:46 +0000
+++ b/lisp/ChangeLog    2010-05-31 16:16:02 +0000
@@ -1,3 +1,7 @@
+2010-05-31  Stefan Monnier  <address@hidden>
+
+       * man.el (Man-completion-table): Let the user type "-k " (bug#6319).
+
 2010-05-31  Drew Adams  <address@hidden>
 
        * files.el (directory-files-no-dot-files-regexp): Doc fix (bug#6298).
@@ -12,14 +16,13 @@
        * ansi-color.el: Delete unused escape sequences (Bug#6085).
        (ansi-color-drop-regexp): New constant.
        (ansi-color-apply, ansi-color-filter-region)
-       (ansi-color-apply-on-region): Delete unrecognized control
-       sequences.
+       (ansi-color-apply-on-region): Delete unrecognized control sequences.
        (ansi-color-apply): Build string list before calling concat.
 
 2010-05-27  Chong Yidong  <address@hidden>
 
-       * progmodes/verilog-mode.el (verilog-type-font-keywords): Use
-       font-lock-constant-face, not obsolete font-lock-reference-face.
+       * progmodes/verilog-mode.el (verilog-type-font-keywords):
+       Use font-lock-constant-face, not obsolete font-lock-reference-face.
 
 2010-05-27  Masatake YAMATO  <address@hidden>
 

=== modified file 'lisp/man.el'
--- a/lisp/man.el       2010-03-05 20:18:20 +0000
+++ b/lisp/man.el       2010-05-31 16:16:02 +0000
@@ -754,6 +754,9 @@
   (cond
    ((eq action 'lambda)
     (not (string-match "([^)]*\\'" string)))
+   ((equal string "-k")
+    ;; Let SPC (minibuffer-complete-word) insert the space.
+    (complete-with-action action '("-k ") string pred))
    (t
     (let ((table (cdr Man-completion-cache))
           (section nil)