[Emacs-diffs] Changes to emacs/lisp/progmodes/make-mode.el,v

[Daniel Pfeiffer]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Daniel Pfeiffer <pfeiffer>      06/07/02 19:01:34

Index: make-mode.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/progmodes/make-mode.el,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -b -r1.117 -r1.118
--- make-mode.el        9 Jun 2006 17:43:54 -0000       1.117
+++ make-mode.el        2 Jul 2006 19:01:34 -0000       1.118
@@ -294,7 +294,8 @@
   ;; We used to match not just the varname but also the whole value
   ;; (spanning potentially several lines).
   ;; "^ *\\([^ \n\t][^:#= \t\n]*\\)[ \t]*\\(?:!=[ 
\t]*\\(\\(?:.+\\\\\n\\)*.+\\)\\|[*:+]?[:?]?=[ \t]*\\(\\(?:.*\\\\\n\\)*.*\\)\\)"
-  "^ *\\([^ \n\t][^:#= \t\n]*\\)[ \t]*\\(?:!=\\|[*:+]?[:?]?=\\)"
+  ;; What about the define statement?  What about differentiating this for 
makepp?
+  "\\(?:^\\|^export\\|^override\\|:\\|: *override\\) *\\([^ \n\t][^:#= 
\t\n]*\\)[ \t]*\\(?:!=\\|[*:+]?[:?]?=\\)"
   "Regex used to find macro assignment lines in a makefile.")
 
 (defconst makefile-var-use-regex
@@ -320,9 +321,9 @@
   "List of keywords understood by automake.")
 
 (defconst makefile-gmake-statements
-  `("-sinclude" "sinclude" "override" "vpath"
+  `("-sinclude" "sinclude" "vpath"     ; makefile-makepp-statements takes rest
     "ifdef" "ifndef" "ifeq" "ifneq" "-include" "define" "endef" "export"
-    "unexport"
+    "override define" "override" "unexport"
     ,@(cdr makefile-automake-statements))
   "List of keywords understood by gmake.")
 
@@ -331,13 +332,14 @@
   `("and ifdef" "and ifndef" "and ifeq" "and ifneq" "and ifperl"
     "and ifmakeperl" "and ifsys" "and ifnsys" "build_cache" "build_check"
     "else ifdef" "else ifndef" "else ifeq" "else ifneq" "else ifperl"
-    "else ifmakeperl" "else ifsys" "else ifnsys" "enddef" "load_makefile"
-    "ifperl" "ifmakeperl" "ifsys" "ifnsys" "_include"  "makeperl" "makesub"
-    "no_implicit_load" "perl" "perl-begin" "perl_begin" "perl-end" "perl_end"
-    "prebuild" "or ifdef" "or ifndef" "or ifeq" "or ifneq" "or ifperl"
-    "or ifmakeperl" "or ifsys" "or ifnsys" "register_command_parser"
+    "else ifmakeperl" "else ifsys" "else ifnsys" "enddef" "global"
+    "load_makefile" "ifperl" "ifmakeperl" "ifsys" "ifnsys" "_include"
+    "makeperl" "makesub" "no_implicit_load" "perl" "perl-begin" "perl_begin"
+    "perl-end" "perl_end" "prebuild" "or ifdef" "or ifndef" "or ifeq"
+    "or ifneq" "or ifperl" "or ifmakeperl" "or ifsys" "or ifnsys"
+    "override export" "override global" "register_command_parser"
     "register_scanner" "repository" "runtime" "signature" "sub"
-    ,@(nthcdr 4 makefile-gmake-statements))
+    ,@(nthcdr 3 makefile-gmake-statements))
   "List of keywords understood by gmake.")
 
 (defconst makefile-bsdmake-statements