summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2009-10-22 03:25:54 +0000
committerStefan Monnier <monnier@iro.umontreal.ca>2009-10-22 03:25:54 +0000
commit56b14058a411bfc742848c03c13323c61ac9ff8a (patch)
tree36219df0ab245bdf1aae01810643e56cfbf47f7b /lisp
parent3170b794591682ca5915f8229a15edcb40e479dd (diff)
downloademacs-56b14058a411bfc742848c03c13323c61ac9ff8a.tar.gz
emacs-56b14058a411bfc742848c03c13323c61ac9ff8a.tar.bz2
emacs-56b14058a411bfc742848c03c13323c61ac9ff8a.zip
(pcmpl-gnu-makefile-names): Use a single call to pcomplete-entries.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/pcmpl-gnu.el7
2 files changed, 4 insertions, 6 deletions
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."