diff options
| author | Eli Zaretskii | 2008-10-18 09:40:45 +0000 |
|---|---|---|
| committer | Eli Zaretskii | 2008-10-18 09:40:45 +0000 |
| commit | 3051e4bf2c9288b75c83661bb53459acf38f1dc6 (patch) | |
| tree | d3d06c407b7270a219efe90500e0d40b70a89d76 | |
| parent | fac5dc61dbee2378a881be28e8ff234a3c5b8839 (diff) | |
| download | emacs-3051e4bf2c9288b75c83661bb53459acf38f1dc6.tar.gz emacs-3051e4bf2c9288b75c83661bb53459acf38f1dc6.zip | |
(Time Parsing, Processor Run Time): Fix last change.
| -rw-r--r-- | doc/lispref/os.texi | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi index 7236f0c0e18..41d8b43d444 100644 --- a/doc/lispref/os.texi +++ b/doc/lispref/os.texi | |||
| @@ -1340,19 +1340,19 @@ control the conversion. Here is a table of what the | |||
| 1340 | @table @samp | 1340 | @table @samp |
| 1341 | @item %y | 1341 | @item %y |
| 1342 | @itemx %Y | 1342 | @itemx %Y |
| 1343 | The number of full 365-day years. | 1343 | The integer number of 365-day years. |
| 1344 | @item %d | 1344 | @item %d |
| 1345 | @itemx %D | 1345 | @itemx %D |
| 1346 | The number of full days. | 1346 | The integer number of days. |
| 1347 | @item %h | 1347 | @item %h |
| 1348 | @itemx %H | 1348 | @itemx %H |
| 1349 | The number of full hours. | 1349 | The integer number of hours. |
| 1350 | @item %m | 1350 | @item %m |
| 1351 | @itemx %M | 1351 | @itemx %M |
| 1352 | The number of full minutes. | 1352 | The integer number of minutes. |
| 1353 | @item %s | 1353 | @item %s |
| 1354 | @itemx %S | 1354 | @itemx %S |
| 1355 | The number of seconds. | 1355 | The integer number of seconds. |
| 1356 | @item %z | 1356 | @item %z |
| 1357 | Non-printing control flag. When it is used, other specifiers must be | 1357 | Non-printing control flag. When it is used, other specifiers must be |
| 1358 | given in the order of decreasing size, i.e.@: years before days, hours | 1358 | given in the order of decreasing size, i.e.@: years before days, hours |
| @@ -1391,10 +1391,10 @@ both elapsed and processor time, used by the Emacs process. | |||
| 1391 | @defun emacs-uptime &optional format | 1391 | @defun emacs-uptime &optional format |
| 1392 | This function returns a string representing the Emacs | 1392 | This function returns a string representing the Emacs |
| 1393 | @dfn{uptime}---the elapsed wall-clock time this instance of Emacs is | 1393 | @dfn{uptime}---the elapsed wall-clock time this instance of Emacs is |
| 1394 | running. The string is formatted according to the optional argument | 1394 | running. The string is formatted by @code{format-seconds} according |
| 1395 | @var{format}. For the available format descriptors, see @ref{Time | 1395 | to the optional argument @var{format}. For the available format |
| 1396 | Parsing, format-seconds}. If @var{format} is nil or omitted, it | 1396 | descriptors, see @ref{Time Parsing, format-seconds}. If @var{format} |
| 1397 | defaults to @code{"%Y, %D, %H, %M, %z%S"}. | 1397 | is nil or omitted, it defaults to @code{"%Y, %D, %H, %M, %z%S"}. |
| 1398 | @end defun | 1398 | @end defun |
| 1399 | 1399 | ||
| 1400 | @defun get-internal-run-time | 1400 | @defun get-internal-run-time |