Mercurial > emacs
changeset 106729:b4d5ac4906a0
(vc-bzr-shelve-map): Change binding for vc-bzr-shelve-apply-at-point.
(vc-bzr-shelve-menu-map):
(vc-bzr-dir-extra-headers): Improve menu and tooltip text.
(vc-bzr-shelve-apply): Make prompt more explicit.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Sun, 03 Jan 2010 22:40:30 -0800 |
| parents | 6616d9586618 |
| children | d1805c8df951 |
| files | lisp/ChangeLog lisp/vc-bzr.el |
| diffstat | 2 files changed, 11 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Mon Jan 04 00:35:18 2010 -0500 +++ b/lisp/ChangeLog Sun Jan 03 22:40:30 2010 -0800 @@ -3,6 +3,10 @@ * vc-bzr.el (vc-bzr-state-heuristic): Make it work for lightweight checkouts. (Bug#618) (vc-bzr-log-view-mode): Also highlight the author. + (vc-bzr-shelve-map): Change binding for vc-bzr-shelve-apply-at-point. + (vc-bzr-shelve-menu-map): + (vc-bzr-dir-extra-headers): Improve menu and tooltip text. + (vc-bzr-shelve-apply): Make prompt more explicit. 2010-01-02 Chong Yidong <cyd@stupidchicken.com>
--- a/lisp/vc-bzr.el Mon Jan 04 00:35:18 2010 -0500 +++ b/lisp/vc-bzr.el Sun Jan 03 22:40:30 2010 -0800 @@ -741,7 +741,7 @@ (define-key map "\C-k" 'vc-bzr-shelve-delete-at-point) ;; (define-key map "=" 'vc-bzr-shelve-show-at-point) ;; (define-key map "\C-m" 'vc-bzr-shelve-show-at-point) - (define-key map "A" 'vc-bzr-shelve-apply-at-point) + (define-key map "P" 'vc-bzr-shelve-apply-at-point) map)) (defvar vc-bzr-shelve-menu-map @@ -749,9 +749,9 @@ (define-key map [de] '(menu-item "Delete shelf" vc-bzr-shelve-delete-at-point :help "Delete the current shelf")) - (define-key map [ap] - '(menu-item "Apply shelf" vc-bzr-shelve-apply-at-point - :help "Apply the current shelf")) + (define-key map [po] + '(menu-item "Apply and remove shelf (pop)" vc-bzr-shelve-apply-at-point + :help "Apply the current shelf and remove it")) ;; (define-key map [sh] ;; '(menu-item "Show shelve" vc-bzr-shelve-show-at-point ;; :help "Show the contents of the current shelve")) @@ -809,7 +809,7 @@ (propertize x 'face 'font-lock-variable-name-face 'mouse-face 'highlight - 'help-echo "mouse-3: Show shelve menu\nA: Apply shelf\nC-k: Delete shelf" + 'help-echo "mouse-3: Show shelve menu\nP: Apply and remove shelf (pop)\nC-k: Delete shelf" 'keymap vc-bzr-shelve-map)) shelve "\n")) (concat @@ -839,8 +839,8 @@ ;; (pop-to-buffer (current-buffer))) (defun vc-bzr-shelve-apply (name) - "Apply shelve NAME." - (interactive "sApply shelf: ") + "Apply shelve NAME and remove it afterwards." + (interactive "sApply (and remove) shelf: ") (vc-bzr-command "unshelve" "*vc-bzr-shelve*" 0 nil "--apply" name) (vc-resynch-buffer (vc-bzr-root default-directory) t t))