diff options
| author | Richard M. Stallman <[email protected]> | 2005-06-08 15:43:59 +0000 |
|---|---|---|
| committer | Richard M. Stallman <[email protected]> | 2005-06-08 15:43:59 +0000 |
| commit | 9391790a10e3c876cea26819b8b923de0d73ff66 (patch) | |
| tree | 75674edc1e43c53f9891b40ca445a42c22beb6d7 /lisp/progmodes/make-mode.el | |
| parent | 676873ff4452ce29142ad174c808c8b0993b1881 (diff) | |
(makefile-shell-face): Make this a no-op
except on terminals with enough colors to really display it.
(makefile-dependency-regex): Delete spurious `bb'.
Diffstat (limited to 'lisp/progmodes/make-mode.el')
| -rw-r--r-- | lisp/progmodes/make-mode.el | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el index 35fcc37a29..d2d2dc6263 100644 --- a/lisp/progmodes/make-mode.el +++ b/lisp/progmodes/make-mode.el @@ -115,9 +115,8 @@ :version "22.1") (defface makefile-shell-face - '((((class color) (background light)) (:background "seashell1")) - (((class color) (background dark)) (:background "seashell4")) - (t (:reverse-video t))) + '((((class color) (min-colors 88) (background light)) (:background "seashell1")) + (((class color) (min-colors 88) (background dark)) (:background "seashell4"))) "Face to use for additionally highlighting Shell commands in Font-Lock mode." :group 'faces :group 'makefile @@ -262,7 +261,7 @@ not be enclosed in { } or ( )." ;; index in makefile-imenu-generic-expression. (defvar makefile-dependency-regex ;; Allow for two nested levels $(v1:$(v2:$(v3:a=b)=c)=d) - "^\\(\\(?:\\$\\(?:[({]\\(?:\\$\\(?:[({]\\(?:\\$\\(?:[^({]\\|.[^\n$#})]+?[})]\\)\\|[^\n$#)}]\\)+?[})]\\|[^({]\\)\\|[^\n$#)}]\\)+?[})]\\|[^({]\\)\\|[^\n$#:=]\\)+?\\)\\(:\\)\\(?:[ \t]*$\\|[^=\n]\\(?:[^#\n]*?;[ \t]*\\(bb.+\\)\\)?\\)" + "^\\(\\(?:\\$\\(?:[({]\\(?:\\$\\(?:[({]\\(?:\\$\\(?:[^({]\\|.[^\n$#})]+?[})]\\)\\|[^\n$#)}]\\)+?[})]\\|[^({]\\)\\|[^\n$#)}]\\)+?[})]\\|[^({]\\)\\|[^\n$#:=]\\)+?\\)\\(:\\)\\(?:[ \t]*$\\|[^=\n]\\(?:[^#\n]*?;[ \t]*\\(.+\\)\\)?\\)" "Regex used to find dependency lines in a makefile.") (defconst makefile-bsdmake-dependency-regex |