zsh/rc: fix process run time display with fg

[config/dotfiles.git] / zsh / rc

diff --git a/zsh/rc b/zsh/rc
index 666f40ef3a91569a8aaebd11d61abe35e0e6d231..2d8680eceda8708a2e8f7224734a351ec86313b2 100644 (file)
--- a/zsh/rc
+++ b/zsh/rc
@@ -86,7 +86,7 @@ setopt longlistjobs
 # Use Vi(m) style key bindings.
 bindkey -v
 
-# Use jk to exit insert mode (jj is too slow).
+# Use jk to exit insert mode (jj is too slow to type).
 bindkey 'jk' vi-cmd-mode
 
 # I don't need the arrow keys, I use ^N and ^P for this (see below).
@@ -142,8 +142,8 @@ autoload -Uz zmv
 # HISTORY SETTINGS
 
 # Use history and store it in ~/.zsh/history.
-HISTSIZE=50000
-SAVEHIST=50000
+HISTSIZE=1000000
+SAVEHIST=1000000
 HISTFILE=~/.zsh/history
 # Append to the history file instead of overwriting it and do it immediately
 # when a command is executed.
@@ -184,12 +184,12 @@ bindkey -a '^N' history-beginning-search-forward
 
 # Enable incremental search which is especially useful when the string is an
 # argument and not the command.
-bindkey '^R' history-incremental-search-backward
+bindkey '^R' history-incremental-pattern-search-backward
 # Also enable my usual use of Ctrl-P/Ctrl-N to get the previous/next matching
 # history entry.
 if [[ $ZSH_VERSION == (4.<4->*|<5->*) ]]; then
-    bindkey -M isearch '^P' history-incremental-search-backward
-    bindkey -M isearch '^N' history-incremental-search-forward
+    bindkey -M isearch '^P' history-incremental-pattern-search-backward
+    bindkey -M isearch '^N' history-incremental-pattern-search-forward
 fi
 
 # Automatically push cd-ed directories on the directory stack.
@@ -211,7 +211,8 @@ autoload -Uz colors; colors
 zmodload zsh/datetime
 
 # Some shortcuts for colors. The %{...%} tells zsh that the data in between
-# doesn't need any space, necessary for correct prompt drawing.
+# doesn't need any space, necessary for correct prompt drawing. Use %F{color}
+# in more recent zsh versions (here compatibility is important).
 local red="%{${fg[red]}%}"
 local blue="%{${fg[blue]}%}"
 local green="%{${fg[green]}%}"
@@ -343,6 +344,11 @@ zshrc_longrun_preexec() {
     zshrc_resolve_fg_to_resumed_job_name $program
     program=$REPLY
 
+    # No background process found.
+    if [[ -z $program ]]; then
+        return
+    fi
+
     # Don't track the time for certain (possible) long running processes which
     # need no automatic notification.
     for ignore in elinks man mutt vim; do
@@ -777,7 +783,7 @@ zle -C complete-files complete-word _generic
 zstyle ':completion:complete-files:*' completer _files
 bindkey '^F' complete-files
 
-# Completion for my wrapper scripts
+# Completion for my wrapper scripts.
 compdef slocate=locate
 compdef srsync=rsync
 compdef srsync-incremental=rsync
@@ -865,16 +871,15 @@ fi
     command tig --max-count=200 --branches --remotes --tags "$@"
 }
 
-# Pipe output through less.
-(( $+commands[tree] )) && tree() {
-    command tree -C "$@" | less
-}
-
-# Choose the "best" PDF viewer available: xpdf, then zathura (in the past
-# zathura was preferred, but recent versions are completely broken: still no
-# working search and no page-wise scrolling anymore). Also setup completion
-# for `pdf`.
-if (( $+commands[xpdf] )); then
+# Choose the "best" PDF viewer available. Also setup completion for `pdf`.
+if (( $+commands[katarakt] )); then
+    pdf() {
+        command katarakt "$@" 2>/dev/null &
+        disown %command
+    }
+    # No completion for katarakt yet.
+    compdef pdf=xpdf
+elif (( $+commands[xpdf] )); then
     pdf() {
         command xpdf "$@" 2>/dev/null &
         disown %command
@@ -889,11 +894,6 @@ elif (( $+commands[zathura] )); then
     compdef pdf=xpdf
 fi
 
-# Better viewer for info pages .. just pipe everything into less.
-info() {
-    command info "$@" 2>/dev/null | less
-}
-
 
 # OS SPECIFIC SETTINGS
 
@@ -931,7 +931,8 @@ fi
 # If not already in screen or tmux, reattach to a running session or create a
 # new one. This also starts screen/tmux on a remote server when connecting
 # through ssh.
-if [[ $TERM != dumb && $TERM != linux && -z $STY && -z $TMUX ]]; then
+if [[ $TERM != dumb && $TERM != dialup && $TERM != linux
+        && -z $STY && -z $TMUX ]]; then
     # Get running detached sessions.
     if [[ $zshrc_use_multiplexer = screen ]]; then
         session=$(screen -list | grep 'Detached' | awk '{ print $1; exit }')
@@ -985,7 +986,7 @@ if [[ $LD_PRELOAD != *libcoloredstderr.so* ]]; then
     # process when starting GNU screen/tmux (see above).
     else
         exec 2>>(while read -r -k -u 0 line; do
-            printf '\e[91m%s\e[0m' "$line"
+            printf '\e[91m%s\e[0m' $line
             print -n $'\0'
         done &)
     fi
@@ -1033,7 +1034,7 @@ zshrc_restart_precmd() {
     fi
 
     local startup
-    strftime -s startup '%Y-%m-%d %H:%M:%S' "$zshrc_startup_time"
+    strftime -s startup '%Y-%m-%d %H:%M:%S' $zshrc_startup_time
 
     echo -n "${fg[magenta]}"
     echo -n "~/.zshrc modified since startup ($startup) ... "
@@ -1052,12 +1053,12 @@ zshrc_restart_precmd() {
     fi
 
     # Try to start a new interactive shell. If it fails, something is wrong.
-    # Don't kill our current session by execing it.
+    # Don't kill our current session by execing it, abort instead.
     zsh -i -c 'exit 42'
     if [[ $? -ne 42 ]]; then
-        echo -n "${fg_bold[red]}"
+        echo -n ${fg_bold[red]}
         echo 'failed to start new zsh!'
-        echo -n "${fg_bold[default]}"
+        echo -n ${fg_bold[default]}
         return
     fi