[Emacs-diffs] /srv/bzr/emacs/trunk r99942: * vc-bzr: Use standard *vc* and *vc-diff* buffers.

[Stefan Monnier]

------------------------------------------------------------
revno: 99942
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Mon 2010-04-19 11:26:06 -0400
message:
  * 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*.
modified:
  lisp/ChangeLog
  lisp/vc-bzr.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-04-19 15:07:52 +0000
+++ b/lisp/ChangeLog    2010-04-19 15:26:06 +0000
@@ -1,3 +1,10 @@
+2010-04-19  Stefan Monnier  <address@hidden>
+
+       * 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  <address@hidden>
 
        * cedet/ede/pmake.el (ede-proj-makefile-insert-variables):

=== modified file 'lisp/vc-bzr.el'
--- a/lisp/vc-bzr.el    2010-04-07 05:56:35 +0000
+++ b/lisp/vc-bzr.el    2010-04-19 15:26:06 +0000
@@ -899,10 +899,10 @@
 (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 @@
 (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 @@
                    (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 ()