From 72ec96fb41e2e53ac5fda7532b0d3753e5ff971e Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 24 Oct 2012 05:12:23 +0000 Subject: [PATCH] Update manual for new time stamp format. These instances were missed the first time around. Problem reported by Glenn Morris in . * 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. --- doc/lispintro/ChangeLog | 5 +++++ doc/lispintro/emacs-lisp-intro.texi | 14 +++++++------- doc/lispref/ChangeLog | 11 +++++++++++ doc/lispref/buffers.texi | 9 ++++----- doc/lispref/files.texi | 24 ++++++++++++------------ doc/lispref/intro.texi | 4 ++-- doc/lispref/os.texi | 2 +- doc/misc/ChangeLog | 6 ++++++ doc/misc/emacs-mime.texi | 10 +++++----- 9 files changed, 53 insertions(+), 32 deletions(-) diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog index 6c524f5a0a..396e3857c5 100644 --- a/doc/lispintro/ChangeLog +++ b/doc/lispintro/ChangeLog @@ -1,3 +1,8 @@ +2012-10-24 Paul Eggert + + * emacs-lisp-intro.texi (Files List): + Update manual for new time stamp format (Bug#12706). + 2012-10-17 Gregor Zattler (tiny change) * emacs-lisp-intro.texi (Narrowing advantages): diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi index 70ddb81c77..f885d6c15e 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/}@* a division of the @hfill email: @email{sales@@fsf.org}@* Free Software Foundation, Inc. @hfill Tel: +1 (617) 542-5942@* 51 Franklin Street, Fifth Floor @hfill Fax: +1 (617) 542-2652@* -Boston, MA 02110-1301 USA +Boston, MA 02110-1301 USA @end iftex @ifnottex @@ -249,7 +249,7 @@ GNU Press, http://www.fsf.org/campaigns/gnu-press/ a division of the email: sales@@fsf.org Free Software Foundation, Inc. Tel: +1 (617) 542-5942 51 Franklin Street, Fifth Floor Fax: +1 (617) 542-2652 -Boston, MA 02110-1301 USA +Boston, MA 02110-1301 USA @end example @end ifnottex @@ -15680,11 +15680,11 @@ nil 100 @end group @group -(17733 259) -(17491 28834) -(17596 62124) -13157 -"-rw-rw-r--" +(20615 27034 579989 697000) +(17905 55681 0 0) +(20615 26327 734791 805000) +13188 +"-rw-r--r--" @end group @group nil diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 9142ef49b1..bed74bb688 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,14 @@ +2012-10-24 Paul Eggert + + Update manual for new time stamp format (Bug#12706). + * buffers.texi (Modification Time): + * files.texi (Testing Accessibility, File Attributes): + * intro.texi (Version Info): + * os.texi (Time of Day): + Update for new time stamp format (HIGH LOW MICROSEC PICOSEC). + These instances were missed the first time around. + Problem reported by Glenn Morris in . + 2012-10-24 Chong Yidong * keymaps.texi (Toolkit Differences): Node deleted. diff --git a/doc/lispref/buffers.texi b/doc/lispref/buffers.texi index b9666a79f5..4a556895de 100644 --- a/doc/lispref/buffers.texi +++ b/doc/lispref/buffers.texi @@ -634,7 +634,8 @@ file should not be done. @c Emacs 19 feature @defun visited-file-modtime This function returns the current buffer's recorded last file -modification time, as a list of the form @code{(@var{high} @var{low})}. +modification time, as a list of the form @code{(@var{high} @var{low} +@var{microsec} @var{picosec})}. (This is the same format that @code{file-attributes} uses to return time values; see @ref{File Attributes}.) @@ -664,9 +665,8 @@ is not @code{nil}, and otherwise to the last modification time of the visited file. If @var{time} is neither @code{nil} nor zero, it should have the form -@code{(@var{high} . @var{low})} or @code{(@var{high} @var{low})}, in -either case containing two integers, each of which holds 16 bits of the -time. +@code{(@var{high} @var{low} @var{microsec} @var{picosec})}, +the format used by @code{current-time} (@pxref{Time of Day}). This function is useful if the buffer was not read from the file 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. @defun gap-size This function returns the current gap size of the current buffer. @end defun - diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi index 285e640642..a5710c789e 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 @end example You can use @code{file-attributes} to get a file's last modification -time as a list of two numbers. @xref{File Attributes}. +time as a list of four integers. @xref{File Attributes}. @end defun @node Kinds of Files @@ -1228,11 +1228,11 @@ so this time will always hold the midnight of the day of last access. @cindex modification time of file @item -The time of last modification as a list of two integers (as above). +The time of last modification as a list of four integers (as above). This is the last time when the file's contents were modified. @item -The time of last status change as a list of two integers (as above). +The time of last status change as a list of four integers (as above). This is the time of the last change to the file's access mode bits, its owner and group, and other information recorded in the filesystem for the file, beyond the file's contents. @@ -1275,9 +1275,9 @@ For example, here are the file attributes for @file{files.texi}: @group (file-attributes "files.texi" 'string) @result{} (nil 1 "lh" "users" - (19145 42977) - (19141 59576) - (18340 17300) + (20614 64019 50040 152000) + (20000 23 0 0) + (20614 64555 902289 872000) 122295 "-rw-rw-rw-" nil (5888 2 . 43978) (15479 . 46724)) @@ -1301,14 +1301,14 @@ is owned by the user with name "lh". @item "users" is in the group with name "users". -@item (19145 42977) -was last accessed on Oct 5 2009, at 10:01:37. +@item (20614 64019 50040 152000) +was last accessed on October 23, 2012, at 20:12:03.050040152 UTC. -@item (19141 59576) -last had its contents modified on Oct 2 2009, at 13:49:12. +@item (20000 23 0 0) +was last modified on July 15, 2001, at 08:53:43 UTC. -@item (18340 17300) -last had its status changed on Feb 2 2008, at 12:19:00. +@item (20614 64555 902289 872000) +last had its status changed on October 23, 2012, at 20:20:59.902289872 UTC. @item 122295 is 122295 bytes long. (It may not contain 122295 characters, though, diff --git a/doc/lispref/intro.texi b/doc/lispref/intro.texi index e61e13662d..4770701b60 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}. @defvar emacs-build-time The value of this variable indicates the time at which Emacs was -built. It is a list of three integers, like the value of +built. It is a list of four integers, like the value of @code{current-time} (@pxref{Time of Day}). @example @group emacs-build-time - @result{} (18846 52016 156039) + @result{} (20614 63694 515336 438000) @end group @end example @end defvar diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi index d3c3c6fd24..6c5f6e8568 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 the number of picoseconds from the start of that microsecond to the specified time. - The return value of @code{current-time} represents time using three + The return value of @code{current-time} represents time using four integers, as do the timestamps in the return value of @code{file-attributes} (@pxref{Definition of file-attributes}). In function arguments, e.g.@: the @var{time-value} diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index cda4f272ca..5535fdd77f 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,9 @@ +2012-10-24 Paul Eggert + + Update manual for new time stamp format (Bug#12706). + * emacs-mime.texi (time-date): Update for new format. + Also, fix bogus time stamp and modernize a bit. + 2012-10-23 Glenn Morris * 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 896eba2f1b..e57fcc8adf 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: @result{} 905595714.0 (seconds-to-time 905595714.0) -@result{} (13818 19266 0) +@result{} (13818 19266 0 0) (time-to-days '(13818 19266)) @result{} 729644 (days-to-time 729644) -@result{} (961933 65536) +@result{} (961933 512) (time-since '(13818 19266)) -@result{} (0 430) +@result{} (6797 9607 984839 247000) (time-less-p '(13818 19266) '(13818 19145)) @result{} nil @@ -1546,7 +1546,7 @@ Here's a bunch of time/date/second/day examples: (time-to-number-of-days (time-since (date-to-time "Mon, 01 Jan 2001 02:22:26 GMT"))) -@result{} 4.146122685185185 +@result{} 4314.095589286675 @end example 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 12:21:54 1998 +0200"}. @item time -An internal Emacs time. For instance: @code{(13818 26466)}. +An internal Emacs time. For instance: @code{(13818 26466 0 0)}. @item seconds A floating point representation of the internal Emacs time. For -- 2.20.1