emacs: lisp/progmodes/compile.el comparison

comparison lisp/progmodes/compile.el @ 54742:0a2de4900b34

(compilation-warning-face, compilation-info-face, compilation-skip-threshold) (compilation-skip-visited, compilation-context-lines): Declare :version when added to Emacs. (compilation-error-regexp-alist-alist): Extend caml and irix. (compilation-setup): Fix if font-locked w/o font-lock-defaults. (compilation-mode-font-lock-keywords): Temporarily undo line as function patch, which wasn't ready.

author	Daniel Pfeiffer <occitan@esperanto.org>
date	Wed, 07 Apr 2004 12:56:08 +0000
parents	677905e471e2
children	bdc00a83ecd1

comparison

equal deleted inserted replaced

-:bcb154ea0393
+:0a2de4900b34
 ;; buffer.
 ;;; Code:
-;; This is the parsing engine for compile:
 (defgroup compilation nil
 "Run compiler as inferior of Emacs, parse error messages."
 :group 'tools
 :group 'processes)
 "^\\(?:Error\\|Warnin\\(g\\)\\) \\(?:[FEW][0-9]+ \\)?\
 \\([a-zA-Z]?:?[^:( \t\n]+\\)\
 \\([0-9]+\\)\\(?:[) \t]\\|:[^0-9\n]\\)" 2 3 nil (1))
 (caml
-"^ *File \"\\([^,\" \n\t]+\\)\", lines? \\([0-9]+\\)-?\\([0-9]+\\)?,\
+"^ *File \\(\"?\\)\\([^,\" \n\t<>]+\\)\\1, lines? \\([0-9]+\\)-?\\([0-9]+\\)?\\(?:$\\|,\
-\\(?: characters? \\([0-9]+\\)-?\\([0-9]+\\)?:\\)?\\([ \n]Warning:\\)?"
+\\(?: characters? \\([0-9]+\\)-?\\([0-9]+\\)?:\\)?\\([ \n]Warning:\\)?\\)"
-1 (2 . 3) (4 . 5) (6))
+2 (3 . 4) (5 . 6) (7))
 (comma
 "^\"\\([^,\" \n\t]+\\)\", line \\([0-9]+\\)\
 \\(?:[(. pos]+\\([0-9]+\\))?\\)?[:.,; (-]\\( warning:\\|[-0-9 ]*(W)\\)?" 1 2 3 (4))
 (ibm
 "^\\([^( \n\t]+\\)(\\([0-9]+\\):\\([0-9]+\\)) :\
 \\(?:warnin\\(g\\)\\|informationa\\(l\\)\\)?" 1 2 3 (4 . 5))
 (irix
-"^[a-z0-9/]+: \\(?:[eE]rror\\|[wW]arnin\\(g\\)\\)[0-9 ]*:\
+"^[a-z0-9/]+: \\(?:[eE]rror\\|[wW]arnin\\(g\\)\\|[iI]nf\\(o\\)\\)[0-9 ]*:\
-\\([^,\" \n\t]+\\)\\(?:, line\\|:\\) \\([0-9]+\\):" 2 3 nil (1))
+\\([^,\" \n\t]+\\)\\(?:, line\\|:\\) \\([0-9]+\\):" 3 4 nil (1 . 2))
 (java
 "^\\(?:[ \t]+at \\|==[0-9]+== +\\(?:at\\|b\\(y\\)\\)\\).+(\\([^()\n]+\\):\\([0-9]+\\))$" 2 3 nil (1))
 (jikes-file
 (defface compilation-warning-face
 '((((type tty) (class color)) (:foreground "cyan" :weight bold))
 (((class color)) (:foreground "Orange" :weight bold))
 (t (:weight bold)))
 "Face used to highlight compiler warnings."
-:group 'font-lock-highlighting-faces)
+:group 'font-lock-highlighting-faces
+:version "21.4")
 (defface compilation-info-face
 '((((type tty) (class color)) (:foreground "green" :weight bold))
 (((class color) (background light)) (:foreground "Green3" :weight bold))
 (((class color) (background dark)) (:foreground "Green" :weight bold))
 (t (:weight bold)))
 "Face used to highlight compiler warnings."
-:group 'font-lock-highlighting-faces)
+:group 'font-lock-highlighting-faces
+:version "21.4")
 (defvar compilation-message-face nil
 "Face name to use for whole messages.
 Faces `compilation-error-face', `compilation-warning-face',
 `compilation-info-face', `compilation-line-face' and
 			    "mouse-2: visit this file"))
 	     mouse-face highlight))))
 (defun compilation-mode-font-lock-keywords ()
 "Return expressions to highlight in Compilation mode."
-(if compilation-parse-errors-function
+(nconc
-;; An old package!  Try the compatibility code.
+;; make directory tracking
-'((compilation-compat-parse-errors))
+(if compilation-directory-matcher
-(append
+`((,(car compilation-directory-matcher)
-;; make directory tracking
+	  ,@(mapcar (lambda (elt)
-(if compilation-directory-matcher
+		      `(,(car elt)
-	 `((,(car compilation-directory-matcher)
+			(compilation-directory-properties
-	    ,@(mapcar (lambda (elt)
+			 ,(car elt) ,(cdr elt))
-			`(,(car elt)
+			t))
-			  (compilation-directory-properties
+		    (cdr compilation-directory-matcher)))))
-			   ,(car elt) ,(cdr elt))
-			  t))
+;; Compiler warning/error lines.
-		      (cdr compilation-directory-matcher)))))
+(mapcar (lambda (item)
+	     (if (symbolp item)
-;; Compiler warning/error lines.
+		 (setq item (cdr (assq item
-(mapcar
+				       compilation-error-regexp-alist-alist))))
-(lambda (item)
+	     (let ((file (nth 1 item))
-	(if (symbolp item)
+		   (line (nth 2 item))
-	    (setq item (cdr (assq item
+		   (col (nth 3 item))
-				  compilation-error-regexp-alist-alist))))
+		   (type (nth 4 item))
-	(let ((file (nth 1 item))
+		   end-line end-col fmt)
-	      (line (nth 2 item))
+	       (if (consp file) (setq fmt (cdr file)	  file (car file)))
-	      (col (nth 3 item))
+	       (if (consp line) (setq end-line (cdr line) line (car line)))
-	      (type (nth 4 item))
+	       (if (consp col)	(setq end-col (cdr col)	  col (car col)))
-	      end-line end-col fmt)
-	  (if (consp file) (setq fmt (cdr file)	  file (car file)))
+	       `(,(nth 0 item)
-	  (if (consp line) (setq end-line (cdr line) line (car line)))
-	  (if (consp col)	(setq end-col (cdr col)	  col (car col)))
+		 ,@(when (integerp file)
+		     `((,file ,(if (consp type)
-	  (if (symbolp line)
+				   `(compilation-face ',type)
-	      ;; The old compile.el had here an undocumented hook that
+				 (aref [compilation-info-face
-	      ;; allowed `line' to be a function that computed the actual
+					compilation-warning-face
-	      ;; error location.  Let's do our best.
+					compilation-error-face]
-	      `(,(car item)
+				       (or type 2))))))
-		(0 (compilation-compat-error-properties
-		    (funcall ',line (list* (match-string ,file)
+		 ,@(when line
-					  default-directory
+		     `((,line compilation-line-face nil t)))
-					  ',(nthcdr 4 item))
+		 ,@(when end-line
-			     ,(if col `(match-string ,col)))))
+		     `((,end-line compilation-line-face nil t)))
-		(,file compilation-error-face t))
+		 ,@(when col
-	    `(,(nth 0 item)
+		     `((,col compilation-column-face nil t)))
+		 ,@(when end-col
-	      ,@(when (integerp file)
+		     `((,end-col compilation-column-face nil t)))
-		  `((,file ,(if (consp type)
-				`(compilation-face ',type)
+		 ,@(nthcdr 6 item)
-			      (aref [compilation-info-face
+		 (,(or (nth 5 item) 0)
-				     compilation-warning-face
+		  (compilation-error-properties ',file ,line ,end-line
-				     compilation-error-face]
+						,col ,end-col ',(or type 2)
-				    (or type 2))))))
+						',fmt)
+		  append))))		; for compilation-message-face
-	      ,@(when line
+	   compilation-error-regexp-alist)
-		  `((,line compilation-line-face nil t)))
-	      ,@(when end-line
+compilation-mode-font-lock-keywords))
-		  `((,end-line compilation-line-face nil t)))
-	      ,@(when col
-		  `((,col compilation-column-face nil t)))
-	      ,@(when end-col
-		  `((,end-col compilation-column-face nil t)))
-	      ,@(nthcdr 6 item)
-	      (,(or (nth 5 item) 0)
-	       (compilation-error-properties ',file ,line ,end-line
-					     ,col ,end-col ',(or type 2)
-					     ',fmt)
-	       append)))))		; for compilation-message-face
-compilation-error-regexp-alist)
-compilation-mode-font-lock-keywords)))
 ;;;###autoload
 (defun compile (command &optional comint)
 "Compile the program including the current buffer.  Default: run `make'.
 Note that all messages not positively identified as warning or
 info, are considered errors."
 :type '(choice (const :tag "Warnings and info" 2)
 		 (const :tag "Info" 1)
 		 (const :tag "None" 0))
-:group 'compilation)
+:group 'compilation
+:version "21.4")
 (defcustom compilation-skip-visited nil
 "*Compilation motion commands skip visited messages if this is t.
 Visited messages are ones for which the file, line and column have been jumped
 to from the current content in the current compilation buffer, even if it was
 from a different message."
 :type 'boolean
-:group 'compilation)
+:group 'compilation
+:version "21.4")
 ;;;###autoload
 (defun compilation-mode ()
 "Major mode for compilation log buffers.
 \\<compilation-mode-map>To visit the source for a line-numbered error,
 (defun compilation-setup (&optional minor)
 "Prepare the buffer for the compilation parsing commands to work."
 (make-local-variable 'compilation-current-error)
 (make-local-variable 'compilation-error-screen-columns)
 (setq compilation-last-buffer (current-buffer))
-(if (and minor font-lock-defaults)
-(font-lock-add-keywords nil (compilation-mode-font-lock-keywords))
-(set (make-local-variable 'font-lock-defaults)
-	 '(compilation-mode-font-lock-keywords t)))
 (set (make-local-variable 'font-lock-extra-managed-props)
 '(directory message help-echo mouse-face debug))
 (set (make-local-variable 'compilation-locs)
 (make-hash-table :test 'equal :weakness 'value))
 ;; lazy-lock would never find the message unless it's scrolled to
 ;; jit-lock might fontify some things too late.
 (set (make-local-variable 'font-lock-support-mode) nil)
 (set (make-local-variable 'font-lock-maximum-size) nil)
-(if minor
+(let ((fld font-lock-defaults))
-(if font-lock-mode
+(if (and minor fld)
-	  (font-lock-fontify-buffer)
+	(font-lock-add-keywords nil (compilation-mode-font-lock-keywords))
-	(turn-on-font-lock))
+(setq font-lock-defaults '(compilation-mode-font-lock-keywords t)))
-;; maybe defer font-lock till after derived mode is set up
+(if minor
-(run-mode-hooks 'compilation-turn-on-font-lock)))
+	(if font-lock-mode
+	    (if fld
+		(font-lock-fontify-buffer)
+	      (font-lock-change-mode)
+	      (turn-on-font-lock))
+	  (turn-on-font-lock))
+;; maybe defer font-lock till after derived mode is set up
+(run-mode-hooks 'compilation-turn-on-font-lock))))
 ;;;###autoload
 (define-minor-mode compilation-shell-minor-mode
 "Toggle compilation shell minor mode.
 With arg, turn compilation mode on if and only if arg is positive.
 (next-error n))
 (defcustom compilation-context-lines next-screen-context-lines
 "*Display this many lines of leading context before message."
 :type 'integer
-:group 'compilation)
+:group 'compilation
+:version "21.4")
 (defsubst compilation-set-window (w mk)
 ;; Align the compilation output window W with marker MK near top.
 (set-window-start w (save-excursion
 			(goto-char mk)

Mercurial > emacs

comparison lisp/progmodes/compile.el @ 54742:0a2de4900b34