From: Chong Yidong <cyd@stupidchicken.com>
Date: Thu, 15 Oct 2009 20:44:36 +0000 (+0000)
Subject: * os.texi (Time of Day): Clarify that the microsecond part is
X-Git-Tag: emacs-pretest-23.1.90~788
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=edd6a7338fca5928f7bc352f52769f685ebce95e;p=emacs.git

* os.texi (Time of Day): Clarify that the microsecond part is
ignored (Bug#4637).
---

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index bacb0bfb537..833ff8b57ff 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-15  Chong Yidong  <cyd@stupidchicken.com>
+
+	* os.texi (Time of Day): Clarify that the microsecond part is
+	ignored (Bug#4637).
+
 2009-10-11  Glenn Morris  <rgm@gnu.org>
 
 	* frames.texi (Size and Position): Clarify what is included in the frame
diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi
index e98bcabe31e..3b4d3cf3145 100644
--- a/doc/lispref/os.texi
+++ b/doc/lispref/os.texi
@@ -1104,13 +1104,13 @@ used for each part is always the same, so you can reliably use
 characters from the beginning of the string rather than from the end, as
 additional information may some day be added at the end.
 
-@c Emacs 19 feature
 The argument @var{time-value}, if given, specifies a time to format
-instead of the current time.  The argument should be a list whose first
-two elements are integers.  Thus, you can use times obtained from
-@code{current-time} (see below) and from @code{file-attributes}
-(@pxref{Definition of file-attributes}).  @var{time-value} can also be
-a cons of two integers, but this is considered obsolete.
+instead of the current time.  This argument should have the same form
+as the times obtained from @code{current-time} (see below) and from
+@code{file-attributes} (@pxref{Definition of file-attributes}).  It
+should be a list whose first two elements are integers; a third
+(microsecond) element, if present, is ignored.  @var{time-value} can
+also be a cons of two integers, but this usage is obsolete.
 
 @example
 @group
@@ -1120,7 +1120,6 @@ a cons of two integers, but this is considered obsolete.
 @end example
 @end defun
 
-@c Emacs 19 feature
 @defun current-time
 This function returns the system's time value as a list of three
 integers: @code{(@var{high} @var{low} @var{microsec})}.  The integers
@@ -1142,7 +1141,6 @@ get with the function @code{file-attributes}.
 @xref{Definition of file-attributes}.
 @end defun
 
-@c Emacs 19 feature
 @defun current-time-zone &optional time-value
 This function returns a list describing the time zone that the user is
 in.
@@ -1179,7 +1177,7 @@ seconds since the epoch.  The argument @var{time-value}, if given,
 specifies a time to convert instead of the current time.  The argument
 should have the same form as for @code{current-time-string} (see
 above).  Thus, it accepts the output of @code{current-time} and
-@code{file-attributes}.
+@code{file-attributes} (@pxref{Definition of file-attributes}).
 
 @emph{Warning}: Since the result is floating point, it may not be
 exact.  Do not use this function if precise time stamps are required.