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

[Daniel Pfeiffer]

Index: emacs/lisp/progmodes/make-mode.el
diff -c emacs/lisp/progmodes/make-mode.el:1.97 
emacs/lisp/progmodes/make-mode.el:1.98
*** emacs/lisp/progmodes/make-mode.el:1.97      Sat May 21 02:45:27 2005
--- emacs/lisp/progmodes/make-mode.el   Sun May 29 07:52:55 2005
***************
*** 266,279 ****
    "Characters to skip to find a line that might be a dependency.")
  
  (defvar makefile-rule-action-regex
!   "^\t[ \t]*\\(address@hidden)[ \t]*\\(\\(?:.+\\\\\n\\)*.+\\)"
    "Regex used to highlight rule action lines in font lock mode.")
  
  ;; Note that the first and second subexpression is used by font lock.  Note
  ;; that if you change this regexp you might have to fix the imenu index in
  ;; makefile-imenu-generic-expression.
  (defconst makefile-macroassign-regex
!   "^ *\\([^ \n\t][^:#= \t\n]*\\)[ \t]*\\(?:!=[ 
\t]*\\(\\(?:.+\\\\\n\\)*.+\\)\\|[*:+]?[:?]?=[ \t]*\\(\\(?:.+\\\\\n\\)*.+\\)\\)"
    "Regex used to find macro assignment lines in a makefile.")
  
  (defconst makefile-var-use-regex
--- 266,279 ----
    "Characters to skip to find a line that might be a dependency.")
  
  (defvar makefile-rule-action-regex
!   "^\t[ \t]*\\(address@hidden)[ \t]*\\(\\(?:.*\\\\\n\\)*.*\\)"
    "Regex used to highlight rule action lines in font lock mode.")
  
  ;; Note that the first and second subexpression is used by font lock.  Note
  ;; that if you change this regexp you might have to fix the imenu index in
  ;; makefile-imenu-generic-expression.
  (defconst makefile-macroassign-regex
!   "^ *\\([^ \n\t][^:#= \t\n]*\\)[ \t]*\\(?:!=[ 
\t]*\\(\\(?:.+\\\\\n\\)*.+\\)\\|[*:+]?[:?]?=[ \t]*\\(\\(?:.*\\\\\n\\)*.*\\)\\)"
    "Regex used to find macro assignment lines in a makefile.")
  
  (defconst makefile-var-use-regex
***************
*** 420,426 ****
     nil
     "^\\(?: [ \t]*\\)?\\(?:and[ \t]+\\|else[ \t]+\\|or[ 
\t]+\\)?if\\(n\\)\\(?:def\\|eq\\|sys\\)\\>"
  
!    '("[^$]\\(\\$[({]\\(?:target\\|output\\)s?\\_>.*?[})]\\)"
       1 'makefile-targets-face prepend)
  
     ;; Colon modifier keywords.
--- 420,426 ----
     nil
     "^\\(?: [ \t]*\\)?\\(?:and[ \t]+\\|else[ \t]+\\|or[ 
\t]+\\)?if\\(n\\)\\(?:def\\|eq\\|sys\\)\\>"
  
!    '("[^$]\\(\\$[({]\\(?:output\\|stem\\|target\\)s?\\_>.*?[})]\\)"
       1 'makefile-targets-face prepend)
  
     ;; Colon modifier keywords.