# HG changeset patch # User Chong Yidong # Date 1263832140 18000 # Node ID e3970f7c14d43e3d2a2efc9d41dcb3b49536f4b4 # Parent 86d456f300a864ffbe75be1f43a69bf431d52103 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. diff -r 86d456f300a8 -r e3970f7c14d4 lisp/ChangeLog --- 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 + + * calendar/time-date.el (date-to-time): Doc fix (Bug#5408). + 2010-01-18 Juanma Barranquero * cedet/ede/locate.el (ede-locate-file-in-project) diff -r 86d456f300a8 -r e3970f7c14d4 lisp/calendar/time-date.el --- 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 diff -r 86d456f300a8 -r e3970f7c14d4 src/ChangeLog --- 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 + + * editfns.c (Fcurrent_time_string): Doc fix (Bug#5408). + 2010-01-16 Stefan Monnier * xterm.c (event_handler_gdk): Block input (Bug#5037). diff -r 86d456f300a8 -r e3970f7c14d4 src/editfns.c --- 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.