Merge branch 'master' of git://git.code.sf.net/p/zsh/code

Conflicts:
	ChangeLog

Conflicts:
	ChangeLog

3 files changed, 43 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 31fc78366..e6edaa8c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,17 @@
 	* 36943 (with updated comment): Src/mem.c: restore scan for
 	reclaimable blocks in freeheap() [had been removed by 36834]
 
+2015-10-24  Daniel Shahaf  <d.s@daniel.shahaf.name>
+
+	* unposted: Completion/Unix/Command/_beep: _beep completion:
+	Actually hook it for the 'beep' command.
+
+	* 36913 + 36945: Functions/VCS_Info/VCS_INFO_quilt: vcs_info quilt:
+	Pass patch subject lines to gen-applied-string
+
+	* 36912: Functions/VCS_Info/VCS_INFO_quilt: vcs_info quilt:
+	Tolerate being in child of .pc's parent
+
 2015-10-24  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
 	* unposted: Src/utils.c: small typo.
diff --git a/Completion/Unix/Command/_beep b/Completion/Unix/Command/_beep
index c49c09726..d393bc91e 100644
--- a/Completion/Unix/Command/_beep
+++ b/Completion/Unix/Command/_beep
@@ -1,4 +1,4 @@
-#compdef _beep
+#compdef beep
 
 # beep  [--verbose | --debug] [-e device | --device device] [-f N] [-l N]
 #       [-r N] [-d N] [-D N] [-s] [-c]
diff --git a/Functions/VCS_Info/VCS_INFO_quilt b/Functions/VCS_Info/VCS_INFO_quilt
index bc71cfb7d..c3c3d864d 100644
--- a/Functions/VCS_Info/VCS_INFO_quilt
+++ b/Functions/VCS_Info/VCS_INFO_quilt
@@ -119,6 +119,7 @@ function VCS_INFO_quilt() {
             applied=()
         fi
         patches=$(<$pc/.quilt_patches)
+        patches=`builtin cd -q "${pc:h}" && print -r - ${patches:A}`
     fi
     if zstyle -t "${context}" get-unapplied; then
         # This zstyle call needs to be moved further up if `quilt' needs
@@ -144,6 +145,36 @@ function VCS_INFO_quilt() {
         unapplied=()
     fi
 
+    if [[ -n $patches ]]; then
+      () {
+        local i line
+        for ((i=1; i<=$#applied; i++)); do
+          if [[ -f "$patches/$applied[$i]" ]] &&
+             read -r line < "$patches/$applied[$i]" &&
+             [[ $line != (#b)(---|Index:)* ]] &&
+             true
+            ;
+          then
+            applied[$i]+=" $line"
+          else
+            applied[$i]+=" ?"
+          fi
+        done
+        for ((i=1; i<=$#unapplied; i++)); do
+          if [[ -f "$patches/$unapplied[$i]" ]] &&
+             read -r line < "$patches/$unapplied[$i]" &&
+             [[ $line != (#b)(---|Index:)* ]] &&
+             true
+            ;
+          then
+            unapplied[$i]+=" $line"
+          else
+            unapplied[$i]+=" ?"
+          fi
+        done
+      }
+    fi
+
     all=( ${(Oa)applied} ${unapplied} )
 
     if VCS_INFO_hook 'gen-applied-string' "${applied[@]}"; then