[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.96 
emacs/lisp/progmodes/make-mode.el:1.97
*** emacs/lisp/progmodes/make-mode.el:1.96      Thu May 19 15:46:00 2005
--- emacs/lisp/progmodes/make-mode.el   Sat May 21 02:45:27 2005
***************
*** 484,490 ****
      ("\\\\\n" 0 ".")))
  
  (defvar makefile-imenu-generic-expression
!   `(("Dependencies" ,makefile-dependency-regex 1)
      ("Macro Assignment" ,makefile-macroassign-regex 1))
    "Imenu generic expression for Makefile mode.  See 
`imenu-generic-expression'.")
  
--- 484,490 ----
      ("\\\\\n" 0 ".")))
  
  (defvar makefile-imenu-generic-expression
!   `(("Dependencies" makefile-previous-dependency 1)
      ("Macro Assignment" ,makefile-macroassign-regex 1))
    "Imenu generic expression for Makefile mode.  See 
`imenu-generic-expression'.")
  
***************
*** 854,860 ****
        "^\t[ \t]*\\(\\(?:\\(?:noecho\\|ignore[-_]error\\|address@hidden)[ 
\t]*\\)*\\)\\(\\(&\\S +\\)?\\(?:.+\\\\\n\\)*.+\\)")
  
    (setq font-lock-defaults
!       `(makefile-makepp-font-lock-keywords ,@(cdr font-lock-defaults))))
  
  ;;;###autoload
  (define-derived-mode makefile-bsdmake-mode makefile-mode "BSDmakefile"
--- 854,863 ----
        "^\t[ \t]*\\(\\(?:\\(?:noecho\\|ignore[-_]error\\|address@hidden)[ 
\t]*\\)*\\)\\(\\(&\\S +\\)?\\(?:.+\\\\\n\\)*.+\\)")
  
    (setq font-lock-defaults
!       `(makefile-makepp-font-lock-keywords ,@(cdr font-lock-defaults))
!       imenu-generic-expression
!       `(("Functions" "^[ \t]*\\(?:make\\)?sub[ \t]+\\([A-Za-z0-9_]+\\)" 1)
!         ,@imenu-generic-expression)))
  
  ;;;###autoload
  (define-derived-mode makefile-bsdmake-mode makefile-mode "BSDmakefile"
***************
*** 866,875 ****
    (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))
!       imenu-generic-expression
!       `(("Dependencies" ,makefile-dependency-regex 1)
!         ,@(cdr imenu-generic-expression))))
  
  
  
--- 869,875 ----
    (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))))
  
  
  
***************
*** 1682,1688 ****
    (catch 'found
      (let ((pt (point)))
        (while (progn (skip-chars-forward makefile-dependency-skip bound)
!                   (not (eobp)))
        (forward-char)
        (or (eq (char-after) ?=)
            (get-text-property (1- (point)) 'face)
--- 1682,1688 ----
    (catch 'found
      (let ((pt (point)))
        (while (progn (skip-chars-forward makefile-dependency-skip bound)
!                   (< (point) (or bound (point-max))))
        (forward-char)
        (or (eq (char-after) ?=)
            (get-text-property (1- (point)) 'face)