aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Pfeiffer2004-05-10 21:00:00 +0000
committerDaniel Pfeiffer2004-05-10 21:00:00 +0000
commitc39bf546b914ae8aa9b9bd84bbef2988ec22d237 (patch)
treea73f680d1aba005084f64bc9a00e5c85bd8516aa
parent522067b2d47f58a9ccafebf2385c2342c21995c1 (diff)
downloademacs-c39bf546b914ae8aa9b9bd84bbef2988ec22d237.tar.gz
emacs-c39bf546b914ae8aa9b9bd84bbef2988ec22d237.zip
(compile): Add universal prefix arg.
(compilation-error-regexp-alist-alist): Add edg patterns.
-rw-r--r--lisp/progmodes/compile.el27
1 files changed, 17 insertions, 10 deletions
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index ec381ad8a15..45705fc37bc 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -171,8 +171,15 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1))
171 "^\"\\([^,\" \n\t]+\\)\", line \\([0-9]+\\)\ 171 "^\"\\([^,\" \n\t]+\\)\", line \\([0-9]+\\)\
172\\(?:[(. pos]+\\([0-9]+\\))?\\)?[:.,; (-]\\( warning:\\|[-0-9 ]*(W)\\)?" 1 2 3 (4)) 172\\(?:[(. pos]+\\([0-9]+\\))?\\)?[:.,; (-]\\( warning:\\|[-0-9 ]*(W)\\)?" 1 2 3 (4))
173 173
174 (edg-1
175 "^\\([^ \n]+\\)(\\([0-9]+\\)): \\(?:error\\|warnin\\(g\\)\\|remar\\(k\\)\\)"
176 1 2 nil (3 . 4))
177 (edg-2
178 "at line \\([0-9]+\\) of \"\\([^ \n]+\\)\"$"
179 2 1 nil 0)
180
174 (epc 181 (epc
175 "^Error [0-9]+ at (\\([0-9]*\\):\\([^)\n]+\\))" 2 1) 182 "^Error [0-9]+ at (\\([0-9]+\\):\\([^)\n]+\\))" 2 1)
176 183
177 (iar 184 (iar
178 "^\"\\(.*\\)\",\\([0-9]+\\)\\s-+\\(?:Error\\|Warnin\\(g\\)\\)\\[[0-9]+\\]:" 185 "^\"\\(.*\\)\",\\([0-9]+\\)\\s-+\\(?:Error\\|Warnin\\(g\\)\\)\\[[0-9]+\\]:"
@@ -265,10 +272,6 @@ File = \\(.+\\), Line = \\([0-9]+\\)\\(?:, Column = \\([0-9]+\\)\\)?"
265 (sun-ada 272 (sun-ada
266 "^\\([^, \n\t]+\\), line \\([0-9]+\\), char \\([0-9]+\\)[:., \(-]" 1 2 3) 273 "^\\([^, \n\t]+\\), line \\([0-9]+\\), char \\([0-9]+\\)[:., \(-]" 1 2 3)
267 274
268 ;; Redundant with `mips'
269;; (ultrix
270;; "^\\(?:cfe\\|fort\\): \\(Warning\\)?[^:\n]*: \\([^ \n]*\\), line \\([0-9]+\\):" 2 3 nil (1))
271
272 (4bsd 275 (4bsd
273 "\\(?:^\\|:: \\|\\S ( \\)\\(/[^ \n\t()]+\\)(\\([0-9]+\\))\ 276 "\\(?:^\\|:: \\|\\S ( \\)\\(/[^ \n\t()]+\\)(\\([0-9]+\\))\
274\\(?:: \\(warning:\\)?\\|$\\| ),\\)" 1 2 nil (3))) 277\\(?:: \\(warning:\\)?\\|$\\| ),\\)" 1 2 nil (3)))
@@ -749,6 +752,8 @@ and move to the source code that caused it.
749 752
750Interactively, prompts for the command if `compilation-read-command' is 753Interactively, prompts for the command if `compilation-read-command' is
751non-nil; otherwise uses `compile-command'. With prefix arg, always prompts. 754non-nil; otherwise uses `compile-command'. With prefix arg, always prompts.
755Additionally, with universal prefix arg, compilation buffer will be in
756comint mode, i.e. interactive.
752 757
753To run more than one compilation at once, start one and rename 758To run more than one compilation at once, start one and rename
754the \`*compilation*' buffer to some other name with 759the \`*compilation*' buffer to some other name with
@@ -760,11 +765,13 @@ The name used for the buffer is actually whatever is returned by
760the function in `compilation-buffer-name-function', so you can set that 765the function in `compilation-buffer-name-function', so you can set that
761to a function that generates a unique name." 766to a function that generates a unique name."
762 (interactive 767 (interactive
763 (if (or compilation-read-command current-prefix-arg) 768 (list
764 (list (read-from-minibuffer "Compile command: " 769 (if (or compilation-read-command current-prefix-arg)
765 (eval compile-command) nil nil 770 (read-from-minibuffer "Compile command: "
766 '(compile-history . 1))) 771 (eval compile-command) nil nil
767 (list (eval compile-command)))) 772 '(compile-history . 1))
773 (eval compile-command))
774 (consp current-prefix-arg)))
768 (unless (equal command (eval compile-command)) 775 (unless (equal command (eval compile-command))
769 (setq compile-command command)) 776 (setq compile-command command))
770 (save-some-buffers (not compilation-ask-about-save) nil) 777 (save-some-buffers (not compilation-ask-about-save) nil)