emacs: lisp/progmodes/compile.el comparison

comparison lisp/progmodes/compile.el @ 90533:8a8e69664178

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 343-356) - Update from CVS - Update for ERC 5.1.3. - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 113-115) - Merge from emacs--devo--0 - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-90

author	Miles Bader <miles@gnu.org>
date	Wed, 19 Jul 2006 00:42:56 +0000
parents	a8190f7e546e adaad9cef326
children	858cb33ae39d

comparison

equal deleted inserted replaced

-:e22cf6d2400c
+:8a8e69664178
 (gcc-include
 "^\\(?:In file included\\|                \\) from \
 \\(.+\\):\\([0-9]+\\)\\(?:\\(:\\)\\|\\(,\\)\\)?" 1 2 nil (3 . 4))
 (gnu
+;; I have no idea what this first line is supposed to match, but it
+;; makes things ambiguous with output such as "foo:344:50:blabla" since
+;; the "foo" part can match this first line (in which case the file
+;; name as "344").  To avoid this, we disallow filenames exclusively
+;; composed of digits.  --Stef
 "^\\(?:[[:alpha:]][-[:alnum:].]+: ?\\)?\
-\\([/.]*[a-zA-Z]:?[^ \t\n:]*\\|{standard input}\\): ?\
+\\([0-9]*[^0-9\n].*?\\): ?\
-\\([0-9]+\\)\\([.:]?\\)\\([0-9]+\\)?\
+\\([0-9]+\\)\\(?:\\([.:]\\)\\([0-9]+\\)\\)?\
-\\(?:-\\(?:\\([0-9]+\\)\\3\\)?\\.?\\([0-9]+\\)?\\)?:\
+\\(?:-\\([0-9]+\\)?\\(?:\\3\\([0-9]+\\)\\)?\\)?:\
 \\(?: *\\(\\(?:Future\\|Runtime\\)?[Ww]arning\\|W:\\)\\|\
 *\\([Ii]nfo\\(?:\\>\\|rmationa?l?\\)\\|I:\\|instantiated from\\)\\)?"
 1 (2 . 5) (4 . 6) (7 . 8))
 (lcc
 (4bsd
 "\\(?:^\\|::  \\|\\S ( \\)\\(/[^ \n\t()]+\\)(\\([0-9]+\\))\
 \\(?:: \\(warning:\\)?\\|$\\| ),\\)" 1 2 nil (3))
 (gcov-file
 "^ *-: *\\(0\\):Source:\\(.+\\)$"
 2 1 nil 0 nil
 (1 compilation-line-face prepend) (2 compilation-info-face prepend))
 (gcov-header
 "^ *-: *\\(0\\):\\(?:Object\\|Graph\\|Data\\|Runs\\|Programs\\):.+$"
 nil 1 nil 0 nil
 nil 1 nil 0 nil
 (0 'default t)
 (1 compilation-line-face prepend))
 (gcov-called-line
 "^ *\\([0-9]+\\): *\\([0-9]+\\):.*$"
 nil 2 nil 0 nil
 (0 'default t)
 (1 compilation-info-face prepend) (2 compilation-line-face prepend))
 (gcov-never-called
 "^ *\\(#####\\): *\\([0-9]+\\):.*$"
 nil 2 nil 2 nil
 (0 'default t)
 (1 compilation-error-face prepend) (2 compilation-line-face prepend))
 )
 "Alist of values for `compilation-error-regexp-alist'.")
 (defvar compilation-page-delimiter
 "^\\(?:\f\\|.*\\(?:Entering\\|Leaving\\) directory `.+'\n\\)+"
 "Value of `page-delimiter' in Compilation mode.")
 (defvar compilation-mode-font-lock-keywords
-'(;; configure output lines.
+'(;; Don't highlight this as a compilation message.
+("^Compilation started at.*"
+(0 '(face nil message nil help-echo nil mouse-face nil) t))
+("^Compiling file .*"
+(0 '(face nil message nil help-echo nil mouse-face nil) t))
+;; configure output lines.
 ("^[Cc]hecking \\(?:[Ff]or \\|[Ii]f \\|[Ww]hether \\(?:to \\)?\\)?\\(.+\\)\\.\\.\\. *\\(?:(cached) *\\)?\\(\\(yes\\(?: .+\\)?\\)\\|no\\|\\(.*\\)\\)$"
 (1 font-lock-variable-name-face)
 (2 (compilation-face '(4 . 3))))
 ;; Command output lines.  Recognize `make[n]:' lines too.
 ("^\\([[:alnum:]_/.+-]+\\)\\(\\[\\([0-9]+\\)\\]\\)?[ \t]*:"
 (1 font-lock-function-name-face) (3 compilation-line-face nil t))
 (" --?o\\(?:utfile\\|utput\\)?[= ]?\\(\\S +\\)" . 1)
-("^Compilation \\(finished\\)"
+("^Compilation \\(finished\\).*"
+(0 '(face nil message nil help-echo nil mouse-face nil) t)
 (1 compilation-info-face))
-("^Compilation \\(exited abnormally\\|interrupt\\|killed\\|terminated\\)\\(?:.*with code \\([0-9]+\\)\\)?"
+("^Compilation \\(exited abnormally\\|interrupt\\|killed\\|terminated\\)\\(?:.*with code \\([0-9]+\\)\\)?.*"
+(0 '(face nil message nil help-echo nil mouse-face nil) t)
 (1 compilation-error-face)
 (2 compilation-error-face nil t)))
 "Additional things to highlight in Compilation mode.
 This gets tacked on the end of the generated expressions.")
 If DIRECTORY. is relative, it is combined with `default-directory'.
 If DIRECTORY. is nil, that means use `default-directory'.
 If FILENAME is not found at all, ask the user where to find it.
 Pop up the buffer containing MARKER and scroll to MARKER if we ask the user."
 (or formats (setq formats '("%s")))
-(save-excursion
+(let ((dirs compilation-search-path)
-(let ((dirs compilation-search-path)
+(spec-dir (if directory
-	  (spec-dir (if directory
+(expand-file-name directory)
-			(expand-file-name directory)
+default-directory))
-		      default-directory))
+buffer thisdir fmts name)
-	  buffer thisdir fmts name)
+(if (file-name-absolute-p filename)
-(if (file-name-absolute-p filename)
+;; The file name is absolute.  Use its explicit directory as
-	  ;; The file name is absolute.  Use its explicit directory as
+;; the first in the search path, and strip it from FILENAME.
-	  ;; the first in the search path, and strip it from FILENAME.
+(setq filename (abbreviate-file-name (expand-file-name filename))
-	  (setq filename (abbreviate-file-name (expand-file-name filename))
+dirs (cons (file-name-directory filename) dirs)
-		dirs (cons (file-name-directory filename) dirs)
+filename (file-name-nondirectory filename)))
-		filename (file-name-nondirectory filename)))
+;; Now search the path.
-;; Now search the path.
+(while (and dirs (null buffer))
-(while (and dirs (null buffer))
+(setq thisdir (or (car dirs) spec-dir)
-	(setq thisdir (or (car dirs) spec-dir)
+fmts formats)
-	      fmts formats)
+;; For each directory, try each format string.
-	;; For each directory, try each format string.
+(while (and fmts (null buffer))
-	(while (and fmts (null buffer))
+(setq name (expand-file-name (format (car fmts) filename) thisdir)
-	  (setq name (expand-file-name (format (car fmts) filename) thisdir)
+buffer (and (file-exists-p name)
-		buffer (and (file-exists-p name)
+(find-file-noselect name))
-			    (find-file-noselect name))
+fmts (cdr fmts)))
-		fmts (cdr fmts)))
+(setq dirs (cdr dirs)))
-	(setq dirs (cdr dirs)))
+(while (null buffer)    ;Repeat until the user selects an existing file.
-(or buffer
+;; The file doesn't exist.  Ask the user where to find it.
-	  ;; The file doesn't exist.  Ask the user where to find it.
+(save-excursion            ;This save-excursion is probably not right.
-	  (let ((pop-up-windows t))
+(let ((pop-up-windows t))
-	    (compilation-set-window (display-buffer (marker-buffer marker))
+(compilation-set-window (display-buffer (marker-buffer marker))
-				    marker)
+marker)
-	    (let ((name (expand-file-name
+(let* ((name (read-file-name
-			 (read-file-name
+(format "Find this %s in (default %s): "
-			  (format "Find this %s in (default %s): "
+compilation-error filename)
-				  compilation-error filename)
+spec-dir filename t nil
-			  spec-dir filename t))))
+;; Try to make sure the user can only select
-	      (if (file-directory-p name)
+;; a valid answer.  This predicate may be ignored,
-		  (setq name (expand-file-name filename name)))
+;; tho, so we still have to double-check afterwards.
-	      (setq buffer (and (file-exists-p name)
+;; TODO: We should probably fix read-file-name so
-				(find-file name))))))
+;; that it never ignores this predicate, even when
-;; Make intangible overlays tangible.
+;; using popup dialog boxes.
-(mapcar (function (lambda (ov)
+(lambda (name)
-			  (when (overlay-get ov 'intangible)
+(if (file-directory-p name)
-			    (overlay-put ov 'intangible nil))))
+(setq name (expand-file-name filename name)))
-	      (overlays-in (point-min) (point-max)))
+(file-exists-p name))))
-buffer)))
+(origname name))
+(cond
+((not (file-exists-p name))
+(message "Cannot find file `%s'" name)
+(ding) (sit-for 2))
+((and (file-directory-p name)
+(not (file-exists-p
+(setq name (expand-file-name filename name)))))
+(message "No `%s' in directory %s" filename origname)
+(ding) (sit-for 2))
+(t
+(setq buffer (find-file-noselect name))))))))
+;; Make intangible overlays tangible.
+;; This is weird: it's not even clear which is the current buffer,
+;; so the code below can't be expected to DTRT here.  -- Stef
+(dolist (ov (overlays-in (point-min) (point-max)))
+(when (overlay-get ov 'intangible)
+(overlay-put ov 'intangible nil)))
+buffer))
 (defun compilation-get-file-structure (file &optional fmt)
 "Retrieve FILE's file-structure or create a new one.
 FILE should be (FILENAME) or (RELATIVE-FILENAME . DIRNAME).
 In the former case, FILENAME may be relative or absolute.

Mercurial > emacs

comparison lisp/progmodes/compile.el @ 90533:8a8e69664178