# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1275322562 14400
# Node ID 7a38217041bb9a528faba6d884c6e65f286f8781
# Parent  3a80fc3735bf62af5f4fd20e55f319bf4595b3f4
* lisp/man.el (Man-completion-table): Let the user type "-k ".

diff -r 3a80fc3735bf -r 7a38217041bb lisp/ChangeLog
--- a/lisp/ChangeLog	Mon May 31 17:24:46 2010 +0200
+++ b/lisp/ChangeLog	Mon May 31 12:16:02 2010 -0400
@@ -1,3 +1,7 @@
+2010-05-31  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* man.el (Man-completion-table): Let the user type "-k " (bug#6319).
+
 2010-05-31  Drew Adams  <drew.adams@oracle.com>
 
 	* 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  <cyd@stupidchicken.com>
 
-	* 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  <yamato@redhat.com>
 
diff -r 3a80fc3735bf -r 7a38217041bb lisp/man.el
--- a/lisp/man.el	Mon May 31 17:24:46 2010 +0200
+++ b/lisp/man.el	Mon May 31 12:16:02 2010 -0400
@@ -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)