aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarl Heuer1999-06-15 05:48:18 +0000
committerKarl Heuer1999-06-15 05:48:18 +0000
commit5c2ae5cab28b9cc99cb929f9eeb5cc45d0c0cd79 (patch)
tree2025a5faad18b09824afe94299047933d6f39a65
parentf256f63ecd700e10260274337888d7514e392c8e (diff)
downloademacs-5c2ae5cab28b9cc99cb929f9eeb5cc45d0c0cd79.tar.gz
emacs-5c2ae5cab28b9cc99cb929f9eeb5cc45d0c0cd79.zip
(vc-dired-mode): Undo previous two changes.
-rw-r--r--lisp/vc.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/vc.el b/lisp/vc.el
index 77fa1c2b168..83d1925e67c 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.246 1999/05/23 05:34:53 rms Exp spiegel $ 8;; $Id: vc.el,v 1.247 1999/06/09 16:52:56 spiegel Exp kwzh $
9 9
10;; This file is part of GNU Emacs. 10;; This file is part of GNU Emacs.
11 11
@@ -1700,7 +1700,7 @@ There is a special command, `*l', to mark all files currently locked."
1700 (dd "[ 0-3][0-9]") 1700 (dd "[ 0-3][0-9]")
1701 (HH:MM "[ 0-2][0-9]:[0-5][0-9]") 1701 (HH:MM "[ 0-2][0-9]:[0-5][0-9]")
1702 (western (concat "\\(" month s dd "\\|" dd s month "\\)" 1702 (western (concat "\\(" month s dd "\\|" dd s month "\\)"
1703 s "\\(" HH:MM "\\|" s yyyy"\\|" yyyy s "\\)")) 1703 s "\\(" HH:MM "\\|" s yyyy "\\)"))
1704 (japanese (concat mm k s dd k s "\\(" s HH:MM "\\|" yyyy k "\\)"))) 1704 (japanese (concat mm k s dd k s "\\(" s HH:MM "\\|" yyyy k "\\)")))
1705 (concat s "\\(" western "\\|" japanese "\\)" s))) 1705 (concat s "\\(" western "\\|" japanese "\\)" s)))
1706 (and (boundp 'vc-dired-switches) 1706 (and (boundp 'vc-dired-switches)