diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/progmodes/compile.el | 7 |
2 files changed, 8 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f4a42c6f4c0..fd27eaacc2d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-12-16 Leo Liu <sdl.web@gmail.com> | ||
| 2 | |||
| 3 | * progmodes/compile.el (compile-goto-error): Do not push-mark. | ||
| 4 | Remove NOMSG arg and all uses changed. | ||
| 5 | |||
| 1 | 2013-12-16 Stefan Monnier <monnier@iro.umontreal.ca> | 6 | 2013-12-16 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 7 | ||
| 3 | * emulation/cua-rect.el (cua-rectangle-mark-mode): New minor mode. | 8 | * emulation/cua-rect.el (cua-rectangle-mark-mode): New minor mode. |
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index 5689be49f61..ce42d5a7837 100644 --- a/lisp/progmodes/compile.el +++ b/lisp/progmodes/compile.el | |||
| @@ -1004,7 +1004,7 @@ POS and RES.") | |||
| 1004 | (let ((win (get-buffer-window buffer 0))) | 1004 | (let ((win (get-buffer-window buffer 0))) |
| 1005 | (if win (set-window-point win pos))) | 1005 | (if win (set-window-point win pos))) |
| 1006 | (if compilation-auto-jump-to-first-error | 1006 | (if compilation-auto-jump-to-first-error |
| 1007 | (compile-goto-error nil t)))) | 1007 | (compile-goto-error)))) |
| 1008 | 1008 | ||
| 1009 | ;; This function is the central driver, called when font-locking to gather | 1009 | ;; This function is the central driver, called when font-locking to gather |
| 1010 | ;; all information needed to later jump to corresponding source code. | 1010 | ;; all information needed to later jump to corresponding source code. |
| @@ -2325,9 +2325,9 @@ Prefix arg N says how many files to move backwards (or forwards, if negative)." | |||
| 2325 | 2325 | ||
| 2326 | (defalias 'compile-mouse-goto-error 'compile-goto-error) | 2326 | (defalias 'compile-mouse-goto-error 'compile-goto-error) |
| 2327 | 2327 | ||
| 2328 | (defun compile-goto-error (&optional event nomsg) | 2328 | (defun compile-goto-error (&optional event) |
| 2329 | "Visit the source for the error message at point. | 2329 | "Visit the source for the error message at point. |
| 2330 | Use this command in a compilation log buffer. Sets the mark at point there." | 2330 | Use this command in a compilation log buffer." |
| 2331 | (interactive (list last-input-event)) | 2331 | (interactive (list last-input-event)) |
| 2332 | (if event (posn-set-point (event-end event))) | 2332 | (if event (posn-set-point (event-end event))) |
| 2333 | (or (compilation-buffer-p (current-buffer)) | 2333 | (or (compilation-buffer-p (current-buffer)) |
| @@ -2336,7 +2336,6 @@ Use this command in a compilation log buffer. Sets the mark at point there." | |||
| 2336 | (if (get-text-property (point) 'compilation-directory) | 2336 | (if (get-text-property (point) 'compilation-directory) |
| 2337 | (dired-other-window | 2337 | (dired-other-window |
| 2338 | (car (get-text-property (point) 'compilation-directory))) | 2338 | (car (get-text-property (point) 'compilation-directory))) |
| 2339 | (push-mark nil nomsg) | ||
| 2340 | (setq compilation-current-error (point)) | 2339 | (setq compilation-current-error (point)) |
| 2341 | (next-error-internal))) | 2340 | (next-error-internal))) |
| 2342 | 2341 | ||