Merge remote-tracking branch 'origin/github/pr/82'

diff --combined etc/zsh/zshrc
index 54e0649,0a61570..afb0a56
--- 1/etc/zsh/zshrc
--- 2/etc/zsh/zshrc
+++ b/etc/zsh/zshrc
@@@ -2269,6 -2269,7 +2269,7 @@@ grml_theme_add_token: Token `%s'\'' exi
          return 2
      fi
      if (( init )); then
+         REPLY=''
          $token $name
          token=$REPLY
      fi
@@@ -2314,6 -2315,7 +2315,7 @@@ function grml_prompt_addto () 
          zstyle -s ":prompt:${grmltheme}:${lr}:items:$it" token new \
              || new=${grml_prompt_token_default[$it]}
          if (( ${+grml_prompt_token_function[$it]} )); then
+             REPLY=''
              ${grml_prompt_token_function[$it]} $it
          else
              case $it in
@@@ -2525,7 -2527,7 +2527,7 @@@ function grml_cmd_to_screen_title () 
  function grml_control_xterm_title () {
      case $TERM in
          (xterm*|rxvt*)
 -            set_title "${(%):-"%n@%m:"}" "$1"
 +            set_title "${(%):-"%n@%m:"}" "$2"
              ;;
      esac
  }