Mercurial > emacs
changeset 107979:bb75dfb8839a
* 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*.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Mon, 19 Apr 2010 11:26:06 -0400 |
| parents | c168d4537385 |
| children | c2eddf34eaf2 |
| files | lisp/ChangeLog lisp/vc-bzr.el |
| diffstat | 2 files changed, 13 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Mon Apr 19 11:07:52 2010 -0400 +++ b/lisp/ChangeLog Mon Apr 19 11:26:06 2010 -0400 @@ -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):
--- a/lisp/vc-bzr.el Mon Apr 19 11:07:52 2010 -0400 +++ b/lisp/vc-bzr.el Mon Apr 19 11:26:06 2010 -0400 @@ -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 ()