diff options
| author | Masatake YAMATO | 2007-07-28 18:11:25 +0000 |
|---|---|---|
| committer | Masatake YAMATO | 2007-07-28 18:11:25 +0000 |
| commit | 9d2aebf64918002fe3c1ad9ffcdbb69b0844159e (patch) | |
| tree | b0c7bb1536147dfe933b2a68465190bc5b0fcd6e | |
| parent | 397c47570ae4b1f545cae171b07a84726a63f9ac (diff) | |
| download | emacs-9d2aebf64918002fe3c1ad9ffcdbb69b0844159e.tar.gz emacs-9d2aebf64918002fe3c1ad9ffcdbb69b0844159e.zip | |
(vc-dired-mode): Added a menu for VC related
operation. Use backend name as the menu label Suggested by
David Kastrup.
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/vc.el | 9 |
2 files changed, 13 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ee84d615046..a9dc3eed6aa 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2007-07-28 Masatake YAMATO <jet@gyve.org> | ||
| 2 | |||
| 3 | * vc.el (vc-dired-mode): Added a menu for VC related | ||
| 4 | operation. Use backend name as the menu label Suggested by | ||
| 5 | David Kastrup. | ||
| 6 | |||
| 1 | 2007-07-28 Alan Mackenzie <acm@muc.de> | 7 | 2007-07-28 Alan Mackenzie <acm@muc.de> |
| 2 | 8 | ||
| 3 | Fix problem with modes derived from CC Mode: | 9 | Fix problem with modes derived from CC Mode: |
diff --git a/lisp/vc.el b/lisp/vc.el index 08baa16e6b4..6504a7ea644 100644 --- a/lisp/vc.el +++ b/lisp/vc.el | |||
| @@ -2233,8 +2233,13 @@ There is a special command, `*l', to mark all files currently locked." | |||
| 2233 | (set (make-local-variable 'dired-actual-switches) | 2233 | (set (make-local-variable 'dired-actual-switches) |
| 2234 | vc-dired-switches)) | 2234 | vc-dired-switches)) |
| 2235 | (set (make-local-variable 'vc-dired-terse-mode) vc-dired-terse-display) | 2235 | (set (make-local-variable 'vc-dired-terse-mode) vc-dired-terse-display) |
| 2236 | (setq mode-name (concat mode-name (symbol-name (vc-responsible-backend | 2236 | (let ((backend-name (symbol-name (vc-responsible-backend |
| 2237 | default-directory)))) | 2237 | default-directory)))) |
| 2238 | (setq mode-name (concat mode-name backend-name)) | ||
| 2239 | ;; Add menu after `vc-dired-mode-map' has `dired-mode-map' as the parent. | ||
| 2240 | (let ((vc-dire-menu-map (copy-keymap vc-menu-map))) | ||
| 2241 | (define-key-after (lookup-key vc-dired-mode-map [menu-bar]) [vc] | ||
| 2242 | (cons backend-name vc-dire-menu-map) 'subdir))) | ||
| 2238 | (setq vc-dired-mode t)) | 2243 | (setq vc-dired-mode t)) |
| 2239 | 2244 | ||
| 2240 | (defun vc-dired-toggle-terse-mode () | 2245 | (defun vc-dired-toggle-terse-mode () |