diff options
Diffstat (limited to 'lisp/progmodes/make-mode.el')
| -rw-r--r-- | lisp/progmodes/make-mode.el | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el index ec246d63ac2..8596d78a604 100644 --- a/lisp/progmodes/make-mode.el +++ b/lisp/progmodes/make-mode.el @@ -316,7 +316,7 @@ not be enclosed in { } or ( )." (defconst makefile-gmake-statements `("-sinclude" "sinclude" ; makefile-makepp-statements takes rest "ifdef" "ifndef" "ifeq" "ifneq" "-include" "define" "endef" "export" - "override define" "override" "unexport" "vpath" + "override define" "override" "unexport" "vpath" "undefine" ,@(cdr makefile-automake-statements)) "List of keywords understood by gmake.") @@ -1413,7 +1413,7 @@ Fill comments, backslashed lines, and variable definitions specially." "Leave the browser and return to the makefile buffer." (interactive) (let ((my-client makefile-browser-client)) - (setq makefile-browser-client nil) ; we quitted, so NO client! + (setq makefile-browser-client nil) ; we quit, so NO client! (set-buffer-modified-p nil) (quit-window t) (pop-to-buffer my-client))) @@ -1600,20 +1600,19 @@ Checks each target in TARGET-TABLE using and generates the overview, one line per target name." (insert (mapconcat - (function (lambda (item) - (let* ((target-name (car item)) - (no-prereqs (not (member target-name prereq-list))) - (needs-rebuild (or no-prereqs - (funcall - makefile-query-one-target-method-function - target-name - filename)))) - (format "\t%s%s" - target-name - (cond (no-prereqs " .. has no prerequisites") - (needs-rebuild " .. NEEDS REBUILD") - (t " .. is up to date")))) - )) + (lambda (item) + (let* ((target-name (car item)) + (no-prereqs (not (member target-name prereq-list))) + (needs-rebuild (or no-prereqs + (funcall + makefile-query-one-target-method-function + target-name + filename)))) + (format "\t%s%s" + target-name + (cond (no-prereqs " .. has no prerequisites") + (needs-rebuild " .. NEEDS REBUILD") + (t " .. is up to date"))))) target-table "\n")) (goto-char (point-min)) (delete-file filename)) ; remove the tmpfile @@ -1687,9 +1686,9 @@ Then prompts for all required parameters." (defun makefile-prompt-for-gmake-funargs (function-name prompt-list) (mapconcat - (function (lambda (one-prompt) - (read-string (format "[%s] %s: " function-name one-prompt) - nil))) + (lambda (one-prompt) + (read-string (format "[%s] %s: " function-name one-prompt) + nil)) prompt-list ",")) @@ -1721,7 +1720,9 @@ matched in a rule action." (while (progn (skip-chars-forward makefile-dependency-skip bound) (< (point) (or bound (point-max)))) (forward-char) - (or (eq (char-after) ?=) + ;; The GNU immediate assignment operator is ":=", while the + ;; POSIX operator is "::=". + (or (looking-at ":?=") (get-text-property (1- (point)) 'face) (if (> (line-beginning-position) (+ (point-min) 2)) (eq (char-before (line-end-position 0)) ?\\)) |