diff options
Diffstat (limited to 'lisp/vc.el')
| -rw-r--r-- | lisp/vc.el | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/lisp/vc.el b/lisp/vc.el index 0bbaf33d78d..5030fb64471 100644 --- a/lisp/vc.el +++ b/lisp/vc.el @@ -13,7 +13,7 @@ ;; GNU Emacs is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation; either version 2, or (at your option) +;; the Free Software Foundation; either version 3, or (at your option) ;; any later version. ;; GNU Emacs is distributed in the hope that it will be useful, @@ -587,7 +587,7 @@ These are passed to the checkin program by \\[vc-register]." :version "20.3") (defcustom vc-directory-exclusion-list '("SCCS" "RCS" "CVS" "MCVS" ".svn" - ".hg" ".bzr" "{arch}") + ".git" ".hg" ".bzr" "{arch}") "List of directory names to be ignored when walking directory trees." :type '(repeat string) :group 'vc) @@ -2233,8 +2233,13 @@ There is a special command, `*l', to mark all files currently locked." (set (make-local-variable 'dired-actual-switches) vc-dired-switches)) (set (make-local-variable 'vc-dired-terse-mode) vc-dired-terse-display) - (setq mode-name (concat mode-name (symbol-name (vc-responsible-backend - default-directory)))) + (let ((backend-name (symbol-name (vc-responsible-backend + default-directory)))) + (setq mode-name (concat mode-name backend-name)) + ;; Add menu after `vc-dired-mode-map' has `dired-mode-map' as the parent. + (let ((vc-dire-menu-map (copy-keymap vc-menu-map))) + (define-key-after (lookup-key vc-dired-mode-map [menu-bar]) [vc] + (cons backend-name vc-dire-menu-map) 'subdir))) (setq vc-dired-mode t)) (defun vc-dired-toggle-terse-mode () @@ -2284,7 +2289,7 @@ This code, like dired, assumes UNIX -l format." "Reformat the listing according to version control. Called by dired after any portion of a vc-dired buffer has been read in." (message "Getting version information... ") - (let (subdir filename (buffer-read-only nil)) + (let (subdir filename (inhibit-read-only t)) (goto-char (point-min)) (while (not (eobp)) (cond |