changeset 106900:e3970f7c14d4

Doc fix for current-time-string and date-to-time (Bug#5408) * src/editfns.c (Fcurrent_time_string): Doc fix. * lisp/calendar/time-date.el (date-to-time): Doc fix.
author Chong Yidong <cyd@stupidchicken.com>
date Mon, 18 Jan 2010 11:29:00 -0500
parents 86d456f300a8
children ee670d4f8293
files lisp/ChangeLog lisp/calendar/time-date.el src/ChangeLog src/editfns.c
diffstat 4 files changed, 11 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Mon Jan 18 05:44:36 2010 +0100
+++ b/lisp/ChangeLog	Mon Jan 18 11:29:00 2010 -0500
@@ -1,3 +1,7 @@
+2010-01-18  Chong Yidong  <cyd@stupidchicken.com>
+
+	* calendar/time-date.el (date-to-time): Doc fix (Bug#5408).
+
 2010-01-18  Juanma Barranquero  <lekktu@gmail.com>
 
 	* cedet/ede/locate.el (ede-locate-file-in-project)
--- a/lisp/calendar/time-date.el	Mon Jan 18 05:44:36 2010 +0100
+++ b/lisp/calendar/time-date.el	Mon Jan 18 11:29:00 2010 -0500
@@ -98,7 +98,8 @@
 
 ;;;###autoload
 (defun date-to-time (date)
-  "Parse a string DATE that represents a date-time and return a time value."
+  "Parse a string DATE that represents a date-time and return a time value.
+If DATE lacks timezone information, GMT is assumed."
   (condition-case ()
       (apply 'encode-time
 	     (parse-time-string
--- a/src/ChangeLog	Mon Jan 18 05:44:36 2010 +0100
+++ b/src/ChangeLog	Mon Jan 18 11:29:00 2010 -0500
@@ -1,3 +1,7 @@
+2010-01-18  Chong Yidong  <cyd@stupidchicken.com>
+
+	* editfns.c (Fcurrent_time_string): Doc fix (Bug#5408).
+
 2010-01-16  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* xterm.c (event_handler_gdk): Block input (Bug#5037).
--- a/src/editfns.c	Mon Jan 18 05:44:36 2010 +0100
+++ b/src/editfns.c	Mon Jan 18 11:29:00 2010 -0500
@@ -1897,7 +1897,7 @@
 }
 
 DEFUN ("current-time-string", Fcurrent_time_string, Scurrent_time_string, 0, 1, 0,
-       doc: /* Return the current time, as a human-readable string.
+       doc: /* Return the current local time, as a human-readable string.
 Programs can use this function to decode a time,
 since the number of columns in each field is fixed
 if the year is in the range 1000-9999.