* lisp/pcmpl-gnu.el (pcomplete/make): Also allow filename arguments.

Fixes: debbugs:10116

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 894a66b2cabcc692765e2284976ecd4d95c17e50..443ca2d5c34778c27dc97d4bdf21d29de4a967f3 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-06  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * pcmpl-gnu.el (pcomplete/make): Also allow filename arguments
+       (bug#10116).
+
 2011-12-06  Glenn Morris  <rgm@gnu.org>
 
        * emacs-lisp/package.el (package-archives): Doc fix re riskiness.

diff --git a/lisp/pcmpl-gnu.el b/lisp/pcmpl-gnu.el
index 608a9dc2e8800e54c0d1c0e4c06637196abf32f3..72332b723db5d1234141e4aa5c40994b9e93265f 100644 (file)
--- a/lisp/pcmpl-gnu.el
+++ b/lisp/pcmpl-gnu.el
@@ -99,7 +99,10 @@
   "Completion for GNU `make'."
   (let ((pcomplete-help "(make)Top"))
     (pcomplete-opt "bmC/def(pcmpl-gnu-makefile-names)hiI/j?kl?no.pqrsStvwW.")
-    (while (pcomplete-here (pcmpl-gnu-make-rule-names) nil 'identity))))
+    (while (pcomplete-here (completion-table-in-turn
+                            (pcmpl-gnu-make-rule-names)
+                            (pcomplete-entries))
+                           nil 'identity))))
 
 (defun pcmpl-gnu-makefile-names ()
   "Return a list of possible makefile names."