diff options
| author | Chong Yidong | 2009-10-15 20:44:36 +0000 |
|---|---|---|
| committer | Chong Yidong | 2009-10-15 20:44:36 +0000 |
| commit | edd6a7338fca5928f7bc352f52769f685ebce95e (patch) | |
| tree | d7add190a2fda4efc050e3792e85f7059c438ffa | |
| parent | 4260b4027e1eff71cf7f1f6b42d163c94e40a5e4 (diff) | |
| download | emacs-edd6a7338fca5928f7bc352f52769f685ebce95e.tar.gz emacs-edd6a7338fca5928f7bc352f52769f685ebce95e.zip | |
* os.texi (Time of Day): Clarify that the microsecond part is
ignored (Bug#4637).
| -rw-r--r-- | doc/lispref/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/lispref/os.texi | 16 |
2 files changed, 12 insertions, 9 deletions
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 @@ | |||
| 1 | 2009-10-15 Chong Yidong <cyd@stupidchicken.com> | ||
| 2 | |||
| 3 | * os.texi (Time of Day): Clarify that the microsecond part is | ||
| 4 | ignored (Bug#4637). | ||
| 5 | |||
| 1 | 2009-10-11 Glenn Morris <rgm@gnu.org> | 6 | 2009-10-11 Glenn Morris <rgm@gnu.org> |
| 2 | 7 | ||
| 3 | * frames.texi (Size and Position): Clarify what is included in the frame | 8 | * 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 | |||
| 1104 | characters from the beginning of the string rather than from the end, as | 1104 | characters from the beginning of the string rather than from the end, as |
| 1105 | additional information may some day be added at the end. | 1105 | additional information may some day be added at the end. |
| 1106 | 1106 | ||
| 1107 | @c Emacs 19 feature | ||
| 1108 | The argument @var{time-value}, if given, specifies a time to format | 1107 | The argument @var{time-value}, if given, specifies a time to format |
| 1109 | instead of the current time. The argument should be a list whose first | 1108 | instead of the current time. This argument should have the same form |
| 1110 | two elements are integers. Thus, you can use times obtained from | 1109 | as the times obtained from @code{current-time} (see below) and from |
| 1111 | @code{current-time} (see below) and from @code{file-attributes} | 1110 | @code{file-attributes} (@pxref{Definition of file-attributes}). It |
| 1112 | (@pxref{Definition of file-attributes}). @var{time-value} can also be | 1111 | should be a list whose first two elements are integers; a third |
| 1113 | a cons of two integers, but this is considered obsolete. | 1112 | (microsecond) element, if present, is ignored. @var{time-value} can |
| 1113 | also be a cons of two integers, but this usage is obsolete. | ||
| 1114 | 1114 | ||
| 1115 | @example | 1115 | @example |
| 1116 | @group | 1116 | @group |
| @@ -1120,7 +1120,6 @@ a cons of two integers, but this is considered obsolete. | |||
| 1120 | @end example | 1120 | @end example |
| 1121 | @end defun | 1121 | @end defun |
| 1122 | 1122 | ||
| 1123 | @c Emacs 19 feature | ||
| 1124 | @defun current-time | 1123 | @defun current-time |
| 1125 | This function returns the system's time value as a list of three | 1124 | This function returns the system's time value as a list of three |
| 1126 | integers: @code{(@var{high} @var{low} @var{microsec})}. The integers | 1125 | integers: @code{(@var{high} @var{low} @var{microsec})}. The integers |
| @@ -1142,7 +1141,6 @@ get with the function @code{file-attributes}. | |||
| 1142 | @xref{Definition of file-attributes}. | 1141 | @xref{Definition of file-attributes}. |
| 1143 | @end defun | 1142 | @end defun |
| 1144 | 1143 | ||
| 1145 | @c Emacs 19 feature | ||
| 1146 | @defun current-time-zone &optional time-value | 1144 | @defun current-time-zone &optional time-value |
| 1147 | This function returns a list describing the time zone that the user is | 1145 | This function returns a list describing the time zone that the user is |
| 1148 | in. | 1146 | in. |
| @@ -1179,7 +1177,7 @@ seconds since the epoch. The argument @var{time-value}, if given, | |||
| 1179 | specifies a time to convert instead of the current time. The argument | 1177 | specifies a time to convert instead of the current time. The argument |
| 1180 | should have the same form as for @code{current-time-string} (see | 1178 | should have the same form as for @code{current-time-string} (see |
| 1181 | above). Thus, it accepts the output of @code{current-time} and | 1179 | above). Thus, it accepts the output of @code{current-time} and |
| 1182 | @code{file-attributes}. | 1180 | @code{file-attributes} (@pxref{Definition of file-attributes}). |
| 1183 | 1181 | ||
| 1184 | @emph{Warning}: Since the result is floating point, it may not be | 1182 | @emph{Warning}: Since the result is floating point, it may not be |
| 1185 | exact. Do not use this function if precise time stamps are required. | 1183 | exact. Do not use this function if precise time stamps are required. |