diff options
| author | Paul Eggert | 2012-10-24 05:12:23 +0000 |
|---|---|---|
| committer | Paul Eggert | 2012-10-24 05:12:23 +0000 |
| commit | 72ec96fb41e2e53ac5fda7532b0d3753e5ff971e (patch) | |
| tree | 8cc26b9c09de599818c6cfe4e23cff127b51ca56 | |
| parent | 75e8f9d2decbbebf7ffc20d17ff8676077071255 (diff) | |
| download | emacs-72ec96fb41e2e53ac5fda7532b0d3753e5ff971e.tar.gz emacs-72ec96fb41e2e53ac5fda7532b0d3753e5ff971e.zip | |
Update manual for new time stamp format.
These instances were missed the first time around.
Problem reported by Glenn Morris in <http://bugs.gnu.org/12706#25>.
* doc/lispintro/emacs-lisp-intro.texi (Files List):
* doc/lispref/buffers.texi (Modification Time):
* doc/lispref/files.texi (Testing Accessibility, File Attributes):
* doc/lispref/intro.texi (Version Info):
* doc/lispref/os.texi (Time of Day):
* doc/misc/emacs-mime.texi (time-date):
Update for new time stamp format (HIGH LOW MICROSEC PICOSEC).
* doc/misc/emacs-mime.texi (time-date):
Also, fix bogus time stamp and modernize a bit.
| -rw-r--r-- | doc/lispintro/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/lispintro/emacs-lisp-intro.texi | 14 | ||||
| -rw-r--r-- | doc/lispref/ChangeLog | 11 | ||||
| -rw-r--r-- | doc/lispref/buffers.texi | 9 | ||||
| -rw-r--r-- | doc/lispref/files.texi | 24 | ||||
| -rw-r--r-- | doc/lispref/intro.texi | 4 | ||||
| -rw-r--r-- | doc/lispref/os.texi | 2 | ||||
| -rw-r--r-- | doc/misc/ChangeLog | 6 | ||||
| -rw-r--r-- | doc/misc/emacs-mime.texi | 10 |
9 files changed, 53 insertions, 32 deletions
diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog index 6c524f5a0ae..396e3857c58 100644 --- a/doc/lispintro/ChangeLog +++ b/doc/lispintro/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-10-24 Paul Eggert <eggert@penguin.cs.ucla.edu> | ||
| 2 | |||
| 3 | * emacs-lisp-intro.texi (Files List): | ||
| 4 | Update manual for new time stamp format (Bug#12706). | ||
| 5 | |||
| 1 | 2012-10-17 Gregor Zattler <grfz@gmx.de> (tiny change) | 6 | 2012-10-17 Gregor Zattler <grfz@gmx.de> (tiny change) |
| 2 | 7 | ||
| 3 | * emacs-lisp-intro.texi (Narrowing advantages): | 8 | * emacs-lisp-intro.texi (Narrowing advantages): |
diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi index 70ddb81c776..f885d6c15e8 100644 --- a/doc/lispintro/emacs-lisp-intro.texi +++ b/doc/lispintro/emacs-lisp-intro.texi | |||
| @@ -238,7 +238,7 @@ GNU Press, @hfill @uref{http://www.fsf.org/campaigns/gnu-press/}@* | |||
| 238 | a division of the @hfill email: @email{sales@@fsf.org}@* | 238 | a division of the @hfill email: @email{sales@@fsf.org}@* |
| 239 | Free Software Foundation, Inc. @hfill Tel: +1 (617) 542-5942@* | 239 | Free Software Foundation, Inc. @hfill Tel: +1 (617) 542-5942@* |
| 240 | 51 Franklin Street, Fifth Floor @hfill Fax: +1 (617) 542-2652@* | 240 | 51 Franklin Street, Fifth Floor @hfill Fax: +1 (617) 542-2652@* |
| 241 | Boston, MA 02110-1301 USA | 241 | Boston, MA 02110-1301 USA |
| 242 | @end iftex | 242 | @end iftex |
| 243 | 243 | ||
| 244 | @ifnottex | 244 | @ifnottex |
| @@ -249,7 +249,7 @@ GNU Press, http://www.fsf.org/campaigns/gnu-press/ | |||
| 249 | a division of the email: sales@@fsf.org | 249 | a division of the email: sales@@fsf.org |
| 250 | Free Software Foundation, Inc. Tel: +1 (617) 542-5942 | 250 | Free Software Foundation, Inc. Tel: +1 (617) 542-5942 |
| 251 | 51 Franklin Street, Fifth Floor Fax: +1 (617) 542-2652 | 251 | 51 Franklin Street, Fifth Floor Fax: +1 (617) 542-2652 |
| 252 | Boston, MA 02110-1301 USA | 252 | Boston, MA 02110-1301 USA |
| 253 | @end example | 253 | @end example |
| 254 | @end ifnottex | 254 | @end ifnottex |
| 255 | 255 | ||
| @@ -15680,11 +15680,11 @@ nil | |||
| 15680 | 100 | 15680 | 100 |
| 15681 | @end group | 15681 | @end group |
| 15682 | @group | 15682 | @group |
| 15683 | (17733 259) | 15683 | (20615 27034 579989 697000) |
| 15684 | (17491 28834) | 15684 | (17905 55681 0 0) |
| 15685 | (17596 62124) | 15685 | (20615 26327 734791 805000) |
| 15686 | 13157 | 15686 | 13188 |
| 15687 | "-rw-rw-r--" | 15687 | "-rw-r--r--" |
| 15688 | @end group | 15688 | @end group |
| 15689 | @group | 15689 | @group |
| 15690 | nil | 15690 | nil |
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 9142ef49b12..bed74bb688a 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog | |||
| @@ -1,3 +1,14 @@ | |||
| 1 | 2012-10-24 Paul Eggert <eggert@penguin.cs.ucla.edu> | ||
| 2 | |||
| 3 | Update manual for new time stamp format (Bug#12706). | ||
| 4 | * buffers.texi (Modification Time): | ||
| 5 | * files.texi (Testing Accessibility, File Attributes): | ||
| 6 | * intro.texi (Version Info): | ||
| 7 | * os.texi (Time of Day): | ||
| 8 | Update for new time stamp format (HIGH LOW MICROSEC PICOSEC). | ||
| 9 | These instances were missed the first time around. | ||
| 10 | Problem reported by Glenn Morris in <http://bugs.gnu.org/12706#25>. | ||
| 11 | |||
| 1 | 2012-10-24 Chong Yidong <cyd@gnu.org> | 12 | 2012-10-24 Chong Yidong <cyd@gnu.org> |
| 2 | 13 | ||
| 3 | * keymaps.texi (Toolkit Differences): Node deleted. | 14 | * keymaps.texi (Toolkit Differences): Node deleted. |
diff --git a/doc/lispref/buffers.texi b/doc/lispref/buffers.texi index b9666a79f5b..4a556895de7 100644 --- a/doc/lispref/buffers.texi +++ b/doc/lispref/buffers.texi | |||
| @@ -634,7 +634,8 @@ file should not be done. | |||
| 634 | @c Emacs 19 feature | 634 | @c Emacs 19 feature |
| 635 | @defun visited-file-modtime | 635 | @defun visited-file-modtime |
| 636 | This function returns the current buffer's recorded last file | 636 | This function returns the current buffer's recorded last file |
| 637 | modification time, as a list of the form @code{(@var{high} @var{low})}. | 637 | modification time, as a list of the form @code{(@var{high} @var{low} |
| 638 | @var{microsec} @var{picosec})}. | ||
| 638 | (This is the same format that @code{file-attributes} uses to return | 639 | (This is the same format that @code{file-attributes} uses to return |
| 639 | time values; see @ref{File Attributes}.) | 640 | time values; see @ref{File Attributes}.) |
| 640 | 641 | ||
| @@ -664,9 +665,8 @@ is not @code{nil}, and otherwise to the last modification time of the | |||
| 664 | visited file. | 665 | visited file. |
| 665 | 666 | ||
| 666 | If @var{time} is neither @code{nil} nor zero, it should have the form | 667 | If @var{time} is neither @code{nil} nor zero, it should have the form |
| 667 | @code{(@var{high} . @var{low})} or @code{(@var{high} @var{low})}, in | 668 | @code{(@var{high} @var{low} @var{microsec} @var{picosec})}, |
| 668 | either case containing two integers, each of which holds 16 bits of the | 669 | the format used by @code{current-time} (@pxref{Time of Day}). |
| 669 | time. | ||
| 670 | 670 | ||
| 671 | This function is useful if the buffer was not read from the file | 671 | This function is useful if the buffer was not read from the file |
| 672 | normally, or if the file itself has been changed for some known benign | 672 | normally, or if the file itself has been changed for some known benign |
| @@ -1237,4 +1237,3 @@ This function returns the current gap position in the current buffer. | |||
| 1237 | @defun gap-size | 1237 | @defun gap-size |
| 1238 | This function returns the current gap size of the current buffer. | 1238 | This function returns the current gap size of the current buffer. |
| 1239 | @end defun | 1239 | @end defun |
| 1240 | |||
diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi index 285e6406426..a5710c789e9 100644 --- a/doc/lispref/files.texi +++ b/doc/lispref/files.texi | |||
| @@ -938,7 +938,7 @@ on the 19th, @file{aug-20} was written on the 20th, and the file | |||
| 938 | @end example | 938 | @end example |
| 939 | 939 | ||
| 940 | You can use @code{file-attributes} to get a file's last modification | 940 | You can use @code{file-attributes} to get a file's last modification |
| 941 | time as a list of two numbers. @xref{File Attributes}. | 941 | time as a list of four integers. @xref{File Attributes}. |
| 942 | @end defun | 942 | @end defun |
| 943 | 943 | ||
| 944 | @node Kinds of Files | 944 | @node Kinds of Files |
| @@ -1228,11 +1228,11 @@ so this time will always hold the midnight of the day of last access. | |||
| 1228 | 1228 | ||
| 1229 | @cindex modification time of file | 1229 | @cindex modification time of file |
| 1230 | @item | 1230 | @item |
| 1231 | The time of last modification as a list of two integers (as above). | 1231 | The time of last modification as a list of four integers (as above). |
| 1232 | This is the last time when the file's contents were modified. | 1232 | This is the last time when the file's contents were modified. |
| 1233 | 1233 | ||
| 1234 | @item | 1234 | @item |
| 1235 | The time of last status change as a list of two integers (as above). | 1235 | The time of last status change as a list of four integers (as above). |
| 1236 | This is the time of the last change to the file's access mode bits, | 1236 | This is the time of the last change to the file's access mode bits, |
| 1237 | its owner and group, and other information recorded in the filesystem | 1237 | its owner and group, and other information recorded in the filesystem |
| 1238 | for the file, beyond the file's contents. | 1238 | for the file, beyond the file's contents. |
| @@ -1275,9 +1275,9 @@ For example, here are the file attributes for @file{files.texi}: | |||
| 1275 | @group | 1275 | @group |
| 1276 | (file-attributes "files.texi" 'string) | 1276 | (file-attributes "files.texi" 'string) |
| 1277 | @result{} (nil 1 "lh" "users" | 1277 | @result{} (nil 1 "lh" "users" |
| 1278 | (19145 42977) | 1278 | (20614 64019 50040 152000) |
| 1279 | (19141 59576) | 1279 | (20000 23 0 0) |
| 1280 | (18340 17300) | 1280 | (20614 64555 902289 872000) |
| 1281 | 122295 "-rw-rw-rw-" | 1281 | 122295 "-rw-rw-rw-" |
| 1282 | nil (5888 2 . 43978) | 1282 | nil (5888 2 . 43978) |
| 1283 | (15479 . 46724)) | 1283 | (15479 . 46724)) |
| @@ -1301,14 +1301,14 @@ is owned by the user with name "lh". | |||
| 1301 | @item "users" | 1301 | @item "users" |
| 1302 | is in the group with name "users". | 1302 | is in the group with name "users". |
| 1303 | 1303 | ||
| 1304 | @item (19145 42977) | 1304 | @item (20614 64019 50040 152000) |
| 1305 | was last accessed on Oct 5 2009, at 10:01:37. | 1305 | was last accessed on October 23, 2012, at 20:12:03.050040152 UTC. |
| 1306 | 1306 | ||
| 1307 | @item (19141 59576) | 1307 | @item (20000 23 0 0) |
| 1308 | last had its contents modified on Oct 2 2009, at 13:49:12. | 1308 | was last modified on July 15, 2001, at 08:53:43 UTC. |
| 1309 | 1309 | ||
| 1310 | @item (18340 17300) | 1310 | @item (20614 64555 902289 872000) |
| 1311 | last had its status changed on Feb 2 2008, at 12:19:00. | 1311 | last had its status changed on October 23, 2012, at 20:20:59.902289872 UTC. |
| 1312 | 1312 | ||
| 1313 | @item 122295 | 1313 | @item 122295 |
| 1314 | is 122295 bytes long. (It may not contain 122295 characters, though, | 1314 | is 122295 bytes long. (It may not contain 122295 characters, though, |
diff --git a/doc/lispref/intro.texi b/doc/lispref/intro.texi index e61e13662db..4770701b601 100644 --- a/doc/lispref/intro.texi +++ b/doc/lispref/intro.texi | |||
| @@ -493,13 +493,13 @@ giving a prefix argument makes @var{here} non-@code{nil}. | |||
| 493 | 493 | ||
| 494 | @defvar emacs-build-time | 494 | @defvar emacs-build-time |
| 495 | The value of this variable indicates the time at which Emacs was | 495 | The value of this variable indicates the time at which Emacs was |
| 496 | built. It is a list of three integers, like the value of | 496 | built. It is a list of four integers, like the value of |
| 497 | @code{current-time} (@pxref{Time of Day}). | 497 | @code{current-time} (@pxref{Time of Day}). |
| 498 | 498 | ||
| 499 | @example | 499 | @example |
| 500 | @group | 500 | @group |
| 501 | emacs-build-time | 501 | emacs-build-time |
| 502 | @result{} (18846 52016 156039) | 502 | @result{} (20614 63694 515336 438000) |
| 503 | @end group | 503 | @end group |
| 504 | @end example | 504 | @end example |
| 505 | @end defvar | 505 | @end defvar |
diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi index d3c3c6fd241..6c5f6e85683 100644 --- a/doc/lispref/os.texi +++ b/doc/lispref/os.texi | |||
| @@ -1199,7 +1199,7 @@ Similarly, the fourth list element @var{picosec}, if present, gives | |||
| 1199 | the number of picoseconds from the start of that microsecond to the | 1199 | the number of picoseconds from the start of that microsecond to the |
| 1200 | specified time. | 1200 | specified time. |
| 1201 | 1201 | ||
| 1202 | The return value of @code{current-time} represents time using three | 1202 | The return value of @code{current-time} represents time using four |
| 1203 | integers, as do the timestamps in the return value of | 1203 | integers, as do the timestamps in the return value of |
| 1204 | @code{file-attributes} (@pxref{Definition of | 1204 | @code{file-attributes} (@pxref{Definition of |
| 1205 | file-attributes}). In function arguments, e.g.@: the @var{time-value} | 1205 | file-attributes}). In function arguments, e.g.@: the @var{time-value} |
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index cda4f272ca2..5535fdd77f0 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2012-10-24 Paul Eggert <eggert@penguin.cs.ucla.edu> | ||
| 2 | |||
| 3 | Update manual for new time stamp format (Bug#12706). | ||
| 4 | * emacs-mime.texi (time-date): Update for new format. | ||
| 5 | Also, fix bogus time stamp and modernize a bit. | ||
| 6 | |||
| 1 | 2012-10-23 Glenn Morris <rgm@gnu.org> | 7 | 2012-10-23 Glenn Morris <rgm@gnu.org> |
| 2 | 8 | ||
| 3 | * cl.texi: Include emacsver.texi. Use Emacs version number rather | 9 | * cl.texi: Include emacsver.texi. Use Emacs version number rather |
diff --git a/doc/misc/emacs-mime.texi b/doc/misc/emacs-mime.texi index 896eba2f1bb..e57fcc8adf1 100644 --- a/doc/misc/emacs-mime.texi +++ b/doc/misc/emacs-mime.texi | |||
| @@ -1516,16 +1516,16 @@ Here's a bunch of time/date/second/day examples: | |||
| 1516 | @result{} 905595714.0 | 1516 | @result{} 905595714.0 |
| 1517 | 1517 | ||
| 1518 | (seconds-to-time 905595714.0) | 1518 | (seconds-to-time 905595714.0) |
| 1519 | @result{} (13818 19266 0) | 1519 | @result{} (13818 19266 0 0) |
| 1520 | 1520 | ||
| 1521 | (time-to-days '(13818 19266)) | 1521 | (time-to-days '(13818 19266)) |
| 1522 | @result{} 729644 | 1522 | @result{} 729644 |
| 1523 | 1523 | ||
| 1524 | (days-to-time 729644) | 1524 | (days-to-time 729644) |
| 1525 | @result{} (961933 65536) | 1525 | @result{} (961933 512) |
| 1526 | 1526 | ||
| 1527 | (time-since '(13818 19266)) | 1527 | (time-since '(13818 19266)) |
| 1528 | @result{} (0 430) | 1528 | @result{} (6797 9607 984839 247000) |
| 1529 | 1529 | ||
| 1530 | (time-less-p '(13818 19266) '(13818 19145)) | 1530 | (time-less-p '(13818 19266) '(13818 19145)) |
| 1531 | @result{} nil | 1531 | @result{} nil |
| @@ -1546,7 +1546,7 @@ Here's a bunch of time/date/second/day examples: | |||
| 1546 | (time-to-number-of-days | 1546 | (time-to-number-of-days |
| 1547 | (time-since | 1547 | (time-since |
| 1548 | (date-to-time "Mon, 01 Jan 2001 02:22:26 GMT"))) | 1548 | (date-to-time "Mon, 01 Jan 2001 02:22:26 GMT"))) |
| 1549 | @result{} 4.146122685185185 | 1549 | @result{} 4314.095589286675 |
| 1550 | @end example | 1550 | @end example |
| 1551 | 1551 | ||
| 1552 | And finally, we have @code{safe-date-to-time}, which does the same as | 1552 | And finally, we have @code{safe-date-to-time}, which does the same as |
| @@ -1561,7 +1561,7 @@ An RFC822 (or similar) date string. For instance: @code{"Sat Sep 12 | |||
| 1561 | 12:21:54 1998 +0200"}. | 1561 | 12:21:54 1998 +0200"}. |
| 1562 | 1562 | ||
| 1563 | @item time | 1563 | @item time |
| 1564 | An internal Emacs time. For instance: @code{(13818 26466)}. | 1564 | An internal Emacs time. For instance: @code{(13818 26466 0 0)}. |
| 1565 | 1565 | ||
| 1566 | @item seconds | 1566 | @item seconds |
| 1567 | A floating point representation of the internal Emacs time. For | 1567 | A floating point representation of the internal Emacs time. For |