From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Thu, 1 Dec 2011 19:38:24 +0000 (-0500)
Subject: * lisp/man.el (Man-completion-table): Fix the lambda case.
X-Git-Tag: emacs-pretest-24.0.93~232^2~43
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9505c3c799e4158b0714da3739ef9244e63d9e92;p=emacs.git

* lisp/man.el (Man-completion-table): Fix the lambda case.

Fixes: debbugs:10168
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9a03b9ac267..ded8cc066fa 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2011-12-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* man.el (Man-completion-table): Fix the lambda case (bug#10168).
+
 2011-12-01  Michael McNamara  <mac@mail.brushroad.com>
 
 	* 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'."
 
 (defun Man-completion-table (string pred action)
   (cond
-   ((eq action 'lambda)
-    (not (string-match "([^)]*\\'" string)))
+   ;; This ends up returning t for pretty much any string, and hence leads to
+   ;; spurious "complete but not unique" messages.  And since `man' doesn't
+   ;; require-match anyway, there's not point being clever.
+   ;;((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))