From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Thu, 22 Oct 2009 03:25:54 +0000 (+0000)
Subject: (pcmpl-gnu-makefile-names): Use a single call to pcomplete-entries.
X-Git-Tag: emacs-pretest-23.1.90~709
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=56b14058a411bfc742848c03c13323c61ac9ff8a;p=emacs.git

(pcmpl-gnu-makefile-names): Use a single call to pcomplete-entries.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index acdd6164da5..95ab875f504 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2009-10-22  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+	* pcmpl-gnu.el (pcmpl-gnu-makefile-names): Use a single call to
+	pcomplete-entries.
+
 	* comint.el (comint-read-input-ring, comint-write-input-ring)
 	(comint-substitute-in-file-name)
 	(comint-dynamic-complete-as-filename)
diff --git a/lisp/pcmpl-gnu.el b/lisp/pcmpl-gnu.el
index b2c7e0998b9..b7f2f1ecab6 100644
--- a/lisp/pcmpl-gnu.el
+++ b/lisp/pcmpl-gnu.el
@@ -102,12 +102,7 @@
 
 (defun pcmpl-gnu-makefile-names ()
   "Return a list of possible makefile names."
-  (let ((names (list t))
-	(reg pcmpl-gnu-makefile-regexps))
-    (while reg
-      (nconc names (pcomplete-entries (car reg)))
-      (setq reg (cdr reg)))
-    (cdr names)))
+  (pcomplete-entries (mapconcat 'identity pcmpl-gnu-makefile-regexps "\\|")))
 
 (defun pcmpl-gnu-make-rule-names ()
   "Return a list of possible make rule names in MAKEFILE."