Mercurial > emacs
comparison lisp/vc.el @ 90998:539530fa389c
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 832-838)
- Remove lisp/erc/erc-nicklist.el
- Update some .arch-inventory files
- Fix void function definition error in cus-edit.el
- Update from CVS
- Restore lisp/emacs-lisp/cl-loaddefs.el
- Merge from emacs--rel--22
* emacs--rel--22 (patch 75-83)
- Update from CVS
- Remove lisp/erc/erc-nicklist.el
- Update some .arch-inventory files
- Indicate that emacs--devo--0--patch-834 does not need to be applied
- Merge from gnus--rel--5.10
- Restore lisp/emacs-lisp/cl-loaddefs.el
* gnus--rel--5.10 (patch 239-241)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-239
author | Miles Bader <miles@gnu.org> |
---|---|
date | Fri, 03 Aug 2007 05:20:51 +0000 |
parents | f55f9811f5d7 feaa257d4fe3 |
children | 35e3789db058 |
comparison
equal
deleted
inserted
replaced
90997:12fc8f96710b | 90998:539530fa389c |
---|---|
2231 (and (boundp 'vc-dired-switches) | 2231 (and (boundp 'vc-dired-switches) |
2232 vc-dired-switches | 2232 vc-dired-switches |
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 () |
2241 "Toggle terse display in VC Dired." | 2246 "Toggle terse display in VC Dired." |
2242 (interactive) | 2247 (interactive) |
2282 | 2287 |
2283 (defun vc-dired-hook () | 2288 (defun vc-dired-hook () |
2284 "Reformat the listing according to version control. | 2289 "Reformat the listing according to version control. |
2285 Called by dired after any portion of a vc-dired buffer has been read in." | 2290 Called by dired after any portion of a vc-dired buffer has been read in." |
2286 (message "Getting version information... ") | 2291 (message "Getting version information... ") |
2287 (let (subdir filename (buffer-read-only nil)) | 2292 (let (subdir filename (inhibit-read-only t)) |
2288 (goto-char (point-min)) | 2293 (goto-char (point-min)) |
2289 (while (not (eobp)) | 2294 (while (not (eobp)) |
2290 (cond | 2295 (cond |
2291 ;; subdir header line | 2296 ;; subdir header line |
2292 ((setq subdir (dired-get-subdir)) | 2297 ((setq subdir (dired-get-subdir)) |