# HG changeset patch
# User Mikael Berthe <mikael@lilotux.net>
# Date 1556398386 -7200
# Node ID be88f546392c49919b9732cff5d5fbaa2c3ca826
# Parent  6eeab84c3f15b25ded145926e9def487159fd06d# Parent  fc97d6cf8de48f4692039024811a7f5bb593baba
Merge branches

diff -r fc97d6cf8de4 -r be88f546392c zshrc
--- a/zshrc	Wed Feb 20 08:59:50 2019 +0100
+++ b/zshrc	Sat Apr 27 22:53:06 2019 +0200
@@ -14,7 +14,7 @@
 # zsh_local directory.
 
 
-fpath=($ZDOTDIR/functions $fpath)
+fpath=($ZDOTDIR/functions $ZDOTDIR/zsh_local/functions $fpath)
 
 
 ####################
diff -r fc97d6cf8de4 -r be88f546392c zshrc.d/20-prompt.zrc
--- a/zshrc.d/20-prompt.zrc	Wed Feb 20 08:59:50 2019 +0100
+++ b/zshrc.d/20-prompt.zrc	Sat Apr 27 22:53:06 2019 +0200
@@ -5,7 +5,8 @@
 if [[ "$TERM" == "rxvt" ||
       "$TERM" == "rxvt-256color" ||
       "$TERM" == "rxvt-unicode" ||
-      "$TERM" == "rxvt-unicode-256color" ]]
+      "$TERM" == "rxvt-unicode-256color" ||
+      "$TERM" == "xterm-256color" ]]
 then
     export SHOWMODE="on"
 fi