[Emacs-diffs] Changes to emacs/lisp/progmodes/make-mode.el

[Richard M . Stallman]

Index: emacs/lisp/progmodes/make-mode.el
diff -c emacs/lisp/progmodes/make-mode.el:1.101 
emacs/lisp/progmodes/make-mode.el:1.102
*** emacs/lisp/progmodes/make-mode.el:1.101     Mon Jun  6 12:50:01 2005
--- emacs/lisp/progmodes/make-mode.el   Wed Jun  8 15:43:59 2005
***************
*** 115,123 ****
    :version "22.1")
  
  (defface makefile-shell-face
!   '((((class color) (background light)) (:background  "seashell1"))
!     (((class color) (background dark)) (:background  "seashell4"))
!     (t (:reverse-video t)))
    "Face to use for additionally highlighting Shell commands in Font-Lock 
mode."
    :group 'faces
    :group 'makefile
--- 115,122 ----
    :version "22.1")
  
  (defface makefile-shell-face
!   '((((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,268 ****
  ;; 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.+\\)\\)?\\)"
    "Regex used to find dependency lines in a makefile.")
  
  (defconst makefile-bsdmake-dependency-regex
--- 261,267 ----
  ;; 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]*\\(.+\\)\\)?\\)"
    "Regex used to find dependency lines in a makefile.")
  
  (defconst makefile-bsdmake-dependency-regex