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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index acdd6164da57345931fca81aadc797d7814c930c..95ab875f504334fbf632775023ecb7d0f340ea04 100644 (file)
--- 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 b2c7e0998b9bcda32274a13df7fc382eb0c6aeba..b7f2f1ecab60e8892bdebbaa26b556870d45b28d 100644 (file)
--- 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."