From e7ba68511a4baf343c7f711a5b31ee42b7e47bb1 Mon Sep 17 00:00:00 2001
From: Eric Nielsen <eric@amalgamar.com.br>
Date: Thu, 1 Aug 2019 18:19:39 -0500
Subject: [PATCH] Fix git log in zimfw update not showing backtick

because it was being processed as the beginning of a escape sequence.
Using `print -R` fixes that. Probably a good idea to use it when
printing other messages that contain externally-generated output.
---
 src/tools/update.zsh.erb | 5 +++--
 zimfw.zsh                | 7 ++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/tools/update.zsh.erb b/src/tools/update.zsh.erb
index eec93d2..1140a64 100644
--- a/src/tools/update.zsh.erb
+++ b/src/tools/update.zsh.erb
@@ -49,10 +49,11 @@ if [[ ${TYPE} == branch ]]; then
 else
   OUT="Updating to ${TYPE} ${REV}"
 fi
-[[ -n ${LOG} ]] && OUT="${OUT}\n${LOG}"
+[[ -n ${LOG} ]] && OUT="${OUT}
+${LOG}"
 if ERR=$(command git submodule update --init --recursive -q 2>&1); then
   if [[ ${OPT} != -q ]]; then
-    print -P "${CLEAR_LINE}%F{green}✓%f ${MODULE}: ${OUT}"
+    print -R "$(print -P "${CLEAR_LINE}%F{green}✓%f") ${MODULE}: ${OUT}"
   fi
 else
   print -P "${CLEAR_LINE}%F{red}✗ ${MODULE}: Error (4)%f\n${ERR}"
diff --git a/zimfw.zsh b/zimfw.zsh
index 571f61e..27595a1 100644
--- a/zimfw.zsh
+++ b/zimfw.zsh
@@ -182,7 +182,7 @@ _zimfw_clean_dumpfile() {
 }
 
 _zimfw_info() {
-  print 'Zim version:  1.0.0-SNAPSHOT (previous commit is a1291c5)'
+  print 'Zim version:  1.0.0-SNAPSHOT (previous commit is 3af566d)'
   print "Zsh version:  ${ZSH_VERSION}"
   print "System info:  $(command uname -a)"
 }
@@ -306,10 +306,11 @@ if [[ \${TYPE} == branch ]]; then
 else
   OUT=\"Updating to \${TYPE} \${REV}\"
 fi
-[[ -n \${LOG} ]] && OUT=\"\${OUT}\n\${LOG}\"
+[[ -n \${LOG} ]] && OUT=\"\${OUT}
+\${LOG}\"
 if ERR=\$(command git submodule update --init --recursive -q 2>&1); then
   if [[ \${OPT} != -q ]]; then
-    print -P \"\${CLEAR_LINE}%F{green}✓%f \${MODULE}: \${OUT}\"
+    print -R \"\$(print -P \"\${CLEAR_LINE}%F{green}✓%f\") \${MODULE}: \${OUT}\"
   fi
 else
   print -P \"\${CLEAR_LINE}%F{red}✗ \${MODULE}: Error (4)%f\n\${ERR}\"