[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.92 
emacs/lisp/progmodes/make-mode.el:1.93
*** emacs/lisp/progmodes/make-mode.el:1.92      Tue May 17 20:44:18 2005
--- emacs/lisp/progmodes/make-mode.el   Tue May 17 21:36:49 2005
***************
*** 273,279 ****
  ;; 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\\)*.+\\)\\|[*:+]?[:?]?=\\)"
    "Regex used to find macro assignment lines in a makefile.")
  
  (defconst makefile-var-use-regex
--- 273,279 ----
  ;; 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
***************
*** 331,337 ****
      (,makefile-macroassign-regex
       (1 font-lock-variable-name-face)
       ;; This is for after !=
!      (2 'makefile-shell-face prepend t))
  
      ;; Rule actions.
      (makefile-match-action
--- 331,339 ----
      (,makefile-macroassign-regex
       (1 font-lock-variable-name-face)
       ;; This is for after !=
!      (2 'makefile-shell-face prepend t)
!      ;; This is for after normal assignment
!      (3 'font-lock-string-face prepend t))
  
      ;; Rule actions.
      (makefile-match-action
***************
*** 787,793 ****
          nil nil
          ((?$ . "."))
          backward-paragraph
!         (font-lock-syntactic-keywords . 
makefile-font-lock-syntactic-keywords)))
  
    ;; Add-log.
    (make-local-variable 'add-log-current-defun-function)
--- 789,796 ----
          nil nil
          ((?$ . "."))
          backward-paragraph
!         (font-lock-syntactic-keywords . makefile-font-lock-syntactic-keywords)
!         (font-lock-support-mode)))    ; JIT breaks on long series of 
continuation lines.
  
    ;; Add-log.
    (make-local-variable 'add-log-current-defun-function)