diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-04-19 11:26:06 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-04-19 11:26:06 -0400 |
| commit | c80fa13c0d799fda7b8141875a78b877d0e526fc (patch) | |
| tree | 1ea3fe4f56f0892dafb2eb0cec471d6513f84113 | |
| parent | 6e104790e756226cbb5b7feaf01854103ded9f36 (diff) | |
| download | emacs-c80fa13c0d799fda7b8141875a78b877d0e526fc.tar.gz | |
* 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*.
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/vc-bzr.el | 12 |
2 files changed, 13 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f690d8bb2a7..93a008c8e16 100644 --- 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 2c576623120..64935f16dbd 100644 --- 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 () |