aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2008-03-08 20:22:36 +0000
committerGlenn Morris2008-03-08 20:22:36 +0000
commit7d4005cc08853cbe0a21036827456a889ef7697c (patch)
treeb77f58d4c45743e961f9517697508433f50228cc
parent4e0ace231641eb605742d5509a152d0c6fa6a3d7 (diff)
downloademacs-7d4005cc08853cbe0a21036827456a889ef7697c.tar.gz
emacs-7d4005cc08853cbe0a21036827456a889ef7697c.zip
(date-to-time, time-subtract, time-add, safe-date-to-time): Doc fixes.
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/calendar/time-date.el8
2 files changed, 7 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 05886da083d..0c82d64f7a9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -102,6 +102,9 @@
102 * calendar/cal-hebrew.el, calendar/holidays.el, calendar/lunar.el: 102 * calendar/cal-hebrew.el, calendar/holidays.el, calendar/lunar.el:
103 * calendar/solar.el: Unquote lambda functions. 103 * calendar/solar.el: Unquote lambda functions.
104 104
105 * calendar/time-date.el (date-to-time, time-subtract, time-add)
106 (safe-date-to-time): Doc fixes.
107
105 * calendar/todo-mode.el: Remove un-needed eval-when-compile. 108 * calendar/todo-mode.el: Remove un-needed eval-when-compile.
106 109
107 * textmodes/org.el (list-diary-entries-hook): Declare for compiler. 110 * textmodes/org.el (list-diary-entries-hook): Declare for compiler.
diff --git a/lisp/calendar/time-date.el b/lisp/calendar/time-date.el
index b8193ea963d..5b0ddf70f00 100644
--- a/lisp/calendar/time-date.el
+++ b/lisp/calendar/time-date.el
@@ -97,7 +97,7 @@ and type 2 is the list (HIGH LOW MICRO)."
97 97
98;;;###autoload 98;;;###autoload
99(defun date-to-time (date) 99(defun date-to-time (date)
100 "Parse a string that represents a date-time and return a time value." 100 "Parse a string DATE that represents a date-time and return a time value."
101 (condition-case () 101 (condition-case ()
102 (apply 'encode-time 102 (apply 'encode-time
103 (parse-time-string 103 (parse-time-string
@@ -160,7 +160,7 @@ TIME should be either a time value or a date-time string."
160 160
161;;;###autoload 161;;;###autoload
162(defun time-subtract (t1 t2) 162(defun time-subtract (t1 t2)
163 "Subtract two time values. 163 "Subtract two time values, T1 minus T2.
164Return the difference in the format of a time value." 164Return the difference in the format of a time value."
165 (with-decoded-time-value ((high low micro type t1) 165 (with-decoded-time-value ((high low micro type t1)
166 (high2 low2 micro2 type2 t2)) 166 (high2 low2 micro2 type2 t2))
@@ -178,7 +178,7 @@ Return the difference in the format of a time value."
178 178
179;;;###autoload 179;;;###autoload
180(defun time-add (t1 t2) 180(defun time-add (t1 t2)
181 "Add two time values. One should represent a time difference." 181 "Add two time values T1 and T2. One should represent a time difference."
182 (with-decoded-time-value ((high low micro type t1) 182 (with-decoded-time-value ((high low micro type t1)
183 (high2 low2 micro2 type2 t2)) 183 (high2 low2 micro2 type2 t2))
184 (setq high (+ high high2) 184 (setq high (+ high high2)
@@ -248,7 +248,7 @@ The number of days will be returned as a floating point number."
248 248
249;;;###autoload 249;;;###autoload
250(defun safe-date-to-time (date) 250(defun safe-date-to-time (date)
251 "Parse a string that represents a date-time and return a time value. 251 "Parse a string DATE that represents a date-time and return a time value.
252If DATE is malformed, return a time value of zeros." 252If DATE is malformed, return a time value of zeros."
253 (condition-case () 253 (condition-case ()
254 (date-to-time date) 254 (date-to-time date)