aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2011-12-01 14:38:24 -0500
committerStefan Monnier2011-12-01 14:38:24 -0500
commit9505c3c799e4158b0714da3739ef9244e63d9e92 (patch)
tree72789505e3ec4df2f0a77f068c4f95d1d9d3712a
parent3360a3fcb0c01428a42f1fb8a0b7459e0e6cac72 (diff)
downloademacs-9505c3c799e4158b0714da3739ef9244e63d9e92.tar.gz
emacs-9505c3c799e4158b0714da3739ef9244e63d9e92.zip
* lisp/man.el (Man-completion-table): Fix the lambda case.
Fixes: debbugs:10168
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/man.el6
2 files changed, 8 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9a03b9ac267..ded8cc066fa 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12011-12-01 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * man.el (Man-completion-table): Fix the lambda case (bug#10168).
4
12011-12-01 Michael McNamara <mac@mail.brushroad.com> 52011-12-01 Michael McNamara <mac@mail.brushroad.com>
2 6
3 * progmodes/verilog-mode.el (verilog-pretty-expr): 7 * progmodes/verilog-mode.el (verilog-pretty-expr):
diff --git a/lisp/man.el b/lisp/man.el
index 0d991a76f52..c9ba64bf5e0 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -754,8 +754,10 @@ POS defaults to `point'."
754 754
755(defun Man-completion-table (string pred action) 755(defun Man-completion-table (string pred action)
756 (cond 756 (cond
757 ((eq action 'lambda) 757 ;; This ends up returning t for pretty much any string, and hence leads to
758 (not (string-match "([^)]*\\'" string))) 758 ;; spurious "complete but not unique" messages. And since `man' doesn't
759 ;; require-match anyway, there's not point being clever.
760 ;;((eq action 'lambda) (not (string-match "([^)]*\\'" string)))
759 ((equal string "-k") 761 ((equal string "-k")
760 ;; Let SPC (minibuffer-complete-word) insert the space. 762 ;; Let SPC (minibuffer-complete-word) insert the space.
761 (complete-with-action action '("-k ") string pred)) 763 (complete-with-action action '("-k ") string pred))