annotate lisp/calendar/time-date.el @ 101457:feab64c71ad0

icalendar: uid-format, bug fixes.
author Ulf Jasper <ulf.jasper@web.de>
date Sun, 25 Jan 2009 13:38:14 +0000
parents a16e9f7c2536
children b04b1ea82ee0
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
61260
ae865a366a88 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-230
Miles Bader <miles@gnu.org>
parents: 60847
diff changeset
1 ;;; time-date.el --- Date and time handling functions
67465
a55ee709ec8d Update copyright pending Emacs 22.
Glenn Morris <rgm@gnu.org>
parents: 65824
diff changeset
2
91831
41b16ef40f59 Re-fill copyright years.
Glenn Morris <rgm@gnu.org>
parents: 91737
diff changeset
3 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
100908
a9dc0e7c3f2b Add 2009 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 94653
diff changeset
4 ;; 2007, 2008, 2009 Free Software Foundation, Inc.
43049
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
5
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
6 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
7 ;; Masanobu Umeda <umerin@mse.kyutech.ac.jp>
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
8 ;; Keywords: mail news util
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
9
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
10 ;; This file is part of GNU Emacs.
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
11
94653
e49abd957e81 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93975
diff changeset
12 ;; GNU Emacs is free software: you can redistribute it and/or modify
43049
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
13 ;; it under the terms of the GNU General Public License as published by
94653
e49abd957e81 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93975
diff changeset
14 ;; the Free Software Foundation, either version 3 of the License, or
e49abd957e81 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93975
diff changeset
15 ;; (at your option) any later version.
43049
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
16
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
17 ;; GNU Emacs is distributed in the hope that it will be useful,
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
18 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
94653
e49abd957e81 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93975
diff changeset
19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
43049
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
20 ;; GNU General Public License for more details.
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
21
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
22 ;; You should have received a copy of the GNU General Public License
94653
e49abd957e81 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93975
diff changeset
23 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
43049
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
24
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
25 ;;; Commentary:
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
26
60847
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
27 ;; Time values come in three formats. The oldest format is a cons
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
28 ;; cell of the form (HIGH . LOW). This format is obsolete, but still
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
29 ;; supported. The two other formats are the lists (HIGH LOW) and
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
30 ;; (HIGH LOW MICRO). The first two formats specify HIGH * 2^16 + LOW
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
31 ;; seconds; the third format specifies HIGH * 2^16 + LOW + MICRO /
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
32 ;; 1000000 seconds. We should have 0 <= MICRO < 1000000 and 0 <= LOW
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
33 ;; < 2^16. If the time value represents a point in time, then HIGH is
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
34 ;; nonnegative. If the time value is a time difference, then HIGH can
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
35 ;; be negative as well. The macro `with-decoded-time-value' and the
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
36 ;; function `encode-time-value' make it easier to deal with these
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
37 ;; three formats. See `time-subtract' for an example of how to use
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
38 ;; them.
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
39
43049
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
40 ;;; Code:
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
41
100993
a16e9f7c2536 Merge from gnus--devo--0
Miles Bader <miles@gnu.org>
parents: 100908
diff changeset
42 ;; Only necessary for `declare' when compiling Gnus with Emacs 21.
a16e9f7c2536 Merge from gnus--devo--0
Miles Bader <miles@gnu.org>
parents: 100908
diff changeset
43 (eval-when-compile (require 'cl))
a16e9f7c2536 Merge from gnus--devo--0
Miles Bader <miles@gnu.org>
parents: 100908
diff changeset
44
60847
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
45 (defmacro with-decoded-time-value (varlist &rest body)
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
46 "Decode a time value and bind it according to VARLIST, then eval BODY.
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
47
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
48 The value of the last form in BODY is returned.
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
49
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
50 Each element of the list VARLIST is a list of the form
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
51 \(HIGH-SYMBOL LOW-SYMBOL MICRO-SYMBOL [TYPE-SYMBOL] TIME-VALUE).
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
52 The time value TIME-VALUE is decoded and the result it bound to
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
53 the symbols HIGH-SYMBOL, LOW-SYMBOL and MICRO-SYMBOL.
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
54
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
55 The optional TYPE-SYMBOL is bound to the type of the time value.
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
56 Type 0 is the cons cell (HIGH . LOW), type 1 is the list (HIGH
79502
392f18d2007a (with-decoded-time-value): Doc fix.
Glenn Morris <rgm@gnu.org>
parents: 79501
diff changeset
57 LOW), and type 2 is the list (HIGH LOW MICRO)."
60847
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
58 (declare (indent 1)
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
59 (debug ((&rest (symbolp symbolp symbolp &or [symbolp form] form))
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
60 body)))
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
61 (if varlist
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
62 (let* ((elt (pop varlist))
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
63 (high (pop elt))
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
64 (low (pop elt))
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
65 (micro (pop elt))
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
66 (type (unless (eq (length elt) 1)
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
67 (pop elt)))
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
68 (time-value (car elt))
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
69 (gensym (make-symbol "time")))
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
70 `(let* ,(append `((,gensym ,time-value)
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
71 (,high (pop ,gensym))
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
72 ,low ,micro)
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
73 (when type `(,type)))
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
74 (if (consp ,gensym)
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
75 (progn
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
76 (setq ,low (pop ,gensym))
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
77 (if ,gensym
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
78 ,(append `(setq ,micro (car ,gensym))
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
79 (when type `(,type 2)))
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
80 ,(append `(setq ,micro 0)
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
81 (when type `(,type 1)))))
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
82 ,(append `(setq ,low ,gensym ,micro 0)
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
83 (when type `(,type 0))))
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
84 (with-decoded-time-value ,varlist ,@body)))
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
85 `(progn ,@body)))
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
86
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
87 (defun encode-time-value (high low micro type)
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
88 "Encode HIGH, LOW, and MICRO into a time value of type TYPE.
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
89 Type 0 is the cons cell (HIGH . LOW), type 1 is the list (HIGH LOW),
79501
5bd82d58227e Ari Roponen <ari.roponen at gmail.com> (tiny change)
Glenn Morris <rgm@gnu.org>
parents: 78216
diff changeset
90 and type 2 is the list (HIGH LOW MICRO)."
60847
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
91 (cond
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
92 ((eq type 0) (cons high low))
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
93 ((eq type 1) (list high low))
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
94 ((eq type 2) (list high low micro))))
43049
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
95
65824
4f45bcb69451 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-572
Miles Bader <miles@gnu.org>
parents: 64085
diff changeset
96 (autoload 'parse-time-string "parse-time")
43049
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
97 (autoload 'timezone-make-date-arpa-standard "timezone")
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
98
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
99 ;;;###autoload
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
100 (defun date-to-time (date)
92632
870c7b456283 (date-to-time, time-subtract, time-add, safe-date-to-time): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents: 91863
diff changeset
101 "Parse a string DATE that represents a date-time and return a time value."
43049
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
102 (condition-case ()
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
103 (apply 'encode-time
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
104 (parse-time-string
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
105 ;; `parse-time-string' isn't sufficiently general or
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
106 ;; robust. It fails to grok some of the formats that
56927
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 56797
diff changeset
107 ;; timezone does (e.g. dodgy post-2000 stuff from some
43049
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
108 ;; Elms) and either fails or returns bogus values. Lars
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
109 ;; reverted this change, but that loses non-trivially
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
110 ;; often for me. -- fx
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
111 (timezone-make-date-arpa-standard date)))
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
112 (error (error "Invalid date: %s" date))))
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
113
56797
2383026ff0d9 (time-to-seconds): Add autoload cookies.
Masatake YAMATO <jet@gyve.org>
parents: 55002
diff changeset
114 ;;;###autoload
43049
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
115 (defun time-to-seconds (time)
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
116 "Convert time value TIME to a floating point number.
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
117 You can use `float-time' instead."
60847
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
118 (with-decoded-time-value ((high low micro time))
61424
ad05d91d3598 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-243
Miles Bader <miles@gnu.org>
parents: 61260
diff changeset
119 (+ (* 1.0 high 65536)
60847
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
120 low
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
121 (/ micro 1000000.0))))
43049
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
122
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
123 ;;;###autoload
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
124 (defun seconds-to-time (seconds)
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
125 "Convert SECONDS (a floating point number) to a time value."
61424
ad05d91d3598 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-243
Miles Bader <miles@gnu.org>
parents: 61260
diff changeset
126 (list (floor seconds 65536)
ad05d91d3598 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-243
Miles Bader <miles@gnu.org>
parents: 61260
diff changeset
127 (floor (mod seconds 65536))
43049
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
128 (floor (* (- seconds (ffloor seconds)) 1000000))))
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
129
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
130 ;;;###autoload
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
131 (defun time-less-p (t1 t2)
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
132 "Say whether time value T1 is less than time value T2."
60847
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
133 (with-decoded-time-value ((high1 low1 micro1 t1)
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
134 (high2 low2 micro2 t2))
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
135 (or (< high1 high2)
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
136 (and (= high1 high2)
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
137 (or (< low1 low2)
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
138 (and (= low1 low2)
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
139 (< micro1 micro2)))))))
43049
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
140
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
141 ;;;###autoload
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
142 (defun days-to-time (days)
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
143 "Convert DAYS into a time value."
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
144 (let* ((seconds (* 1.0 days 60 60 24))
61424
ad05d91d3598 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-243
Miles Bader <miles@gnu.org>
parents: 61260
diff changeset
145 (high (condition-case nil (floor (/ seconds 65536))
60847
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
146 (range-error most-positive-fixnum))))
61424
ad05d91d3598 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-243
Miles Bader <miles@gnu.org>
parents: 61260
diff changeset
147 (list high (condition-case nil (floor (- seconds (* 1.0 high 65536)))
ad05d91d3598 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-243
Miles Bader <miles@gnu.org>
parents: 61260
diff changeset
148 (range-error 65535)))))
43049
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
149
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
150 ;;;###autoload
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
151 (defun time-since (time)
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
152 "Return the time elapsed since TIME.
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
153 TIME should be either a time value or a date-time string."
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
154 (when (stringp time)
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
155 ;; Convert date strings to internal time.
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
156 (setq time (date-to-time time)))
60847
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
157 (time-subtract (current-time) time))
43049
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
158
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
159 ;;;###autoload
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
160 (defalias 'subtract-time 'time-subtract)
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
161
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
162 ;;;###autoload
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
163 (defun time-subtract (t1 t2)
92632
870c7b456283 (date-to-time, time-subtract, time-add, safe-date-to-time): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents: 91863
diff changeset
164 "Subtract two time values, T1 minus T2.
43049
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
165 Return the difference in the format of a time value."
60847
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
166 (with-decoded-time-value ((high low micro type t1)
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
167 (high2 low2 micro2 type2 t2))
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
168 (setq high (- high high2)
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
169 low (- low low2)
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
170 micro (- micro micro2)
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
171 type (max type type2))
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
172 (when (< micro 0)
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
173 (setq low (1- low)
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
174 micro (+ micro 1000000)))
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
175 (when (< low 0)
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
176 (setq high (1- high)
61424
ad05d91d3598 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-243
Miles Bader <miles@gnu.org>
parents: 61260
diff changeset
177 low (+ low 65536)))
60847
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
178 (encode-time-value high low micro type)))
43049
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
179
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
180 ;;;###autoload
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
181 (defun time-add (t1 t2)
92632
870c7b456283 (date-to-time, time-subtract, time-add, safe-date-to-time): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents: 91863
diff changeset
182 "Add two time values T1 and T2. One should represent a time difference."
60847
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
183 (with-decoded-time-value ((high low micro type t1)
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
184 (high2 low2 micro2 type2 t2))
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
185 (setq high (+ high high2)
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
186 low (+ low low2)
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
187 micro (+ micro micro2)
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
188 type (max type type2))
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
189 (when (>= micro 1000000)
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
190 (setq low (1+ low)
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
191 micro (- micro 1000000)))
61424
ad05d91d3598 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-243
Miles Bader <miles@gnu.org>
parents: 61260
diff changeset
192 (when (>= low 65536)
60847
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
193 (setq high (1+ high)
61424
ad05d91d3598 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-243
Miles Bader <miles@gnu.org>
parents: 61260
diff changeset
194 low (- low 65536)))
60847
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
195 (encode-time-value high low micro type)))
43049
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
196
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
197 ;;;###autoload
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
198 (defun date-to-day (date)
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
199 "Return the number of days between year 1 and DATE.
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
200 DATE should be a date-time string."
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
201 (time-to-days (date-to-time date)))
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
202
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
203 ;;;###autoload
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
204 (defun days-between (date1 date2)
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
205 "Return the number of days between DATE1 and DATE2.
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
206 DATE1 and DATE2 should be date-time strings."
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
207 (- (date-to-day date1) (date-to-day date2)))
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
208
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
209 ;;;###autoload
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
210 (defun date-leap-year-p (year)
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
211 "Return t if YEAR is a leap year."
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
212 (or (and (zerop (% year 4))
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
213 (not (zerop (% year 100))))
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
214 (zerop (% year 400))))
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
215
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
216 ;;;###autoload
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
217 (defun time-to-day-in-year (time)
55002
8e406d7e53be (time-to-day-in-year): Fix docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 52401
diff changeset
218 "Return the day number within the year corresponding to TIME."
43049
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
219 (let* ((tim (decode-time time))
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
220 (month (nth 4 tim))
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
221 (day (nth 3 tim))
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
222 (year (nth 5 tim))
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
223 (day-of-year (+ day (* 31 (1- month)))))
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
224 (when (> month 2)
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
225 (setq day-of-year (- day-of-year (/ (+ 23 (* 4 month)) 10)))
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
226 (when (date-leap-year-p year)
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
227 (setq day-of-year (1+ day-of-year))))
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
228 day-of-year))
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
229
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
230 ;;;###autoload
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
231 (defun time-to-days (time)
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
232 "The number of days between the Gregorian date 0001-12-31bce and TIME.
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
233 TIME should be a time value.
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
234 The Gregorian date Sunday, December 31, 1bce is imaginary."
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
235 (let* ((tim (decode-time time))
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
236 (month (nth 4 tim))
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
237 (day (nth 3 tim))
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
238 (year (nth 5 tim)))
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
239 (+ (time-to-day-in-year time) ; Days this year
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
240 (* 365 (1- year)) ; + Days in prior years
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
241 (/ (1- year) 4) ; + Julian leap years
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
242 (- (/ (1- year) 100)) ; - century years
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
243 (/ (1- year) 400)))) ; + Gregorian leap years
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
244
56927
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 56797
diff changeset
245 (defun time-to-number-of-days (time)
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 56797
diff changeset
246 "Return the number of days represented by TIME.
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 56797
diff changeset
247 The number of days will be returned as a floating point number."
60847
608b5e008a8b Add comment on time value formats. Don't require parse-time.
Lute Kamstra <lute@gnu.org>
parents: 56927
diff changeset
248 (/ (time-to-seconds time) (* 60 60 24)))
56927
55fd4f77387a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents: 56797
diff changeset
249
43049
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
250 ;;;###autoload
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
251 (defun safe-date-to-time (date)
92632
870c7b456283 (date-to-time, time-subtract, time-add, safe-date-to-time): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents: 91863
diff changeset
252 "Parse a string DATE that represents a date-time and return a time value.
43049
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
253 If DATE is malformed, return a time value of zeros."
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
254 (condition-case ()
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
255 (date-to-time date)
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
256 (error '(0 0))))
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
257
91737
f9b4ba32c775 (emacs-uptime): New function.
Glenn Morris <rgm@gnu.org>
parents: 79703
diff changeset
258
f9b4ba32c775 (emacs-uptime): New function.
Glenn Morris <rgm@gnu.org>
parents: 79703
diff changeset
259 ;;;###autoload
91863
5f14edcf524f (format-seconds): Remove `nonzero' argument in favor of `%z' specifier.
Glenn Morris <rgm@gnu.org>
parents: 91836
diff changeset
260 (defun format-seconds (string seconds)
91831
41b16ef40f59 Re-fill copyright years.
Glenn Morris <rgm@gnu.org>
parents: 91737
diff changeset
261 "Use format control STRING to format the number SECONDS.
41b16ef40f59 Re-fill copyright years.
Glenn Morris <rgm@gnu.org>
parents: 91737
diff changeset
262 The valid format specifiers are:
41b16ef40f59 Re-fill copyright years.
Glenn Morris <rgm@gnu.org>
parents: 91737
diff changeset
263 %y is the number of (365-day) years.
41b16ef40f59 Re-fill copyright years.
Glenn Morris <rgm@gnu.org>
parents: 91737
diff changeset
264 %d is the number of days.
41b16ef40f59 Re-fill copyright years.
Glenn Morris <rgm@gnu.org>
parents: 91737
diff changeset
265 %h is the number of hours.
41b16ef40f59 Re-fill copyright years.
Glenn Morris <rgm@gnu.org>
parents: 91737
diff changeset
266 %m is the number of minutes.
41b16ef40f59 Re-fill copyright years.
Glenn Morris <rgm@gnu.org>
parents: 91737
diff changeset
267 %s is the number of seconds.
91863
5f14edcf524f (format-seconds): Remove `nonzero' argument in favor of `%z' specifier.
Glenn Morris <rgm@gnu.org>
parents: 91836
diff changeset
268 %z is a non-printing control flag (see below).
91831
41b16ef40f59 Re-fill copyright years.
Glenn Morris <rgm@gnu.org>
parents: 91737
diff changeset
269 %% is a literal \"%\".
41b16ef40f59 Re-fill copyright years.
Glenn Morris <rgm@gnu.org>
parents: 91737
diff changeset
270
41b16ef40f59 Re-fill copyright years.
Glenn Morris <rgm@gnu.org>
parents: 91737
diff changeset
271 Upper-case specifiers are followed by the unit-name (e.g. \"years\").
41b16ef40f59 Re-fill copyright years.
Glenn Morris <rgm@gnu.org>
parents: 91737
diff changeset
272 Lower-case specifiers return only the unit.
41b16ef40f59 Re-fill copyright years.
Glenn Morris <rgm@gnu.org>
parents: 91737
diff changeset
273
41b16ef40f59 Re-fill copyright years.
Glenn Morris <rgm@gnu.org>
parents: 91737
diff changeset
274 \"%\" may be followed by a number specifying a width, with an
41b16ef40f59 Re-fill copyright years.
Glenn Morris <rgm@gnu.org>
parents: 91737
diff changeset
275 optional leading \".\" for zero-padding. For example, \"%.3Y\" will
41b16ef40f59 Re-fill copyright years.
Glenn Morris <rgm@gnu.org>
parents: 91737
diff changeset
276 return something of the form \"001 year\".
41b16ef40f59 Re-fill copyright years.
Glenn Morris <rgm@gnu.org>
parents: 91737
diff changeset
277
91863
5f14edcf524f (format-seconds): Remove `nonzero' argument in favor of `%z' specifier.
Glenn Morris <rgm@gnu.org>
parents: 91836
diff changeset
278 The \"%z\" specifier does not print anything. When it is used, specifiers
5f14edcf524f (format-seconds): Remove `nonzero' argument in favor of `%z' specifier.
Glenn Morris <rgm@gnu.org>
parents: 91836
diff changeset
279 must be given in order of decreasing size. To the left of \"%z\", nothing
5f14edcf524f (format-seconds): Remove `nonzero' argument in favor of `%z' specifier.
Glenn Morris <rgm@gnu.org>
parents: 91836
diff changeset
280 is output until the first non-zero unit is encountered.
91831
41b16ef40f59 Re-fill copyright years.
Glenn Morris <rgm@gnu.org>
parents: 91737
diff changeset
281
91863
5f14edcf524f (format-seconds): Remove `nonzero' argument in favor of `%z' specifier.
Glenn Morris <rgm@gnu.org>
parents: 91836
diff changeset
282 This function does not work for SECONDS greater than `most-positive-fixnum'."
91831
41b16ef40f59 Re-fill copyright years.
Glenn Morris <rgm@gnu.org>
parents: 91737
diff changeset
283 (let ((start 0)
41b16ef40f59 Re-fill copyright years.
Glenn Morris <rgm@gnu.org>
parents: 91737
diff changeset
284 (units '(("y" "year" 31536000)
41b16ef40f59 Re-fill copyright years.
Glenn Morris <rgm@gnu.org>
parents: 91737
diff changeset
285 ("d" "day" 86400)
41b16ef40f59 Re-fill copyright years.
Glenn Morris <rgm@gnu.org>
parents: 91737
diff changeset
286 ("h" "hour" 3600)
41b16ef40f59 Re-fill copyright years.
Glenn Morris <rgm@gnu.org>
parents: 91737
diff changeset
287 ("m" "minute" 60)
91863
5f14edcf524f (format-seconds): Remove `nonzero' argument in favor of `%z' specifier.
Glenn Morris <rgm@gnu.org>
parents: 91836
diff changeset
288 ("s" "second" 1)
5f14edcf524f (format-seconds): Remove `nonzero' argument in favor of `%z' specifier.
Glenn Morris <rgm@gnu.org>
parents: 91836
diff changeset
289 ("z")))
91831
41b16ef40f59 Re-fill copyright years.
Glenn Morris <rgm@gnu.org>
parents: 91737
diff changeset
290 (case-fold-search t)
91863
5f14edcf524f (format-seconds): Remove `nonzero' argument in favor of `%z' specifier.
Glenn Morris <rgm@gnu.org>
parents: 91836
diff changeset
291 spec match usedunits zeroflag larger prev name unit num zeropos)
91831
41b16ef40f59 Re-fill copyright years.
Glenn Morris <rgm@gnu.org>
parents: 91737
diff changeset
292 (while (string-match "%\\.?[0-9]*\\(.\\)" string start)
41b16ef40f59 Re-fill copyright years.
Glenn Morris <rgm@gnu.org>
parents: 91737
diff changeset
293 (setq start (match-end 0)
41b16ef40f59 Re-fill copyright years.
Glenn Morris <rgm@gnu.org>
parents: 91737
diff changeset
294 spec (match-string 1 string))
41b16ef40f59 Re-fill copyright years.
Glenn Morris <rgm@gnu.org>
parents: 91737
diff changeset
295 (unless (string-equal spec "%")
100993
a16e9f7c2536 Merge from gnus--devo--0
Miles Bader <miles@gnu.org>
parents: 100908
diff changeset
296 ;; `assoc-string' is not available in Emacs 21. So when compiling
a16e9f7c2536 Merge from gnus--devo--0
Miles Bader <miles@gnu.org>
parents: 100908
diff changeset
297 ;; Gnus (`time-date.el' is part of Gnus) with Emacs 21, we get a
a16e9f7c2536 Merge from gnus--devo--0
Miles Bader <miles@gnu.org>
parents: 100908
diff changeset
298 ;; warning here. But `format-seconds' is not used anywhere in Gnus so
a16e9f7c2536 Merge from gnus--devo--0
Miles Bader <miles@gnu.org>
parents: 100908
diff changeset
299 ;; it's not a real problem. --rsteib
91831
41b16ef40f59 Re-fill copyright years.
Glenn Morris <rgm@gnu.org>
parents: 91737
diff changeset
300 (or (setq match (assoc-string spec units t))
41b16ef40f59 Re-fill copyright years.
Glenn Morris <rgm@gnu.org>
parents: 91737
diff changeset
301 (error "Bad format specifier: `%s'" spec))
91863
5f14edcf524f (format-seconds): Remove `nonzero' argument in favor of `%z' specifier.
Glenn Morris <rgm@gnu.org>
parents: 91836
diff changeset
302 (if (assoc-string spec usedunits t)
91831
41b16ef40f59 Re-fill copyright years.
Glenn Morris <rgm@gnu.org>
parents: 91737
diff changeset
303 (error "Multiple instances of specifier: `%s'" spec))
91863
5f14edcf524f (format-seconds): Remove `nonzero' argument in favor of `%z' specifier.
Glenn Morris <rgm@gnu.org>
parents: 91836
diff changeset
304 (if (string-equal (car match) "z")
5f14edcf524f (format-seconds): Remove `nonzero' argument in favor of `%z' specifier.
Glenn Morris <rgm@gnu.org>
parents: 91836
diff changeset
305 (setq zeroflag t)
5f14edcf524f (format-seconds): Remove `nonzero' argument in favor of `%z' specifier.
Glenn Morris <rgm@gnu.org>
parents: 91836
diff changeset
306 (unless larger
5f14edcf524f (format-seconds): Remove `nonzero' argument in favor of `%z' specifier.
Glenn Morris <rgm@gnu.org>
parents: 91836
diff changeset
307 (setq unit (nth 2 match)
5f14edcf524f (format-seconds): Remove `nonzero' argument in favor of `%z' specifier.
Glenn Morris <rgm@gnu.org>
parents: 91836
diff changeset
308 larger (and prev (> unit prev))
5f14edcf524f (format-seconds): Remove `nonzero' argument in favor of `%z' specifier.
Glenn Morris <rgm@gnu.org>
parents: 91836
diff changeset
309 prev unit)))
5f14edcf524f (format-seconds): Remove `nonzero' argument in favor of `%z' specifier.
Glenn Morris <rgm@gnu.org>
parents: 91836
diff changeset
310 (push match usedunits)))
5f14edcf524f (format-seconds): Remove `nonzero' argument in favor of `%z' specifier.
Glenn Morris <rgm@gnu.org>
parents: 91836
diff changeset
311 (and zeroflag larger
5f14edcf524f (format-seconds): Remove `nonzero' argument in favor of `%z' specifier.
Glenn Morris <rgm@gnu.org>
parents: 91836
diff changeset
312 (error "Units are not in decreasing order of size"))
5f14edcf524f (format-seconds): Remove `nonzero' argument in favor of `%z' specifier.
Glenn Morris <rgm@gnu.org>
parents: 91836
diff changeset
313 (dolist (u units)
5f14edcf524f (format-seconds): Remove `nonzero' argument in favor of `%z' specifier.
Glenn Morris <rgm@gnu.org>
parents: 91836
diff changeset
314 (setq spec (car u)
5f14edcf524f (format-seconds): Remove `nonzero' argument in favor of `%z' specifier.
Glenn Morris <rgm@gnu.org>
parents: 91836
diff changeset
315 name (cadr u)
5f14edcf524f (format-seconds): Remove `nonzero' argument in favor of `%z' specifier.
Glenn Morris <rgm@gnu.org>
parents: 91836
diff changeset
316 unit (nth 2 u))
91831
41b16ef40f59 Re-fill copyright years.
Glenn Morris <rgm@gnu.org>
parents: 91737
diff changeset
317 (when (string-match (format "%%\\(\\.?[0-9]+\\)?\\(%s\\)" spec) string)
91863
5f14edcf524f (format-seconds): Remove `nonzero' argument in favor of `%z' specifier.
Glenn Morris <rgm@gnu.org>
parents: 91836
diff changeset
318 (if (string-equal spec "z") ; must be last in units
5f14edcf524f (format-seconds): Remove `nonzero' argument in favor of `%z' specifier.
Glenn Morris <rgm@gnu.org>
parents: 91836
diff changeset
319 (setq string
5f14edcf524f (format-seconds): Remove `nonzero' argument in favor of `%z' specifier.
Glenn Morris <rgm@gnu.org>
parents: 91836
diff changeset
320 (replace-regexp-in-string
5f14edcf524f (format-seconds): Remove `nonzero' argument in favor of `%z' specifier.
Glenn Morris <rgm@gnu.org>
parents: 91836
diff changeset
321 "%z" ""
5f14edcf524f (format-seconds): Remove `nonzero' argument in favor of `%z' specifier.
Glenn Morris <rgm@gnu.org>
parents: 91836
diff changeset
322 (substring string (min (or zeropos (match-end 0))
5f14edcf524f (format-seconds): Remove `nonzero' argument in favor of `%z' specifier.
Glenn Morris <rgm@gnu.org>
parents: 91836
diff changeset
323 (match-beginning 0)))))
5f14edcf524f (format-seconds): Remove `nonzero' argument in favor of `%z' specifier.
Glenn Morris <rgm@gnu.org>
parents: 91836
diff changeset
324 ;; Cf article-make-date-line in gnus-art.
5f14edcf524f (format-seconds): Remove `nonzero' argument in favor of `%z' specifier.
Glenn Morris <rgm@gnu.org>
parents: 91836
diff changeset
325 (setq num (floor seconds unit)
5f14edcf524f (format-seconds): Remove `nonzero' argument in favor of `%z' specifier.
Glenn Morris <rgm@gnu.org>
parents: 91836
diff changeset
326 seconds (- seconds (* num unit)))
5f14edcf524f (format-seconds): Remove `nonzero' argument in favor of `%z' specifier.
Glenn Morris <rgm@gnu.org>
parents: 91836
diff changeset
327 ;; Start position of the first non-zero unit.
5f14edcf524f (format-seconds): Remove `nonzero' argument in favor of `%z' specifier.
Glenn Morris <rgm@gnu.org>
parents: 91836
diff changeset
328 (or zeropos
5f14edcf524f (format-seconds): Remove `nonzero' argument in favor of `%z' specifier.
Glenn Morris <rgm@gnu.org>
parents: 91836
diff changeset
329 (setq zeropos (unless (zerop num) (match-beginning 0))))
5f14edcf524f (format-seconds): Remove `nonzero' argument in favor of `%z' specifier.
Glenn Morris <rgm@gnu.org>
parents: 91836
diff changeset
330 (setq string
5f14edcf524f (format-seconds): Remove `nonzero' argument in favor of `%z' specifier.
Glenn Morris <rgm@gnu.org>
parents: 91836
diff changeset
331 (replace-match
5f14edcf524f (format-seconds): Remove `nonzero' argument in favor of `%z' specifier.
Glenn Morris <rgm@gnu.org>
parents: 91836
diff changeset
332 (format (concat "%" (match-string 1 string) "d%s") num
5f14edcf524f (format-seconds): Remove `nonzero' argument in favor of `%z' specifier.
Glenn Morris <rgm@gnu.org>
parents: 91836
diff changeset
333 (if (string-equal (match-string 2 string) spec)
5f14edcf524f (format-seconds): Remove `nonzero' argument in favor of `%z' specifier.
Glenn Morris <rgm@gnu.org>
parents: 91836
diff changeset
334 "" ; lower-case, no unit-name
5f14edcf524f (format-seconds): Remove `nonzero' argument in favor of `%z' specifier.
Glenn Morris <rgm@gnu.org>
parents: 91836
diff changeset
335 (format " %s%s" name
5f14edcf524f (format-seconds): Remove `nonzero' argument in favor of `%z' specifier.
Glenn Morris <rgm@gnu.org>
parents: 91836
diff changeset
336 (if (= num 1) "" "s"))))
5f14edcf524f (format-seconds): Remove `nonzero' argument in favor of `%z' specifier.
Glenn Morris <rgm@gnu.org>
parents: 91836
diff changeset
337 t t string))))))
91831
41b16ef40f59 Re-fill copyright years.
Glenn Morris <rgm@gnu.org>
parents: 91737
diff changeset
338 (replace-regexp-in-string "%%" "%" string))
41b16ef40f59 Re-fill copyright years.
Glenn Morris <rgm@gnu.org>
parents: 91737
diff changeset
339
91737
f9b4ba32c775 (emacs-uptime): New function.
Glenn Morris <rgm@gnu.org>
parents: 79703
diff changeset
340
43049
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
341 (provide 'time-date)
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
342
93975
1e3a407766b9 Fix up comment convention on the arch-tag lines.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92632
diff changeset
343 ;; arch-tag: addcf07b-b20a-465b-af72-550b8ac5190f
43049
d94124a8eddf Moved time-date.el from lisp/gnus to lisp/calendar.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
344 ;;; time-date.el ends here