* vc-bzr: Use standard *vc* and *vc-diff* buffers.

(vc-bzr-shelve-show, vc-bzr-shelve-apply)
(vc-bzr-shelve-apply-and-keep, vc-bzr-shelve-snapshot):
Don't use *vc-bzr-shelve*.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f690d8bb2a7c9b797a844f849d4bd348a99f0e90..93a008c8e161bf534d8f9a1ffbbfb9b1dd5e462a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2010-04-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * vc-bzr.el: Use standard *vc* and *vc-diff* buffers.
+       (vc-bzr-shelve-show, vc-bzr-shelve-apply)
+       (vc-bzr-shelve-apply-and-keep, vc-bzr-shelve-snapshot):
+       Don't use *vc-bzr-shelve*.
+
 2010-04-19  Chong Yidong  <cyd@stupidchicken.com>
 
        * cedet/ede/pmake.el (ede-proj-makefile-insert-variables):

diff --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el
index 2c57662312013e655afcf4db2b13c23d29016692..64935f16dbdab75242c6198b8b236326c6400677 100644 (file)
--- a/lisp/vc-bzr.el
+++ b/lisp/vc-bzr.el
@@ -899,10 +899,10 @@ stream.  Standard error output is discarded."
 (defun vc-bzr-shelve-show (name)
   "Show the contents of shelve NAME."
   (interactive "sShelve name: ")
-  (vc-setup-buffer "*vc-bzr-shelve*")
+  (vc-setup-buffer "*vc-diff*")
   ;; FIXME: how can you show the contents of a shelf?
-  (vc-bzr-command "unshelve" "*vc-bzr-shelve*" 'async nil "--preview" name)
-  (set-buffer "*vc-bzr-shelve*")
+  (vc-bzr-command "unshelve" "*vc-diff*" 'async nil "--preview" name)
+  (set-buffer "*vc-diff*")
   (diff-mode)
   (setq buffer-read-only t)
   (pop-to-buffer (current-buffer)))
@@ -910,13 +910,13 @@ stream.  Standard error output is discarded."
 (defun vc-bzr-shelve-apply (name)
   "Apply shelve NAME and remove it afterwards."
   (interactive "sApply (and remove) shelf: ")
-  (vc-bzr-command "unshelve" "*vc-bzr-shelve*" 0 nil "--apply" name)
+  (vc-bzr-command "unshelve" nil 0 nil "--apply" name)
   (vc-resynch-buffer (vc-bzr-root default-directory) t t))
 
 (defun vc-bzr-shelve-apply-and-keep (name)
   "Apply shelve NAME and keep it afterwards."
   (interactive "sApply (and keep) shelf: ")
-  (vc-bzr-command "unshelve" "*vc-bzr-shelve*" 0 nil "--apply" "--keep" name)
+  (vc-bzr-command "unshelve" nil 0 nil "--apply" "--keep" name)
   (vc-resynch-buffer (vc-bzr-root default-directory) t t))
 
 (defun vc-bzr-shelve-snapshot ()
@@ -927,7 +927,7 @@ stream.  Standard error output is discarded."
                    (concat
                     (format-time-string "Snapshot on %Y-%m-%d" ct)
                     (format-time-string " at %H:%M" ct))))
-  (vc-bzr-command "unshelve" "*vc-bzr-shelve*" 0 nil "--apply" "--keep")
+  (vc-bzr-command "unshelve" nil 0 nil "--apply" "--keep")
   (vc-resynch-buffer (vc-bzr-root default-directory) t t))
 
 (defun vc-bzr-shelve-list ()