diff options
| author | Andreas Schwab <schwab@suse.de> | 2003-02-24 23:49:27 +0000 |
|---|---|---|
| committer | Andreas Schwab <schwab@suse.de> | 2003-02-24 23:49:27 +0000 |
| commit | 33f8eee3edc04006e89c4d3830e26b89b8b833b0 (patch) | |
| tree | 2bbd9c7791ee87c7362e52d741e3273e08c8be03 /lisp/progmodes/make-mode.el | |
| parent | 360564561e4f6b8cab6eb00d25f19eb3279a5058 (diff) | |
| download | emacs-33f8eee3edc04006e89c4d3830e26b89b8b833b0.tar.gz emacs-33f8eee3edc04006e89c4d3830e26b89b8b833b0.tar.bz2 emacs-33f8eee3edc04006e89c4d3830e26b89b8b833b0.zip | |
(makefile-font-lock-keywords): Protect
shell variable references by requireing that $ is not preceded by
another $.
Diffstat (limited to 'lisp/progmodes/make-mode.el')
| -rw-r--r-- | lisp/progmodes/make-mode.el | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el index dcab340ec82..4ffdfdef011 100644 --- a/lisp/progmodes/make-mode.el +++ b/lisp/progmodes/make-mode.el @@ -1,6 +1,6 @@ ;;; make-mode.el --- makefile editing commands for Emacs -;; Copyright (C) 1992,94,99,2000,2001, 2002 Free Software Foundation, Inc. +;; Copyright (C) 1992,94,99,2000,2001, 2002, 2003 Free Software Foundation, Inc. ;; Author: Thomas Neumann <tom@smart.bo.open.de> ;; Eric S. Raymond <esr@snark.thyrsus.com> @@ -269,14 +269,13 @@ not be enclosed in { } or ( )." (list makefile-dependency-regex 1 'font-lock-function-name-face) ;; Variable references even in targets/strings/comments. - '("\\$[({]\\([-a-zA-Z0-9_.]+\\|[@%<?^+*][FD]?\\)[}):]" + '("[^$]\\$[({]\\([-a-zA-Z0-9_.]+\\|[@%<?^+*][FD]?\\)[}):]" 1 font-lock-constant-face prepend) - ;; Automatic variable references and single character variable references... - '("\\$\\([@%<?^+*_]\\|[a-zA-Z0-9]\\>\\)" 1 font-lock-constant-face prepend) - - ;; ...but not shell variables references. - '("\\$\\$\\(\\sw+\\)" 1 'default t) + ;; Automatic variable references and single character variable references, + ;; but not shell variables references. + '("[^$]\\$\\([@%<?^+*_]\\|[a-zA-Z0-9]\\>\\)" + 1 font-lock-constant-face prepend) ;; Fontify conditionals and includes. ;; Note that plain `if' is an automake conditional, and not a bug. |