diff options
| author | Stefan Monnier | 2008-03-27 03:40:36 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2008-03-27 03:40:36 +0000 |
| commit | f42d59a5d7839eb5990c5325392ce4e5d39d6550 (patch) | |
| tree | 91e4ce58f003d86a93b715d09db4f40f76fffe0e | |
| parent | f4e845445679bdeae1cbe0098b68474ea6ed5447 (diff) | |
| download | emacs-f42d59a5d7839eb5990c5325392ce4e5d39d6550.tar.gz emacs-f42d59a5d7839eb5990c5325392ce4e5d39d6550.zip | |
(vc-do-command): Don't pop to the buffer if it's an internal temp buffer.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/vc.el | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0449d7aa6fb..24f0c7d6da6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2008-03-27 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * vc.el (vc-do-command): Don't pop to the buffer if it's an internal | ||
| 4 | temp buffer. | ||
| 5 | |||
| 1 | 2008-03-27 Glenn Morris <rgm@gnu.org> | 6 | 2008-03-27 Glenn Morris <rgm@gnu.org> |
| 2 | 7 | ||
| 3 | * calendar/cal-bahai.el (diary-bahai-list-entries): | 8 | * calendar/cal-bahai.el (diary-bahai-list-entries): |
diff --git a/lisp/vc.el b/lisp/vc.el index 0e633f5f993..e3316dce1bd 100644 --- a/lisp/vc.el +++ b/lisp/vc.el | |||
| @@ -1189,9 +1189,10 @@ that is inserted into the command line before the filename." | |||
| 1189 | (when (and (not (eq t okstatus)) | 1189 | (when (and (not (eq t okstatus)) |
| 1190 | (or (not (integerp status)) | 1190 | (or (not (integerp status)) |
| 1191 | (and okstatus (< okstatus status)))) | 1191 | (and okstatus (< okstatus status)))) |
| 1192 | (pop-to-buffer (current-buffer)) | 1192 | (unless (eq ?\s (aref (buffer-name (current-buffer)) 0)) |
| 1193 | (goto-char (point-min)) | 1193 | (pop-to-buffer (current-buffer)) |
| 1194 | (shrink-window-if-larger-than-buffer) | 1194 | (goto-char (point-min)) |
| 1195 | (shrink-window-if-larger-than-buffer)) | ||
| 1195 | (error "Running %s...FAILED (%s)" full-command | 1196 | (error "Running %s...FAILED (%s)" full-command |
| 1196 | (if (integerp status) (format "status %d" status) status)))) | 1197 | (if (integerp status) (format "status %d" status) status)))) |
| 1197 | ;; We're done. But don't emit a status message if running | 1198 | ;; We're done. But don't emit a status message if running |