Mercurial > emacs
comparison lisp/vc-bzr.el @ 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 | 37a9363510b2 |
children | d804f575197b |
comparison
equal
deleted
inserted
replaced
106728:6616d9586618 | 106729:b4d5ac4906a0 |
---|---|
739 | 739 |
740 (define-key map [down-mouse-3] 'vc-bzr-shelve-menu) | 740 (define-key map [down-mouse-3] 'vc-bzr-shelve-menu) |
741 (define-key map "\C-k" 'vc-bzr-shelve-delete-at-point) | 741 (define-key map "\C-k" 'vc-bzr-shelve-delete-at-point) |
742 ;; (define-key map "=" 'vc-bzr-shelve-show-at-point) | 742 ;; (define-key map "=" 'vc-bzr-shelve-show-at-point) |
743 ;; (define-key map "\C-m" 'vc-bzr-shelve-show-at-point) | 743 ;; (define-key map "\C-m" 'vc-bzr-shelve-show-at-point) |
744 (define-key map "A" 'vc-bzr-shelve-apply-at-point) | 744 (define-key map "P" 'vc-bzr-shelve-apply-at-point) |
745 map)) | 745 map)) |
746 | 746 |
747 (defvar vc-bzr-shelve-menu-map | 747 (defvar vc-bzr-shelve-menu-map |
748 (let ((map (make-sparse-keymap "Bzr Shelve"))) | 748 (let ((map (make-sparse-keymap "Bzr Shelve"))) |
749 (define-key map [de] | 749 (define-key map [de] |
750 '(menu-item "Delete shelf" vc-bzr-shelve-delete-at-point | 750 '(menu-item "Delete shelf" vc-bzr-shelve-delete-at-point |
751 :help "Delete the current shelf")) | 751 :help "Delete the current shelf")) |
752 (define-key map [ap] | 752 (define-key map [po] |
753 '(menu-item "Apply shelf" vc-bzr-shelve-apply-at-point | 753 '(menu-item "Apply and remove shelf (pop)" vc-bzr-shelve-apply-at-point |
754 :help "Apply the current shelf")) | 754 :help "Apply the current shelf and remove it")) |
755 ;; (define-key map [sh] | 755 ;; (define-key map [sh] |
756 ;; '(menu-item "Show shelve" vc-bzr-shelve-show-at-point | 756 ;; '(menu-item "Show shelve" vc-bzr-shelve-show-at-point |
757 ;; :help "Show the contents of the current shelve")) | 757 ;; :help "Show the contents of the current shelve")) |
758 map)) | 758 map)) |
759 | 759 |
807 (mapconcat | 807 (mapconcat |
808 (lambda (x) | 808 (lambda (x) |
809 (propertize x | 809 (propertize x |
810 'face 'font-lock-variable-name-face | 810 'face 'font-lock-variable-name-face |
811 'mouse-face 'highlight | 811 'mouse-face 'highlight |
812 'help-echo "mouse-3: Show shelve menu\nA: Apply shelf\nC-k: Delete shelf" | 812 'help-echo "mouse-3: Show shelve menu\nP: Apply and remove shelf (pop)\nC-k: Delete shelf" |
813 'keymap vc-bzr-shelve-map)) | 813 'keymap vc-bzr-shelve-map)) |
814 shelve "\n")) | 814 shelve "\n")) |
815 (concat | 815 (concat |
816 (propertize "Shelves : " 'face 'font-lock-type-face | 816 (propertize "Shelves : " 'face 'font-lock-type-face |
817 'help-echo shelve-help-echo) | 817 'help-echo shelve-help-echo) |
837 ;; (diff-mode) | 837 ;; (diff-mode) |
838 ;; (setq buffer-read-only t) | 838 ;; (setq buffer-read-only t) |
839 ;; (pop-to-buffer (current-buffer))) | 839 ;; (pop-to-buffer (current-buffer))) |
840 | 840 |
841 (defun vc-bzr-shelve-apply (name) | 841 (defun vc-bzr-shelve-apply (name) |
842 "Apply shelve NAME." | 842 "Apply shelve NAME and remove it afterwards." |
843 (interactive "sApply shelf: ") | 843 (interactive "sApply (and remove) shelf: ") |
844 (vc-bzr-command "unshelve" "*vc-bzr-shelve*" 0 nil "--apply" name) | 844 (vc-bzr-command "unshelve" "*vc-bzr-shelve*" 0 nil "--apply" name) |
845 (vc-resynch-buffer (vc-bzr-root default-directory) t t)) | 845 (vc-resynch-buffer (vc-bzr-root default-directory) t t)) |
846 | 846 |
847 (defun vc-bzr-shelve-list () | 847 (defun vc-bzr-shelve-list () |
848 (with-temp-buffer | 848 (with-temp-buffer |