[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.98 
emacs/lisp/progmodes/make-mode.el:1.99
*** emacs/lisp/progmodes/make-mode.el:1.98      Sun May 29 07:52:55 2005
--- emacs/lisp/progmodes/make-mode.el   Sun May 29 07:59:51 2005
***************
*** 851,857 ****
    "An adapted `makefile-mode' that knows about makepp."
     (set (make-local-variable 'makefile-rule-action-regex)
        ;; Don't care about initial tab, but I don't know how to font-lock 
correctly without.
!       "^\t[ \t]*\\(\\(?:\\(?:noecho\\|ignore[-_]error\\|address@hidden)[ 
\t]*\\)*\\)\\(\\(&\\S +\\)?\\(?:.+\\\\\n\\)*.+\\)")
  
    (setq font-lock-defaults
        `(makefile-makepp-font-lock-keywords ,@(cdr font-lock-defaults))
--- 851,857 ----
    "An adapted `makefile-mode' that knows about makepp."
     (set (make-local-variable 'makefile-rule-action-regex)
        ;; Don't care about initial tab, but I don't know how to font-lock 
correctly without.
!       "^\t[ \t]*\\(\\(?:\\(?:noecho\\|ignore[-_]error\\|address@hidden)[ 
\t]*\\)*\\)\\(\\(&\\S +\\)?\\(?:.*\\\\\n\\)*.*\\)")
  
    (setq font-lock-defaults
        `(makefile-makepp-font-lock-keywords ,@(cdr font-lock-defaults))
***************
*** 867,873 ****
         "^ *\\(\\(?: 
*\\$\\(?:[({]\\(?:\\$\\(?:[({]\\(?:\\$\\(?:[^({]\\|.[^\n$#})]+?[})]\\)\\|[^\n$#)}]\\)+?[})]\\|[^({]\\)\\|[^\n$#)}]\\)+?[})]\\|[^({]\\)\\|
 *[^ \n$#:=]+\\)+?\\)[ \t]*\\([:!]\\)\\(?:[ \t]*$\\|[^=\n]\\(?:[^#\n]*?;[ 
\t]*\\(.+\\)\\)?\\)")
    (set (make-local-variable 'makefile-dependency-skip) "^:!")
    (set (make-local-variable 'makefile-rule-action-regex)
!        "^\t[ \t]*\\(address@hidden)[ \t]*\\(\\(?:.+\\\\\n\\)*.+\\)")
    (setq font-lock-defaults
        `(makefile-bsdmake-font-lock-keywords ,@(cdr font-lock-defaults))))
  
--- 867,873 ----
         "^ *\\(\\(?: 
*\\$\\(?:[({]\\(?:\\$\\(?:[({]\\(?:\\$\\(?:[^({]\\|.[^\n$#})]+?[})]\\)\\|[^\n$#)}]\\)+?[})]\\|[^({]\\)\\|[^\n$#)}]\\)+?[})]\\|[^({]\\)\\|
 *[^ \n$#:=]+\\)+?\\)[ \t]*\\([:!]\\)\\(?:[ \t]*$\\|[^=\n]\\(?:[^#\n]*?;[ 
\t]*\\(.+\\)\\)?\\)")
    (set (make-local-variable 'makefile-dependency-skip) "^:!")
    (set (make-local-variable 'makefile-rule-action-regex)
!        "^\t[ \t]*\\(address@hidden)[ \t]*\\(\\(?:.*\\\\\n\\)*.*\\)")
    (setq font-lock-defaults
        `(makefile-bsdmake-font-lock-keywords ,@(cdr font-lock-defaults))))