(vc-do-command): Don't show internal temp buffers.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f105ab3a9685356ebdfe777b33823d1e1bd4cc5e..061bc57bc5fd08ba457c4974953f1d25d09a4f0d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2008-03-29  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * vc.el (vc-do-command): Don't show internal temp buffers.
+
 2008-03-29  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
        * term/mac-win.el (mac-ae-reopen-application): New function.
@@ -17,8 +21,8 @@
 
 2008-03-23  Andreas Schwab  <schwab@suse.de>
 
-       * menu-bar.el (menu-bar-showhide-fringe-ind-menu) [mixed]: Fix
-       radio button condition.
+       * menu-bar.el (menu-bar-showhide-fringe-ind-menu) [mixed]:
+       Fix radio button condition.
        [box]: Likewise.
        [customize]: Add radio button.
 
@@ -30,8 +34,8 @@
 
 2008-03-19  Wilson Snyder  <wsnyder@wsnyder.org>
 
-       * progmodes/verilog-mode.el (verilog-easy-menu-filter): New
-       function.
+       * progmodes/verilog-mode.el (verilog-easy-menu-filter):
+       New function.
        (verilog-stmt-menu, verilog-menu): Add :help.
        (verilog-customize, verilog-font-customize)
        (electric-verilog-backward-sexp, electric-verilog-forward-sexp)
@@ -39,8 +43,8 @@
        (verilog-auto-search-do, verilog-auto-re-search-do)
        (verilog-skip-forward-comment-or-string): Fix verilog-auto
        expansion when a .* appears inside a string.
-       (verilog-re-search-forward, verilog-re-search-backward): Add
-       comment to recall how this works.
+       (verilog-re-search-forward, verilog-re-search-backward):
+       Add comment to recall how this works.
 
 2008-03-19  Reiner Steib  <Reiner.Steib@gmx.de>
 

diff --git a/lisp/vc.el b/lisp/vc.el
index e221044b769e803a1d3bf43ea0a75b7f8c11ee99..bf0f101d469af68dd47825672b0e13941c5ba2f5 100644 (file)
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -1047,9 +1047,14 @@ that is inserted into the command line before the filename."
          (when (and (not (eq t okstatus))
                      (or (not (integerp status))
                          (and okstatus (< okstatus status))))
-           (pop-to-buffer (current-buffer))
-           (goto-char (point-min))
-           (shrink-window-if-larger-than-buffer)
+            ;; Don't show internal temp buffers.  Especially since, together
+            ;; with with-temp-buffer and pop-up-frames, this can result in
+            ;; bugs where with-temp-buffer ends up not preserving
+            ;; current-buffer (because kill-buffer doesn't preserve it).
+            (unless (eq ?\s (aref (buffer-name (current-buffer)) 0))
+              (pop-to-buffer (current-buffer))
+              (goto-char (point-min))
+              (shrink-window-if-larger-than-buffer))
            (error "Running %s...FAILED (%s)" command
                   (if (integerp status) (format "status %d" status) status))))
        (if vc-command-messages