[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.93 
emacs/lisp/progmodes/make-mode.el:1.94
*** emacs/lisp/progmodes/make-mode.el:1.93      Tue May 17 21:36:49 2005
--- emacs/lisp/progmodes/make-mode.el   Wed May 18 20:10:48 2005
***************
*** 353,367 ****
       1 'makefile-targets-face prepend)
  
      ;; Fontify conditionals and includes.
-     ;; Note that plain `if' is an automake conditional, and not a bug.
      (,(concat "^\\(?: [ \t]*\\)?"
              (regexp-opt keywords t)
              "\\>[ \t]*\\([^: \t\n#]*\\)")
       (1 font-lock-keyword-face) (2 font-lock-variable-name-face))
  
      ,@(if negation
!        `((,negation (1 font-lock-negation-char-face prepend)
!                     (2 font-lock-negation-char-face prepend t))))
  
      ,@(if space
          '(;; Highlight lines that contain just whitespace.
--- 353,366 ----
       1 'makefile-targets-face prepend)
  
      ;; Fontify conditionals and includes.
      (,(concat "^\\(?: [ \t]*\\)?"
              (regexp-opt keywords t)
              "\\>[ \t]*\\([^: \t\n#]*\\)")
       (1 font-lock-keyword-face) (2 font-lock-variable-name-face))
  
      ,@(if negation
!         `((,negation (1 font-lock-negation-char-face prepend)
!                      (2 font-lock-negation-char-face prepend t))))
  
      ,@(if space
          '(;; Highlight lines that contain just whitespace.
***************
*** 894,901 ****
      (catch 'found
        (while (and (< (skip-chars-backward makefile-dependency-skip) 0)
                  (not (bobp)))
!       (backward-char)
!       (or (get-text-property (point) 'face)
            (beginning-of-line)
            (if (looking-at makefile-dependency-regex)
                (throw 'found t))))
--- 893,901 ----
      (catch 'found
        (while (and (< (skip-chars-backward makefile-dependency-skip) 0)
                  (not (bobp)))
!       (or (prog1 (eq (char-after) ?=)
!             (backward-char))
!           (get-text-property (point) 'face)
            (beginning-of-line)
            (if (looking-at makefile-dependency-regex)
                (throw 'found t))))
***************
*** 1707,1713 ****
        (while (and (> (skip-chars-forward makefile-dependency-skip bound) 0)
                  (not (eobp)))
        (forward-char)
!       (or (get-text-property (1- (point)) 'face)
            (when (save-excursion
                    (beginning-of-line)
                    (looking-at makefile-dependency-regex))
--- 1707,1714 ----
        (while (and (> (skip-chars-forward makefile-dependency-skip bound) 0)
                  (not (eobp)))
        (forward-char)
!       (or (eq (char-after) ?=)
!           (get-text-property (1- (point)) 'face)
            (when (save-excursion
                    (beginning-of-line)
                    (looking-at makefile-dependency-regex))