aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2006-08-12 12:55:07 +0000
committerEli Zaretskii2006-08-12 12:55:07 +0000
commit78e5d54902a455900943b3cb9327104cfd8f7cb4 (patch)
treef8c6ddf97465ba82774c0a2c8bb5f0983b0fe893
parent2d33a4790ac8139f865fa16577135c45a1420fab (diff)
downloademacs-78e5d54902a455900943b3cb9327104cfd8f7cb4.tar.gz
emacs-78e5d54902a455900943b3cb9327104cfd8f7cb4.zip
(Time Parsing): Add %z to format-time-string, per docstring.
Add cross reference to glibc manual for strftime.
-rw-r--r--lispref/os.texi18
1 files changed, 11 insertions, 7 deletions
diff --git a/lispref/os.texi b/lispref/os.texi
index 30f66889387..ab277afdce6 100644
--- a/lispref/os.texi
+++ b/lispref/os.texi
@@ -1256,7 +1256,9 @@ This stands for the year without century (00-99).
1256@item %Y 1256@item %Y
1257This stands for the year with century. 1257This stands for the year with century.
1258@item %Z 1258@item %Z
1259This stands for the time zone abbreviation. 1259This stands for the time zone abbreviation (e.g., @samp{EST}).
1260@item %z
1261This stands for the time zone numerical offset (e.g., @samp{-0500}).
1260@end table 1262@end table
1261 1263
1262You can also specify the field width and type of padding for any of 1264You can also specify the field width and type of padding for any of
@@ -1286,12 +1288,14 @@ If @var{universal} is non-@code{nil}, that means to describe the time as
1286Universal Time; @code{nil} means describe it using what Emacs believes 1288Universal Time; @code{nil} means describe it using what Emacs believes
1287is the local time zone (see @code{current-time-zone}). 1289is the local time zone (see @code{current-time-zone}).
1288 1290
1289This function uses the C library function @code{strftime} to do most of 1291This function uses the C library function @code{strftime}
1290the work. In order to communicate with that function, it first encodes 1292(@pxref{Formatting Calendar Time,,, libc, The GNU C Library Reference
1291its argument using the coding system specified by 1293Manual}) to do most of the work. In order to communicate with that
1292@code{locale-coding-system} (@pxref{Locales}); after @code{strftime} 1294function, it first encodes its argument using the coding system
1293returns the resulting string, @code{format-time-string} decodes the 1295specified by @code{locale-coding-system} (@pxref{Locales}); after
1294string using that same coding system. 1296@code{strftime} returns the resulting string,
1297@code{format-time-string} decodes the string using that same coding
1298system.
1295@end defun 1299@end defun
1296 1300
1297@defun seconds-to-time seconds 1301@defun seconds-to-time seconds