diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/progmodes/make-mode.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 88df059d55c..f864a939361 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2001-07-30 Eli Zaretskii <eliz@is.elta.co.il> | ||
| 2 | |||
| 3 | * progmodes/make-mode.el (makefile-macroassign-regex): Recognize | ||
| 4 | the ?= operator. From Jonathan Kamens <jik@curl.com>. | ||
| 5 | |||
| 1 | 2001-07-30 Gerd Moellmann <gerd@gnu.org> | 6 | 2001-07-30 Gerd Moellmann <gerd@gnu.org> |
| 2 | 7 | ||
| 3 | * vc.el (vc-switch-backend): Fix autoload cookie. | 8 | * vc.el (vc-switch-backend): Fix autoload cookie. |
diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el index 686aa27fbde..3ce6cdb0195 100644 --- a/lisp/progmodes/make-mode.el +++ b/lisp/progmodes/make-mode.el | |||
| @@ -248,7 +248,7 @@ not be enclosed in { } or ( )." | |||
| 248 | ;; that if you change this regexp you might have to fix the imenu | 248 | ;; that if you change this regexp you might have to fix the imenu |
| 249 | ;; index in makefile-imenu-generic-expression. | 249 | ;; index in makefile-imenu-generic-expression. |
| 250 | (defconst makefile-macroassign-regex | 250 | (defconst makefile-macroassign-regex |
| 251 | "^ *\\([^ \n\t][^:#= \t\n]*\\)[ \t]*[*:+]?:?=" | 251 | "^ *\\([^ \n\t][^:#= \t\n]*\\)[ \t]*[*:+]?[:?]?=" |
| 252 | "Regex used to find macro assignment lines in a makefile.") | 252 | "Regex used to find macro assignment lines in a makefile.") |
| 253 | 253 | ||
| 254 | (defconst makefile-ignored-files-in-pickup-regex | 254 | (defconst makefile-ignored-files-in-pickup-regex |