Mercurial > emacs
changeset 24852:fb28ec3f61c7
Undo previous undo -- spiegel's change already corrected rms's.
author | Karl Heuer <kwzh@gnu.org> |
---|---|
date | Tue, 15 Jun 1999 17:40:09 +0000 |
parents | 06b633c9f37b |
children | 0fc260dce9cd |
files | lisp/vc.el |
diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/vc.el Tue Jun 15 08:11:35 1999 +0000 +++ b/lisp/vc.el Tue Jun 15 17:40:09 1999 +0000 @@ -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 @@ (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)