/etc/zsh/zshrc: change logic of $HOSTNAME in preexec()

[grml-etc-core.git] / etc / zsh / zshrc

diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc
index acf9072..7ca68cf 100644 (file)
--- a/etc/zsh/zshrc
+++ b/etc/zsh/zshrc
@@ -3,7 +3,7 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Don Nov 22 11:13:15 CET 2007 [mika]
+# Latest change: Don Dez 06 23:21:21 CET 2007 [mika]
 ################################################################################
 # This file is sourced only for interactive shells. It
 # should contain commands to set up aliases, functions,
@@ -850,9 +850,8 @@ is4 && [[ -z $NOPRECMD ]] && \
 preexec () {
     [[ -n $NOPRECMD ]] && return 0
 # set hostname if not running on host with name 'grml'
-    local HOSTNAME=$(hostname)
-    if [[ "$HOSTNAME" != grml ]] ; then
-        NAME="@$HOSTNAME"
+    if [[ "$HOSTNAME" != $(hostname) ]] ; then
+       NAME="@$HOSTNAME"
     fi
 # get the name of the program currently running and hostname of local machine
 # set screen window title if running in a screen
@@ -1213,6 +1212,7 @@ limit -s
 # called later (via is4 && grmlcomp)
 # notice: use 'zstyle' for getting current settings
 #         press ^Xh (control-x h) for getting tags in context; ^X? (control-x ?) to run complete_debug with trace output
+# TODO: make grmlcomp() readable. :-)
 grmlcomp() {
 ## completion system
 ## no initial indention in grmlcomp(), the lines are long enough already.
@@ -1243,6 +1243,12 @@ zstyle ':completion:*:options'         description 'yes'                   # des
 zstyle ':completion:*:processes'       command 'ps -au$USER'               # on processes completion complete all user processes
 zstyle ':completion:*:*:-subscript-:*' tag-order indexes parameters        # offer indexes before parameters in subscripts
 zstyle ':completion:*'                 verbose true                        # provide verbose completion information
+
+# recent (as of Dec 2007) zsh versions are able to provide descriptions
+# for commands (read: 1st word in the line) that it will list for the user
+# to choose from. The following disables that, because it's not exactly fast.
+zstyle ':completion:*:-command-:*:'    verbose false
+
 zstyle ':completion:*:warnings'        format $'%{\e[0;31m%}No matches for:%{\e[0m%} %d' # set format for warnings
 zstyle ':completion:*:*:zcompile:*'    ignored-patterns '(*~|*.zwc)'       # define files to ignore for zcompile
 zstyle ':completion:correct:'          prompt 'correct to: %e'             #
@@ -1748,4 +1754,4 @@ ZSHRC_GLOBAL_HAS_BEEN_READ=1
 # }}}
 
 ## END OF FILE #################################################################
-# vim:foldmethod=marker expandtab
+# vim:filetype=zsh foldmethod=marker autoindent expandtab shiftwidth=4