From: Karl Heuer <kwzh@gnu.org>
Date: Tue, 15 Jun 1999 17:40:09 +0000 (+0000)
Subject: Undo previous undo -- spiegel's change already corrected rms's.
X-Git-Tag: emacs-20.4~97
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=61d6c25dbd25adacca5a0cfea5893bbec92a8cdf;p=emacs.git

Undo previous undo -- spiegel's change already corrected rms's.
---

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 @@
 ;; Author:     Eric S. Raymond <esr@snark.thyrsus.com>
 ;; Maintainer: Andre Spiegel <spiegel@inf.fu-berlin.de>
 
-;; $Id: vc.el,v 1.247 1999/06/09 16:52:56 spiegel Exp kwzh $
+;; $Id: vc.el,v 1.248 1999/06/15 05:48:18 kwzh Exp kwzh $
 
 ;; This file is part of GNU Emacs.
 
@@ -1700,7 +1700,7 @@ There is a special command, `*l', to mark all files currently locked."
            (dd "[ 0-3][0-9]")
            (HH:MM "[ 0-2][0-9]:[0-5][0-9]")
            (western (concat "\\(" month s dd "\\|" dd s month "\\)"
-                            s "\\(" HH:MM "\\|" s yyyy "\\)"))
+                            s "\\(" HH:MM "\\|" s yyyy"\\|" yyyy s "\\)"))
            (japanese (concat mm k s dd k s "\\(" s HH:MM "\\|" yyyy k "\\)")))
          (concat s "\\(" western "\\|" japanese "\\)" s)))
   (and (boundp 'vc-dired-switches)