aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarl Heuer1997-03-11 22:23:36 +0000
committerKarl Heuer1997-03-11 22:23:36 +0000
commit6e36fe0badf488de5c8bb2475ca475eaa88ea5a1 (patch)
treee2db8e175cc560f2b673c6e2df649a02700de601
parent000f46219b02f8fdef2d4c95c56fd0264865f7fa (diff)
downloademacs-6e36fe0badf488de5c8bb2475ca475eaa88ea5a1.tar.gz
emacs-6e36fe0badf488de5c8bb2475ca475eaa88ea5a1.zip
(makefile-dependency-regex): Disallow "=" in name,
so that "flags=-o:1" is treated as an assignment, not a dependency. (makefile-dependency-regex, makefile-macroassign-regex): Disallow spaces in symbol name.
-rw-r--r--lisp/progmodes/make-mode.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el
index 25aaf3b8cf7..7c7580a7f20 100644
--- a/lisp/progmodes/make-mode.el
+++ b/lisp/progmodes/make-mode.el
@@ -188,14 +188,14 @@ not be enclosed in { } or ( ).")
188;; that if you change this regexp you must fix the imenu index 188;; that if you change this regexp you must fix the imenu index
189;; function defined at the end of the file. 189;; function defined at the end of the file.
190(defconst makefile-dependency-regex 190(defconst makefile-dependency-regex
191 "^ *\\([^\n\t#:]+\\([ \t]+[^ \t\n#:]+\\)*\\)[ \t]*:\\([ \t]*$\\|\\([^=\n].*$\\)\\)" 191 "^ *\\([^ \n\t#:=]+\\([ \t]+[^ \t\n#:=]+\\)*\\)[ \t]*:\\([ \t]*$\\|\\([^=\n].*$\\)\\)"
192 "Regex used to find dependency lines in a makefile.") 192 "Regex used to find dependency lines in a makefile.")
193 193
194;; Note that the first subexpression is used by font lock. Note that 194;; Note that the first subexpression is used by font lock. Note that
195;; if you change this regexp you must fix the imenu index function 195;; if you change this regexp you must fix the imenu index function
196;; defined at the end of the file. 196;; defined at the end of the file.
197(defconst makefile-macroassign-regex 197(defconst makefile-macroassign-regex
198 "^ *\\([^\n\t][^:#= \t\n]*\\)[ \t]*[*:+]?:?=" 198 "^ *\\([^ \n\t][^:#= \t\n]*\\)[ \t]*[*:+]?:?="
199 "Regex used to find macro assignment lines in a makefile.") 199 "Regex used to find macro assignment lines in a makefile.")
200 200
201(defconst makefile-ignored-files-in-pickup-regex 201(defconst makefile-ignored-files-in-pickup-regex