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

Fixes: debbugs:10168

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9a03b9ac267a3f4c529ac2f5f2390af12d06fc14..ded8cc066fac5e1d83506ac0655beee4b79badf0 100644 (file)
--- 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 0d991a76f520ef006fa3cfbfe050800772b8b85a..c9ba64bf5e08b74927de8615b4c7a6783a0c610c 100644 (file)
--- 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))