Mercurial > emacs
changeset 49970:b24aa35dff94
(makefile-font-lock-keywords): Protect
shell variable references by requireing that $ is not preceded by
another $.
| author | Andreas Schwab <schwab@suse.de> |
|---|---|
| date | Mon, 24 Feb 2003 23:49:27 +0000 |
| parents | 1f508e24a50f |
| children | afbb2d6d2f07 |
| files | lisp/progmodes/make-mode.el |
| diffstat | 1 files changed, 6 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/progmodes/make-mode.el Mon Feb 24 23:09:57 2003 +0000 +++ b/lisp/progmodes/make-mode.el Mon Feb 24 23:49:27 2003 +0000 @@ -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 @@ (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.