summary refs log tree commit diff
diff options
context:
space:
mode:
authorDaniel Shahaf <d.s@daniel.shahaf.name>2017-01-23 03:33:38 +0000
committerDaniel Shahaf <d.s@daniel.shahaf.name>2017-01-25 04:22:29 +0000
commitb0784025b18a95515c1905be6f7190f4951100e5 (patch)
tree76150a59840e75dac3bab096fc3871dd2edb26d2
parent699a38e698d544683b6cf24843e95d25aeedebbd (diff)
downloadzsh-b0784025b18a95515c1905be6f7190f4951100e5.tar.gz
zsh-b0784025b18a95515c1905be6f7190f4951100e5.tar.xz
zsh-b0784025b18a95515c1905be6f7190f4951100e5.zip
40396: vcs_info quilt: More documentation of '%Q' and 'use-quilt'.
-rw-r--r--ChangeLog3
-rw-r--r--Doc/Zsh/contrib.yo15
2 files changed, 18 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index c895d40d9..7d8d19eae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2017-01-25  Daniel Shahaf  <d.s@daniel.shahaf.name>
 
+	* 40396: Doc/Zsh/contrib.yo: vcs_info quilt: More documentation
+	of '%Q' and 'use-quilt'.
+
 	* 40392: Functions/VCS_Info/VCS_INFO_patch2subject: vcs_info
 	patch2subject: Support `git show` output.
 
diff --git a/Doc/Zsh/contrib.yo b/Doc/Zsh/contrib.yo
index f764eb7c6..8f79694e0 100644
--- a/Doc/Zsh/contrib.yo
+++ b/Doc/Zsh/contrib.yo
@@ -1288,6 +1288,17 @@ to tt(mq) information).  See the tt(get-mq) and tt(get-bookmarks) styles.  Both
 of these styles may be enabled at the same time.  If both are enabled, both
 resulting strings will be shown separated by a semicolon (that cannot currently
 be customized).
+
+The tt(quilt) `standalone' backend sets this expando to the same value as the
+tt(%Q) expando.
+)
+item(tt(%Q))(
+Quilt series information.
+When quilt is used (either in `addon' mode or as a `standalone' backend),
+this expando is set to quilt series' tt(patch-format) string.
+The tt(set-patch-format) hook and tt(nopatch-format) style are honoured.
+
+See tt(Quilt Support) below for details.
 )
 enditem()
 
@@ -1346,6 +1357,10 @@ The tt(vcs_info) integration tries to support both ways of using quilt by
 having two slightly different modes of operation: `addon' mode and
 `standalone' mode).
 
+Quilt integration is off by default; to enable it, set the tt(use-quilt) style,
+and add tt(%Q) to your tt(formats) or tt(actionformats) style:
+example(zstyle ':vcs_info:*' use-quilt true)
+
 For `addon' mode to become active tt(vcs_info) must have already detected a
 real version control system controlling the directory. If that is the case,
 a directory that holds quilt's patches needs to be found. That directory is