aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2016-11-19 16:15:29 -0800
committerPaul Eggert2016-11-19 16:16:42 -0800
commitb81bb485eaaa42f93f36988b8b17576f489b988d (patch)
treefc6e2e72c7c72005bb66265f0894fc7f46151629
parentbbd84f86bce9c04ae08d9bccbad19c48e74f3f8b (diff)
downloademacs-b81bb485eaaa42f93f36988b8b17576f489b988d.tar.gz
emacs-b81bb485eaaa42f93f36988b8b17576f489b988d.zip
Document format-time-string %q
* doc/lispref/os.texi (Time Parsing): * etc/NEWS: Document new %q functionality taken from gnulib.
-rw-r--r--doc/lispref/os.texi2
-rw-r--r--etc/NEWS3
2 files changed, 5 insertions, 0 deletions
diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi
index 616d1e7ab3a..3b649d20cd4 100644
--- a/doc/lispref/os.texi
+++ b/doc/lispref/os.texi
@@ -1525,6 +1525,8 @@ fewer digits, use @samp{%3N} for milliseconds, @samp{%6N} for
1525microseconds, etc. Any excess digits are discarded, without rounding. 1525microseconds, etc. Any excess digits are discarded, without rounding.
1526@item %p 1526@item %p
1527This stands for @samp{AM} or @samp{PM}, as appropriate. 1527This stands for @samp{AM} or @samp{PM}, as appropriate.
1528@item %q
1529This stands for the calendar quarter (1--4).
1528@item %r 1530@item %r
1529This is a synonym for @samp{%I:%M:%S %p}. 1531This is a synonym for @samp{%I:%M:%S %p}.
1530@item %R 1532@item %R
diff --git a/etc/NEWS b/etc/NEWS
index bd83c6028c0..21cda7c6b0a 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -689,6 +689,9 @@ ABBR is a time zone abbreviation. The affected functions are
689'current-time-string', 'current-time-zone', 'decode-time', 689'current-time-string', 'current-time-zone', 'decode-time',
690'format-time-string', and 'set-time-zone-rule'. 690'format-time-string', and 'set-time-zone-rule'.
691 691
692+++
693** 'format-time-string' now formats "%q" to the calendar quarter.
694
692** New built-in function 'mapcan' which avoids unnecessary consing (and garbage 695** New built-in function 'mapcan' which avoids unnecessary consing (and garbage
693collection). 696collection).
694 697