X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/e006b3cd93b56b93ec65e884a8c19efc7b3e0dbe..4f124fb5287c38e0f8e507a2b8a5edd4d0cfb42c:/lisp/progmodes/make-mode.el diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el index ad635c0c3e..99138444f7 100644 --- a/lisp/progmodes/make-mode.el +++ b/lisp/progmodes/make-mode.el @@ -1,6 +1,6 @@ ;;; make-mode.el --- makefile editing commands for Emacs -;; Copyright (C) 1992,94,99,2000,2001, 2002 Free Software Foundation, Inc. +;; Copyright (C) 1992,94,99,2000,2001, 2002, 2003 Free Software Foundation, Inc. ;; Author: Thomas Neumann ;; Eric S. Raymond @@ -8,11 +8,6 @@ ;; Adapted-By: ESR ;; Keywords: unix, tools -;; RMS: -;; This needs work. -;; Also, the doc strings need fixing: the first line doesn't stand alone, -;; and other usage is not high quality. Symbol names don't have `...'. - ;; This file is part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify @@ -63,6 +58,7 @@ ;; ;; To Do: ;; +;; * Add missing doc strings, improve terse doc strings. ;; * Eliminate electric stuff entirely. ;; * It might be nice to highlight targets differently depending on ;; whether they are up-to-date or not. Not sure how this would @@ -108,7 +104,7 @@ (t (:reverse-video t))) "Face to use for highlighting leading spaces in Font-Lock mode." :group 'faces - :group 'makemode) + :group 'makefile) (defcustom makefile-browser-buffer-name "*Macros and Targets*" "*Name of the macro- and target browser buffer." @@ -192,7 +188,7 @@ Otherwise filenames are omitted." :type 'boolean :group 'makefile) -(defcustom makefile-cleanup-continuations t +(defcustom makefile-cleanup-continuations nil "*If non-nil, automatically clean up continuation lines when saving. A line is cleaned up by removing all whitespace following a trailing backslash. This is done silently. @@ -210,7 +206,7 @@ to MODIFY A FILE WITHOUT YOUR CONFIRMATION when \"it seems necessary\"." ;; ;; Special targets for DMake, Sun's make ... -;; +;; (defcustom makefile-special-targets-list '(("DEFAULT") ("DONE") ("ERROR") ("EXPORT") ("FAILED") ("GROUPEPILOG") ("GROUPPROLOG") ("IGNORE") @@ -268,18 +264,23 @@ not be enclosed in { } or ( )." ;; Do dependencies. These get the function name face. (list makefile-dependency-regex 1 'font-lock-function-name-face) - ;; Variable references even in targets/strings/comments: - '("\\$[({]\\([-a-zA-Z0-9_.]+\\)[}):]" 1 font-lock-constant-face prepend) + ;; Variable references even in targets/strings/comments. + '("[^$]\\$[({]\\([-a-zA-Z0-9_.]+\\|[@%\\)" + 1 font-lock-constant-face prepend) ;; Fontify conditionals and includes. ;; Note that plain `if' is an automake conditional, and not a bug. (list (concat "^\\(?: [ \t]*\\)?" (regexp-opt '("-include" "-sinclude" "include" "sinclude" "ifeq" - "if" "ifneq" "ifdef" "ifndef" "endif" "else") t) + "if" "ifneq" "ifdef" "ifndef" "endif" "else" + "define" "endef" "override" + "export" "unexport" "vpath") t) "\\>[ \t]*\\([^: \t\n#]*\\)") '(1 font-lock-keyword-face) '(2 font-lock-variable-name-face)) @@ -295,6 +296,16 @@ not be enclosed in { } or ( )." ;; They can make a tab fail to be effective. '("^\\( +\\)\t" 1 makefile-space-face))) +(defconst makefile-font-lock-syntactic-keywords + ;; From sh-script.el. + ;; A `#' begins a comment in sh when it is unquoted and at the beginning + ;; of a word. In the shell, words are separated by metacharacters. + ;; The list of special chars is taken from the single-unix spec of the + ;; shell command language (under `quoting') but with `$' removed. + '(("[^|&;<>()`\\\"' \t\n]\\(#+\\)" 1 "_") + ;; Change the syntax of a quoted newline so that it does not end a comment. + ("\\\\\n" 0 "."))) + (defvar makefile-imenu-generic-expression (list (list "Dependencies" makefile-dependency-regex 1) @@ -567,6 +578,8 @@ Makefile mode can be configured by modifying the following variables: (kill-all-local-variables) (add-hook 'write-file-functions 'makefile-warn-suspicious-lines nil t) + (add-hook 'write-file-functions + 'makefile-warn-continuations nil t) (add-hook 'write-file-functions 'makefile-cleanup-continuations nil t) (make-local-variable 'makefile-target-table) @@ -581,7 +594,11 @@ Makefile mode can be configured by modifying the following variables: ;; SYNTAX-BEGIN set to backward-paragraph to avoid slow-down ;; near the end of a large buffer, due to parse-partial-sexp's ;; trying to parse all the way till the beginning of buffer. - '(makefile-font-lock-keywords nil nil nil backward-paragraph)) + '(makefile-font-lock-keywords + nil nil + ((?$ . ".")) + backward-paragraph + (font-lock-syntactic-keywords . makefile-font-lock-syntactic-keywords))) ;; Add-log. (make-local-variable 'add-log-current-defun-function) @@ -1011,7 +1028,7 @@ definition and conveniently use this command." (save-excursion (beginning-of-line) (cond - ((looking-at "^#+ ") + ((looking-at "^#+") ;; Found a comment. Set the fill prefix, and find the paragraph ;; boundaries by searching for lines that look like comment-only ;; lines. @@ -1353,7 +1370,7 @@ and generates the overview, one line per target name." (delete-file filename)) ; remove the tmpfile (defun makefile-query-by-make-minus-q (target &optional filename) - (not (zerop + (not (eq 0 (call-process makefile-brave-make nil nil nil "-f" filename "-q" target)))) @@ -1384,9 +1401,17 @@ and generates the overview, one line per target name." (goto-char (point-min)) (if (re-search-forward "^\\(\t+$\\| +\t\\)" nil t) (not (y-or-n-p - (format "Suspicious line %d. Save anyway " + (format "Suspicious line %d. Save anyway? " + (count-lines (point-min) (point))))))))) + +(defun makefile-warn-continuations () + (if (eq major-mode 'makefile-mode) + (save-excursion + (goto-char (point-min)) + (if (re-search-forward "\\\\[ \t]+$" nil t) + (not (y-or-n-p + (format "Suspicious continuation in line %d. Save anyway? " (count-lines (point-min) (point))))))))) - ;;; ------------------------------------------------------------ @@ -1528,4 +1553,5 @@ If it isn't in one, return nil." (provide 'make-mode) +;;; arch-tag: bd23545a-de91-44fb-b1b2-feafbb2635a0 ;;; make-mode.el ends here