From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 20 Nov 2016 00:15:29 +0000 (-0800)
Subject: Document format-time-string %q
X-Git-Tag: emacs-26.0.90~1296
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b81bb485eaaa42f93f36988b8b17576f489b988d;p=emacs.git

Document format-time-string %q

* doc/lispref/os.texi (Time Parsing):
* etc/NEWS: Document new %q functionality taken from gnulib.
---

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
 microseconds, etc.  Any excess digits are discarded, without rounding.
 @item %p
 This stands for @samp{AM} or @samp{PM}, as appropriate.
+@item %q
+This stands for the calendar quarter (1--4).
 @item %r
 This is a synonym for @samp{%I:%M:%S %p}.
 @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
 'current-time-string', 'current-time-zone', 'decode-time',
 'format-time-string', and 'set-time-zone-rule'.
 
++++
+** 'format-time-string' now formats "%q" to the calendar quarter.
+
 ** New built-in function 'mapcan' which avoids unnecessary consing (and garbage
 collection).