martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

(cvs-fileinfo-from-entries): Deal with Solaris'

Browse Source 
occasional use of "05" rather than " 5" for day-of-month.
This commit is contained in:
Stefan Monnier
2003-01-14 21:53:39 +00:00
parent 2a673b0350
commit 38fdf6aa0d
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lisp/pcvs-info.el
View File

@@ -4,7 +4,7 @@
;; Author: Stefan Monnier <monnier@cs.yale.edu>
;; Keywords: pcl-cvs
;; Revision: $Id: pcvs-info.el,v 1.12 2002/06/18 23:03:55 monnier Exp $
;; Revision: $Id: pcvs-info.el,v 1.13 2002/09/11 01:56:47 rms Exp $
;; This file is part of GNU Emacs.
@@ -452,8 +452,13 @@ DIR can also be a file."
((equal date "Result of merge") (setq subtype 'MERGED))
((let ((mtime (nth 5 (file-attributes (concat dir f))))
(system-time-locale "C"))
(equal (setq timestamp (format-time-string "%c" mtime 'utc))
date))
(setq timestamp (format-time-string "%c" mtime 'utc))
;; Solaris sometimes uses "Wed Sep 05", not "Wed Sep 5".
;; See "grep '[^a-z_]ctime' cvs/src/*.c" for reference.
(if (= (aref timestamp 8) ?0)
(setq timestamp (concat (substring timestamp 0 8)
" " (substring timestamp 9))))
(equal timestamp date))
(setq type (if all 'UP-TO-DATE)))
((equal date (concat "Result of merge+" timestamp))
(setq type 'CONFLICT)))