diff options
author | Daniel Pfeiffer <[email protected]> | 2006-07-02 19:05:49 +0000 |
---|---|---|
committer | Daniel Pfeiffer <[email protected]> | 2006-07-02 19:05:49 +0000 |
commit | 88983f8c8f1074a4155afb46a22e9577082fad3c (patch) | |
tree | b33aabf463acb8bc33b1edaee7d492beba7ae471 /lisp/progmodes/make-mode.el | |
parent | ca77ee45061282d24ee57f6b446a12e4d98cda84 (diff) |
(makefile-macroassign-regex): Accept preceding keyword.
(makefile-gmake-statements): Reorganize, now that makepp has "override" and also handle forgotten "override define".
(makefile-makepp-statements): Add new "global", "override export" and "override global".
Diffstat (limited to 'lisp/progmodes/make-mode.el')
-rw-r--r-- | lisp/progmodes/make-mode.el | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el index a3146df3e4..0a87aaa42d 100644 --- a/lisp/progmodes/make-mode.el +++ b/lisp/progmodes/make-mode.el @@ -294,7 +294,8 @@ not be enclosed in { } or ( )." ;; 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 @@ not be enclosed in { } or ( )." "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 @@ not be enclosed in { } or ( )." `("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 |