From: Chong Yidong <cyd@stupidchicken.com>
Date: Mon, 18 Jan 2010 16:29:00 +0000 (-0500)
Subject: Doc fix for current-time-string and date-to-time (Bug#5408)
X-Git-Tag: emacs-pretest-23.1.92~30^2~10
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=244b023e520f102619156e93be9cd7424fe7d6a0;p=emacs.git

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 --git a/lisp/ChangeLog b/lisp/ChangeLog
index d9f3648425b..105f6b05263 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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)
diff --git a/lisp/calendar/time-date.el b/lisp/calendar/time-date.el
index 3b4495881f6..914d2d33928 100644
--- a/lisp/calendar/time-date.el
+++ b/lisp/calendar/time-date.el
@@ -98,7 +98,8 @@ and type 2 is the list (HIGH LOW MICRO)."
 
 ;;;###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 --git a/src/ChangeLog b/src/ChangeLog
index e1d2ba440ab..190e35d923f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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).
diff --git a/src/editfns.c b/src/editfns.c
index 00ac0ca0fa9..093f141bff2 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -1897,7 +1897,7 @@ usage: (encode-time SECOND MINUTE HOUR DAY MONTH YEAR &optional ZONE)  */)
 }
 
 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.