xemacs-beta: lisp/modes/make-mode.el comparison

comparison lisp/modes/make-mode.el @ 2:ac2d302a0011 r19-15b2

Import from CVS: tag r19-15b2

author	cvs
date	Mon, 13 Aug 2007 08:46:35 +0200
parents	376386a54a3c
children	9ee227acff29

comparison

equal deleted inserted replaced

-:c0c6a60d29db
+:ac2d302a0011
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;; General Public License for more details.
 ;; You should have received a copy of the GNU General Public License
 ;; along with XEmacs; see the file COPYING.  If not, write to the Free
-;; Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+;; 02111-1307, USA.
-;;; Synched up with: FSF 19.30.
+;;; Synched up with: FSF 19.34.
 ;;; Commentary:
 ;; A major mode for editing makefiles.  The mode knows about Makefile
 ;; syntax and defines M-n and M-p to move to next and previous productions.
 ;;; Code:
 (provide 'makefile)
 ;; Sadly we need this for a macro.
-;(eval-when-compile
+(eval-when-compile
-;  (require 'imenu))
+(require 'imenu))
 ;;; ------------------------------------------------------------
 ;;; Configurable stuff
 ;;; ------------------------------------------------------------
 "List of special targets.
 You will be offered to complete on one of those in the minibuffer whenever
 you enter a \".\" at the beginning of a line in makefile-mode.")
 (defvar makefile-runtime-macros-list
-'(("@") ("&") (">") ("<") ("*") ("^") ("?") ("%") ("$"))
+'(("@") ("&") (">") ("<") ("*") ("^") ("+") ("?") ("%") ("$"))
 "List of macros that are resolved by make at runtime.
 If you insert a macro reference using makefile-insert-macro-ref, the name
 of the macro is checked against this list. If it can be found its name will
 not be enclosed in { } or ( ).")
 "Regex for filenames that will NOT be included in the target list.")
 ;####
 ;(add-to-list 'facemenu-unlisted-faces 'makefile-space-face)
 ;  Bogus FSFmacs crap.
-(defvar makefile-space-face 'makefile-space-face)
+(defvar makefile-space-face 'makefile-space-face
-;  "Face to use for highlighting leading spaces in Font-Lock mode.")
+"Face to use for highlighting leading spaces in Font-Lock mode.")
 ;Older version of same.
 ;(defconst makefile-font-lock-keywords (purecopy
 ;  (list
 ;   '("^#.*$" . font-lock-comment-face)
 ;; Do macro assignments.  These get the "variable-name" face rather
 ;; arbitrarily.
 (list makefile-macroassign-regex 1 'font-lock-variable-name-face)
 ;;
 ;; Variable references even in targets/strings/comments:
-'("\\$[({]\\([a-zA-Z0-9_]+\\)[})]" 1 font-lock-reference-face t)
+'("\\$[({]\\([a-zA-Z0-9_]+\\)[})]" 1 font-lock-reference-face prepend)
 ;;
 ;; Do dependencies.  These get the function name face.
-(list makefile-dependency-regex 1 'font-lock-function-name-face)
+(list makefile-dependency-regex 1 'font-lock-function-name-face 'prepend)
 ;; Highlight lines that contain just whitespace.
 ;; They can cause trouble, especially if they start with a tab.
 '("^[ \t]+$" . makefile-space-face)
 ;; Highlight shell comments that Make treats as commands,
 ;; since these can fool people.
-'("^\t+#" makefile-space-face t)
+'("^\t+#" 0 makefile-space-face t)
 ;; Highlight spaces that precede tabs.
 ;; They can make a tab fail to be effective.
 '("^\\( +\\)\t" 1 makefile-space-face)))
 "Additional expressions to highlight in makefiles")
 (define-key makefile-mode-map "\C-c\C-\\" 'makefile-backslash-region)
 (define-key makefile-mode-map "\M-p"     'makefile-previous-dependency)
 (define-key makefile-mode-map "\M-n"     'makefile-next-dependency)
 (define-key makefile-mode-map "\e\t"     'makefile-complete))
+;; XEmacs change
 (defconst makefile-menubar-menu
 (purecopy
 '("Makefile"
 ["Move to Next Dependency" makefile-next-dependency t]
 ["Move to Previous Dependency" makefile-previous-dependency t]
 "---"
 ["Find Targets and Macros" makefile-pickup-everything t]
 ["Complete Target or Macro" makefile-complete t]
 ["Pop up Makefile Browser" makefile-switch-to-browser t])))
+;; XEmacs change
 (defconst makefile-popup-menu
 (purecopy
 (cons "Makefile Mode Commands"
 	 (cdr makefile-menubar-menu))))
 ;; Filename functions
 ("dir" "Names")
 ("notdir" "Names")
 ("suffix" "Names")
 ("basename" "Names")
+("addprefix" "Prefix" "Names")
 ("addsuffix" "Suffix" "Names")
 ("join" "List 1" "List 2")
 ("word" "Index" "Text")
 ("words" "Text")
 ("firstword" "Text")
 (make-local-variable 'makefile-has-prereqs)
 (make-local-variable 'makefile-need-target-pickup)
 (make-local-variable 'makefile-need-macro-pickup)
 ;; Font lock.
-(if (fboundp 'makefile-define-space-face)
+(if (fboundp 'make-face)
 (makefile-define-space-face))
+(make-local-variable 'font-lock-defaults)
+(setq font-lock-defaults '(makefile-font-lock-keywords))
 ;; Add-log.
 (make-local-variable 'add-log-current-defun-function)
 (setq add-log-current-defun-function 'makefile-add-log-defun)
-;  ;; Imenu.
+;; Imenu.
-;  (make-local-variable 'imenu-create-index-function)
+(make-local-variable 'imenu-create-index-function)
-;  (setq imenu-create-index-function 'makefile-menu-index-function)
+(setq imenu-create-index-function 'makefile-menu-index-function)
 ;; Dabbrev.
 (make-local-variable 'dabbrev-abbrev-skip-leading-regexp)
 (setq dabbrev-abbrev-skip-leading-regexp "\\$")
 ;; Activate keymap and syntax table.
 (use-local-map makefile-mode-map)
 (set-syntax-table makefile-mode-syntax-table)
 ;; Set menu
+;; XEmacs addition
 (setq mode-popup-menu makefile-popup-menu)
 (if (featurep 'menubar)
 (progn
 	;; make a local copy of the menubar, so our modes don't
 	;; change the global menubar
 		(delete-region (point) saved)))))))
 (defun makefile-backslash-region (beg end arg)
 "Insert backslashes at end of every line in region.
 Useful for defining multi-line rules.
-If called with a prefix argument, trailing backslahes are removed."
+If called with a prefix argument, trailing backslashes are removed."
 (interactive "r\nP")
 (save-excursion
 (let ((do-lastline-p (progn (goto-char end) (not (bolp)))))
 (save-restriction
 	(narrow-to-region beg end)
 (goto-line this-line)
 (let ((inhibit-read-only t))
 (beginning-of-line)
 (if (makefile-browser-on-macro-line-p)
 	  (let ((macro-name (makefile-browser-this-line-macro-name)))
-	    (kill-line)
+	    (delete-region (point) (progn (end-of-line) (point)))
 	    (insert
 	     (makefile-browser-format-macro-line
 		macro-name
 		(makefile-browser-get-state-for-line this-line))))
 	(let ((target-name (makefile-browser-this-line-target-name)))
-	  (kill-line)
+	  (delete-region (point) (progn (end-of-line) (point)))
 	  (insert
 	   (makefile-browser-format-target-line
 	      target-name
 	      (makefile-browser-get-state-for-line this-line))))))
 (beginning-of-line)
 ;;; Support for other packages, like add-log and imenu.
 (defun makefile-add-log-defun ()
-;; "Return name of target or macro point is in, or nil."
+"Return name of target or variable assignment that point is in.
+If it isn't in one, return nil."
 (save-excursion
-(beginning-of-line)
+(let (found)
-(cond
+(beginning-of-line)
-((looking-at makefile-macroassign-regex)
+;; Scan back line by line, noticing when we come to a
-(buffer-substring (match-beginning 1)
+;; variable or rule definition, and giving up when we see
-			(match-end 1)))
+;; a line that is not part of either of those.
-((progn
+(while (not found)
-	(or (eobp) (forward-char))
+	(cond
-	(re-search-backward makefile-dependency-regex nil t))
+	 ((looking-at makefile-macroassign-regex)
-(buffer-substring (match-beginning 1)
+	  (setq found (buffer-substring-no-properties (match-beginning 1)
-			(match-end 1)))
+						      (match-end 1))))
-(t nil))))
+	 ((looking-at makefile-dependency-regex)
+	  (setq found (buffer-substring-no-properties (match-beginning 1)
-;;; FIXME it might be nice to have them separated by macro vs target.
+						      (match-end 1))))
-;(defun makefile-menu-index-function ()
+	 ;; Don't keep looking across a blank line or comment.  Give up.
-;  ;; "Generate alist of indices for imenu."
+	 ((looking-at "$\\|#")
-;  (let (alist
+	  (setq found 'bobp))
-;	stupid
+	 ((bobp)
-;	(re (concat makefile-dependency-regex
+	  (setq found 'bobp)))
-;		    "\\|"
+	(or found
-;		    makefile-macroassign-regex)))
+	    (forward-line -1)))
-;    (imenu-progress-message stupid 0)
+(if (stringp found) found))))
-;    (goto-char (point-min))
-;    (while (re-search-forward re nil t)
+;; FIXME it might be nice to have them separated by macro vs target.
-;      (imenu-progress-message stupid)
+(defun makefile-menu-index-function ()
-;      (let ((n (if (match-beginning 1) 1 5)))
+;; "Generate alist of indices for imenu."
-;	(setq alist (cons
+(let (alist
-;		     (cons (buffer-substring (match-beginning n)
+	stupid
-;					     (match-end n))
+	(re (concat makefile-dependency-regex
-;			   (match-beginning n))
+		    "\\|"
-;		     alist))))
+		    makefile-macroassign-regex)))
-;    (imenu-progress-message stupid 100)
+(imenu-progress-message stupid 0)
-;    (nreverse alist)))
+(goto-char (point-min))
+(while (re-search-forward re nil t)
+(imenu-progress-message stupid)
+(let ((n (if (match-beginning 1) 1 5)))
+	(setq alist (cons
+		     (cons (buffer-substring (match-beginning n)
+					     (match-end n))
+			   (match-beginning n))
+		     alist))))
+(imenu-progress-message stupid 100)
+(nreverse alist)))
 (defun makefile-define-space-face ()
 (make-face 'makefile-space-face)
+;; XEmacs change
 (let* ((light-bg t)) ; ####
 (set-face-background 'makefile-space-face
 			 (if light-bg "black" "white")
 			 nil
 			 '(mono x)

Mercurial > hg > xemacs-beta

comparison lisp/modes/make-mode.el @ 2:ac2d302a0011 r19-15b2