diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-05-31 12:16:02 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-05-31 12:16:02 -0400 |
| commit | 896114cf6401b58e1aaa66736d726779d087f166 (patch) | |
| tree | 905290ffe66cfe82d4ddec84503229c0d71ec4b3 | |
| parent | 949544ed2686f00430b4ffe75d7b64832dbaa4f9 (diff) | |
| download | emacs-896114cf6401b58e1aaa66736d726779d087f166.tar.gz | |
* lisp/man.el (Man-completion-table): Let the user type "-k ".
Fixes: debbugs:6319
| -rw-r--r-- | lisp/ChangeLog | 11 | ||||
| -rw-r--r-- | lisp/man.el | 3 |
2 files changed, 10 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a8e7f062000..9b27b3e342c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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 --git a/lisp/man.el b/lisp/man.el index 8eb5f73e245..658c1ebbcef 100644 --- a/lisp/man.el +++ b/lisp/man.el @@ -754,6 +754,9 @@ POS defaults to `point'." (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) |