aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorPaul Eggert2016-01-12 09:09:27 -0800
committerPaul Eggert2016-01-12 09:09:52 -0800
commitfe6efddcc1f4dd2e18737f98c45ead8bbbc7a969 (patch)
tree33f597b8143afa7ff2c7c1c6f13b78fd9d997f11 /doc
parent58a622d473112f8ff5b4bdb3e49bc6573dfd3404 (diff)
downloademacs-fe6efddcc1f4dd2e18737f98c45ead8bbbc7a969.tar.gz
emacs-fe6efddcc1f4dd2e18737f98c45ead8bbbc7a969.zip
Fix time-stamp-time-zone bugs introduced in July
This fixes a bug introduced when the July changes to format-time-string installed, as the changes were not correctly handled in this module (Bug#22302). Also, document time stamp time zones. * lisp/time-stamp.el (time-stamp-time-zone): Document values better. (time-stamp--format): New private function. (time-stamp-string, time-stamp-string-preprocess) (time-stamp-do-number): Use it. * doc/emacs/files.texi (Time Stamps): Mention time zones. * doc/misc/autotype.texi (Timestamps): Document time-stamp-time-zone.
Diffstat (limited to 'doc')
-rw-r--r--doc/emacs/files.texi7
-rw-r--r--doc/misc/autotype.texi8
2 files changed, 9 insertions, 6 deletions
diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi
index bfa55d38701..3d5562dcc47 100644
--- a/doc/emacs/files.texi
+++ b/doc/emacs/files.texi
@@ -881,9 +881,10 @@ Time-stamp: " "
881@code{before-save-hook} (@pxref{Hooks}). When you save the file, this 881@code{before-save-hook} (@pxref{Hooks}). When you save the file, this
882function then automatically updates the time stamp with the current 882function then automatically updates the time stamp with the current
883date and time. You can also use the command @kbd{M-x time-stamp} to 883date and time. You can also use the command @kbd{M-x time-stamp} to
884update the time stamp manually. For other customizations, see the 884update the time stamp manually. By default the time stamp is
885Custom group @code{time-stamp}. Note that the time stamp is formatted 885formatted according to your locale setting (@pxref{Environment}) and
886according to your locale setting (@pxref{Environment}). 886time zone (@pxref{Time of Day,,, elisp, The Emacs Lisp Reference
887Manual}). For customizations, see the Custom group @code{time-stamp}.
887 888
888@node Reverting 889@node Reverting
889@section Reverting a Buffer 890@section Reverting a Buffer
diff --git a/doc/misc/autotype.texi b/doc/misc/autotype.texi
index 839782a3b51..6bdbd344c7a 100644
--- a/doc/misc/autotype.texi
+++ b/doc/misc/autotype.texi
@@ -531,15 +531,17 @@ then @code{time-stamp} is conveniently listed as an option in the
531customization buffer. 531customization buffer.
532 532
533@vindex time-stamp-active 533@vindex time-stamp-active
534@findex time-stamp-toggle-active
534@vindex time-stamp-format 535@vindex time-stamp-format
535@vindex time-stamp-start 536@vindex time-stamp-time-zone
536The time stamp is updated only if the customizable variable 537The time stamp is updated only if the customizable variable
537@code{time-stamp-active} is on, which it is by default; the command 538@code{time-stamp-active} is on, which it is by default; the command
538@code{time-stamp-toggle-active} can be used to toggle it. The format of 539@code{time-stamp-toggle-active} can be used to toggle it. The format of
539the time stamp is set by the customizable variable 540the time stamp is set by the customizable variables
540@code{time-stamp-format}. 541@code{time-stamp-format} and @code{time-stamp-time-zone}.
541 542
542@vindex time-stamp-line-limit 543@vindex time-stamp-line-limit
544@vindex time-stamp-start
543@vindex time-stamp-end 545@vindex time-stamp-end
544@vindex time-stamp-count 546@vindex time-stamp-count
545@vindex time-stamp-inserts-lines 547@vindex time-stamp-inserts-lines