diff options
| author | André Spiegel | 1998-06-05 12:46:29 +0000 |
|---|---|---|
| committer | André Spiegel | 1998-06-05 12:46:29 +0000 |
| commit | a0019b45b9612ecddbfd6bf9a16f4ca20384ebbd (patch) | |
| tree | e0f81be9dde40138e3a422f574770c0fe14ac12f | |
| parent | 6e5d9ec5684c8888ad2a8d6a2d6647c0d90d9ea2 (diff) | |
| download | emacs-a0019b45b9612ecddbfd6bf9a16f4ca20384ebbd.tar.gz emacs-a0019b45b9612ecddbfd6bf9a16f4ca20384ebbd.zip | |
(vc-directory): Bind vc-dired-switches in order to pass switches to vc-dired-mode.
(vc-dired-mode): Check for vc-dired-switches.
| -rw-r--r-- | lisp/vc.el | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lisp/vc.el b/lisp/vc.el index 25d8f26ee1f..a6bcd6d60e8 100644 --- a/lisp/vc.el +++ b/lisp/vc.el | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | ;; Author: Eric S. Raymond <esr@snark.thyrsus.com> | 5 | ;; Author: Eric S. Raymond <esr@snark.thyrsus.com> |
| 6 | ;; Maintainer: Andre Spiegel <spiegel@inf.fu-berlin.de> | 6 | ;; Maintainer: Andre Spiegel <spiegel@inf.fu-berlin.de> |
| 7 | 7 | ||
| 8 | ;; $Id: vc.el,v 1.227 1998/05/16 17:53:32 rms Exp spiegel $ | 8 | ;; $Id: vc.el,v 1.228 1998/06/03 15:07:04 spiegel Exp spiegel $ |
| 9 | 9 | ||
| 10 | ;; This file is part of GNU Emacs. | 10 | ;; This file is part of GNU Emacs. |
| 11 | 11 | ||
| @@ -1625,6 +1625,10 @@ There is a special command, `*l', to mark all files currently locked." | |||
| 1625 | s "\\(" HH:MM "\\|" s yyyy "\\)")) | 1625 | s "\\(" HH:MM "\\|" s yyyy "\\)")) |
| 1626 | (japanese (concat mm k s dd k s "\\(" s HH:MM "\\|" yyyy k "\\)"))) | 1626 | (japanese (concat mm k s dd k s "\\(" s HH:MM "\\|" yyyy k "\\)"))) |
| 1627 | (concat s "\\(" western "\\|" japanese "\\)" s))) | 1627 | (concat s "\\(" western "\\|" japanese "\\)" s))) |
| 1628 | (and (boundp 'vc-dired-switches) | ||
| 1629 | vc-dired-switches | ||
| 1630 | (set (make-local-variable 'dired-actual-switches) | ||
| 1631 | vc-dired-switches)) | ||
| 1628 | (setq vc-dired-mode t)) | 1632 | (setq vc-dired-mode t)) |
| 1629 | 1633 | ||
| 1630 | (define-key vc-dired-mode-map "\C-xv" vc-prefix-map) | 1634 | (define-key vc-dired-mode-map "\C-xv" vc-prefix-map) |
| @@ -1745,7 +1749,7 @@ There is a special command, `*l', to mark all files currently locked." | |||
| 1745 | ;;;###autoload | 1749 | ;;;###autoload |
| 1746 | (defun vc-directory (dirname read-switches) | 1750 | (defun vc-directory (dirname read-switches) |
| 1747 | (interactive "DDired under VC (directory): \nP") | 1751 | (interactive "DDired under VC (directory): \nP") |
| 1748 | (let ((switches | 1752 | (let ((vc-dired-switches |
| 1749 | (if read-switches (read-string "Dired listing switches: " | 1753 | (if read-switches (read-string "Dired listing switches: " |
| 1750 | dired-listing-switches)))) | 1754 | dired-listing-switches)))) |
| 1751 | (require 'dired) | 1755 | (require 'dired) |
| @@ -1755,7 +1759,7 @@ There is a special command, `*l', to mark all files currently locked." | |||
| 1755 | (setq dirname (concat dirname "/"))) | 1759 | (setq dirname (concat dirname "/"))) |
| 1756 | (switch-to-buffer | 1760 | (switch-to-buffer |
| 1757 | (dired-internal-noselect (expand-file-name dirname) | 1761 | (dired-internal-noselect (expand-file-name dirname) |
| 1758 | (or switches dired-listing-switches) | 1762 | (or vc-dired-switches dired-listing-switches) |
| 1759 | 'vc-dired-mode)))) | 1763 | 'vc-dired-mode)))) |
| 1760 | 1764 | ||
| 1761 | ;; Named-configuration support for SCCS | 1765 | ;; Named-configuration support for SCCS |