[Emacs-diffs] Changes to emacs/lisp/vc.el,v [EMACS_22_BASE]

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Stefan Monnier <monnier>        08/03/29 19:37:56

Index: vc.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/vc.el,v
retrieving revision 1.424.2.12
retrieving revision 1.424.2.13
diff -u -b -r1.424.2.12 -r1.424.2.13
--- vc.el       1 Feb 2008 05:49:49 -0000       1.424.2.12
+++ vc.el       29 Mar 2008 19:37:56 -0000      1.424.2.13
@@ -1047,9 +1047,14 @@
          (when (and (not (eq t okstatus))
                      (or (not (integerp status))
                          (and okstatus (< okstatus status))))
+            ;; 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)
+              (shrink-window-if-larger-than-buffer))
            (error "Running %s...FAILED (%s)" command
                   (if (integerp status) (format "status %d" status) status))))
        (if vc-command-messages