From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Tue, 6 Dec 2011 22:14:32 +0000 (-0500)
Subject: * lisp/pcmpl-gnu.el (pcomplete/make): Also allow filename arguments.
X-Git-Tag: emacs-pretest-24.0.93~214
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=86ed9fdc5749160a283e8c37cd6d60b692f63b79;p=emacs.git

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

Fixes: debbugs:10116
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 894a66b2cab..443ca2d5c34 100644
--- 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 608a9dc2e88..72332b723db 100644
--- 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."