diff options
| author | Miles Bader | 2007-05-25 02:47:22 +0000 |
|---|---|---|
| committer | Miles Bader | 2007-05-25 02:47:22 +0000 |
| commit | 98db66cac2e07862a43014b57ebcc2f0fbfc07e6 (patch) | |
| tree | f1ef3d994208c3c102c40454971e195fda91b42f /lisp/progmodes | |
| parent | 24236bd83e64a3cfa96f01af3b2a925dd234612d (diff) | |
| parent | 5dfdf72f7aee102988a98447de9d19523af50055 (diff) | |
| download | emacs-98db66cac2e07862a43014b57ebcc2f0fbfc07e6.tar.gz emacs-98db66cac2e07862a43014b57ebcc2f0fbfc07e6.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 765-770)
- Update from CVS
- Merge from emacs--rel--22
- Merge from gnus--rel--5.10
* emacs--rel--22 (patch 24-25)
* gnus--rel--5.10 (patch 222-223)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-16
Diffstat (limited to 'lisp/progmodes')
| -rw-r--r-- | lisp/progmodes/compile.el | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index a3107339c2b..7701809463d 100644 --- a/lisp/progmodes/compile.el +++ b/lisp/progmodes/compile.el | |||
| @@ -1426,7 +1426,8 @@ Turning the mode on runs the normal hook `compilation-minor-mode-hook'." | |||
| 1426 | process-status exit-status msg) | 1426 | process-status exit-status msg) |
| 1427 | (cons msg exit-status))) | 1427 | (cons msg exit-status))) |
| 1428 | (omax (point-max)) | 1428 | (omax (point-max)) |
| 1429 | (opoint (point))) | 1429 | (opoint (point)) |
| 1430 | (cur-buffer (current-buffer))) | ||
| 1430 | ;; Record where we put the message, so we can ignore it later on. | 1431 | ;; Record where we put the message, so we can ignore it later on. |
| 1431 | (goto-char omax) | 1432 | (goto-char omax) |
| 1432 | (insert ?\n mode-name " " (car status)) | 1433 | (insert ?\n mode-name " " (car status)) |
| @@ -1447,8 +1448,8 @@ Turning the mode on runs the normal hook `compilation-minor-mode-hook'." | |||
| 1447 | (goto-char opoint)) | 1448 | (goto-char opoint)) |
| 1448 | (with-no-warnings | 1449 | (with-no-warnings |
| 1449 | (if compilation-finish-function | 1450 | (if compilation-finish-function |
| 1450 | (funcall compilation-finish-function (current-buffer) msg))) | 1451 | (funcall compilation-finish-function cur-buffer msg))) |
| 1451 | (run-hook-with-args 'compilation-finish-functions (current-buffer) msg))) | 1452 | (run-hook-with-args 'compilation-finish-functions cur-buffer msg))) |
| 1452 | 1453 | ||
| 1453 | ;; Called when compilation process changes state. | 1454 | ;; Called when compilation process changes state. |
| 1454 | (defun compilation-sentinel (proc msg) | 1455 | (defun compilation-sentinel (proc msg) |