aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarl Heuer1999-06-15 17:40:09 +0000
committerKarl Heuer1999-06-15 17:40:09 +0000
commit61d6c25dbd25adacca5a0cfea5893bbec92a8cdf (patch)
tree4e8cf387335544ccc6f1fe6e0ddd292f439c85de
parent362438055a2a9fe307d65ff67ce055ce13cea6e0 (diff)
downloademacs-61d6c25dbd25adacca5a0cfea5893bbec92a8cdf.tar.gz
emacs-61d6c25dbd25adacca5a0cfea5893bbec92a8cdf.zip
Undo previous undo -- spiegel's change already corrected rms's.
-rw-r--r--lisp/vc.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/vc.el b/lisp/vc.el
index 83d1925e67c..700209a0a16 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.247 1999/06/09 16:52:56 spiegel Exp kwzh $ 8;; $Id: vc.el,v 1.248 1999/06/15 05:48:18 kwzh 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 "\\)")) 1703 s "\\(" HH:MM "\\|" s yyyy"\\|" yyyy s "\\)"))
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)