diff options
| author | Miles Bader <miles@gnu.org> | 2005-05-26 05:42:19 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2005-05-26 05:42:19 +0000 |
| commit | d2eeec7fb90dc54c4b08e85f452a23317c0ee65d (patch) | |
| tree | cd13677b902ee91ff96c5f43ca30ae2aba828312 /lisp/progmodes/make-mode.el | |
| parent | 5611ba87dd81c98d2cc00a4d01e19db3d26cf9d5 (diff) | |
| parent | c0e9b2d0ec9cb343733243371efecf77722b067f (diff) | |
| download | emacs-d2eeec7fb90dc54c4b08e85f452a23317c0ee65d.tar.gz | |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-55
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 320-323)
- Update from CVS
Diffstat (limited to 'lisp/progmodes/make-mode.el')
| -rw-r--r-- | lisp/progmodes/make-mode.el | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el index 86002768757..05c3ac50787 100644 --- a/lisp/progmodes/make-mode.el +++ b/lisp/progmodes/make-mode.el @@ -484,7 +484,7 @@ not be enclosed in { } or ( )." ("\\\\\n" 0 "."))) (defvar makefile-imenu-generic-expression - `(("Dependencies" ,makefile-dependency-regex 1) + `(("Dependencies" makefile-previous-dependency 1) ("Macro Assignment" ,makefile-macroassign-regex 1)) "Imenu generic expression for Makefile mode. See `imenu-generic-expression'.") @@ -854,7 +854,10 @@ Makefile mode can be configured by modifying the following variables: "^\t[ \t]*\\(\\(?:\\(?:noecho\\|ignore[-_]error\\|[-@]+\\)[ \t]*\\)*\\)\\(\\(&\\S +\\)?\\(?:.+\\\\\n\\)*.+\\)") (setq font-lock-defaults - `(makefile-makepp-font-lock-keywords ,@(cdr 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,10 +869,7 @@ Makefile mode can be configured by modifying the following variables: (set (make-local-variable 'makefile-rule-action-regex) "^\t[ \t]*\\([-+@]*\\)[ \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)))) + `(makefile-bsdmake-font-lock-keywords ,@(cdr font-lock-defaults)))) @@ -1682,7 +1682,7 @@ matched in a rule action." (catch 'found (let ((pt (point))) (while (progn (skip-chars-forward makefile-dependency-skip bound) - (not (eobp))) + (< (point) (or bound (point-max)))) (forward-char) (or (eq (char-after) ?=) (get-text-property (1- (point)) 'face) |