aboutsummaryrefslogtreecommitdiffstats
path: root/src/editfns.c
diff options
context:
space:
mode:
authorJoakim Verona2011-08-08 17:08:48 +0200
committerJoakim Verona2011-08-08 17:08:48 +0200
commit1e3f7bd2cdb85abfbf572cc1a13e615e5c4299de (patch)
treecf8b108fccada9dca76dc616e5333739d8825728 /src/editfns.c
parent23e9910c1fc51657f08b4ab125c0c44e5860d942 (diff)
parentd56176114c8c9226a43db4bf68df562486e454ed (diff)
downloademacs-1e3f7bd2cdb85abfbf572cc1a13e615e5c4299de.tar.gz
emacs-1e3f7bd2cdb85abfbf572cc1a13e615e5c4299de.zip
merge upstream
Diffstat (limited to 'src/editfns.c')
-rw-r--r--src/editfns.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/editfns.c b/src/editfns.c
index 577263c5aea..5eed386afb7 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -1695,7 +1695,9 @@ The modifiers are `E' and `O'. For certain characters X,
1695%EX is a locale's alternative version of %X; 1695%EX is a locale's alternative version of %X;
1696%OX is like %X, but uses the locale's number symbols. 1696%OX is like %X, but uses the locale's number symbols.
1697 1697
1698For example, to produce full ISO 8601 format, use "%Y-%m-%dT%T%z". */) 1698For example, to produce full ISO 8601 format, use "%Y-%m-%dT%T%z".
1699
1700usage: (format-time-string FORMAT-STRING &optional TIME UNIVERSAL) */)
1699 (Lisp_Object format_string, Lisp_Object timeval, Lisp_Object universal) 1701 (Lisp_Object format_string, Lisp_Object timeval, Lisp_Object universal)
1700{ 1702{
1701 time_t value; 1703 time_t value;