(nnimap-retrieve-headers-from-server): Fix last change.

[gnu-emacs] / lisp / pcmpl-gnu.el

diff --git a/lisp/pcmpl-gnu.el b/lisp/pcmpl-gnu.el
index f390f541e25a11bd43c9ae8cf51da7eec4e8fb53..32810d7dba6a25ea6e0019ce8f75be0675f2bf39 100644 (file)
--- a/lisp/pcmpl-gnu.el
+++ b/lisp/pcmpl-gnu.el
@@ -1,4 +1,4 @@
-;;; pcmpl-gnu --- completions for GNU project tools
+;;; pcmpl-gnu.el --- completions for GNU project tools
 
 ;; Copyright (C) 1999, 2000 Free Software Foundation
 
@@ -19,6 +19,8 @@
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
+;;; Commentary:
+
 ;;; Code:
 
 (provide 'pcmpl-gnu)
@@ -33,7 +35,7 @@
 ;; User Variables:
 
 (defcustom pcmpl-gnu-makefile-regexps
-  '("\\`Makefile\\." "\\.mak\\'")
+  '("\\`GNUmakefile" "\\`Makefile" "\\.mak\\'")
   "*A list of regexps that will match Makefile names."
   :type '(repeat regexp)
   :group 'pcmpl-gnu)
@@ -111,7 +113,10 @@
 (defun pcmpl-gnu-make-rule-names ()
   "Return a list of possible make rule names in MAKEFILE."
   (let* ((minus-f (member "-f" pcomplete-args))
-        (makefile (or (cadr minus-f) "Makefile"))
+        (makefile (or (cadr minus-f)
+                      (if (file-exists-p "GNUmakefile")
+                          "GNUmakefile"
+                        "Makefile")))
         rules)
     (if (not (file-readable-p makefile))
        (unless minus-f (list "-f"))
@@ -302,4 +307,5 @@
 ;;;###autoload
 (defalias 'pcomplete/gdb 'pcomplete/xargs)
 
+;;; arch-tag: 06d2b429-dcb1-4a57-84e1-f70d87781183
 ;;; pcmpl-gnu.el ends here