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

diff --git a/etc/grml/screenrc_generic b/etc/grml/screenrc_generic
index 7b55cce..fdbaf37 100644 (file)
--- a/etc/grml/screenrc_generic
+++ b/etc/grml/screenrc_generic
@@ -140,7 +140,7 @@
 # To get screen to add lines to xterm's scrollback buffer, uncomment the
 # following termcapinfo line which tells xterm to use the normal screen buffer
 # (which has scrollback), not the alternate screen buffer.
-  termcapinfo xterm|xterms|xs|rxvt ti@:te@
+  termcapinfo xterm|xterm-256color|xterms|xs|rxvt ti@:te@
 
 # Welcome the user:
   echo "welcome BoFH!"

diff --git a/etc/tmux.conf b/etc/tmux.conf
index f74f7b9..3c36464 100644 (file)
--- a/etc/tmux.conf
+++ b/etc/tmux.conf
@@ -45,8 +45,7 @@ set -g visual-activity on
 set -g mode-keys vi
 
 ### set status line appearance
-set -g status-fg white
-set -g status-bg black
+set -g status-style fg=white,bg=black
 
 set -g status-left-length 28
 ### status-left:  @hostname:sessionname
@@ -61,7 +60,5 @@ set -g status-right '#[fg=yellow]%Y-%m-%d %H:%M'
 #set -g status-right-length 6
 #set -g status-right "#[fg=yellow]%H:%M"
 
-set-window-option -g window-status-fg blue
-set-window-option -g window-status-bg black
-set-window-option -g window-status-current-attr bold
-
+set-window-option -g window-status-style fg=blue,bg=black
+set-window-option -g window-status-current-style bold

diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc
index 0a61570..afb0a56 100644 (file)
--- a/etc/zsh/zshrc
+++ b/etc/zsh/zshrc
@@ -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
 }