*** empty log message ***

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

diff --git a/lisp/pcmpl-gnu.el b/lisp/pcmpl-gnu.el
index f390f541e25a11bd43c9ae8cf51da7eec4e8fb53..7dc7808404f0f504540e3aaff08704aeca0b56d6 100644 (file)
--- a/lisp/pcmpl-gnu.el
+++ b/lisp/pcmpl-gnu.el
@@ -1,6 +1,7 @@
-;;; pcmpl-gnu --- completions for GNU project tools
+;;; pcmpl-gnu.el --- completions for GNU project tools
 
-;; Copyright (C) 1999, 2000 Free Software Foundation
+;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
@@ -16,8 +17,10 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
 
 ;;; Code:
 
@@ -33,7 +36,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 +114,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 +308,5 @@
 ;;;###autoload
 (defalias 'pcomplete/gdb 'pcomplete/xargs)
 
+;;; arch-tag: 06d2b429-dcb1-4a57-84e1-f70d87781183
 ;;; pcmpl-gnu.el ends here