From cb4f982aba9993a99b791b3f8d97c57af3c721b3 Mon Sep 17 00:00:00 2001
From: Michael Prokop <mika@grml.org>
Date: Thu, 22 Nov 2007 11:16:43 +0100
Subject: [PATCH] zshrc: add (deactivated) MANWIDTH=80; fix colorschema in
 screenrc

---
 debian/changelog  |  9 +++++++++
 etc/grml/screenrc |  6 +++---
 etc/zsh/zshrc     | 21 ++++++++++++++-------
 3 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a374e10..067849c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+grml-etc-core (0.3.40) unstable; urgency=low
+
+  * /etc/zsh/zshrc: add MANWIDTH, deactivated by default though;
+    thanks Alexander Steinböck! [Closes: issue343]
+  * /etc/grml/screenrc: fix colorschema of 'switch order of caption and
+    hardstatus'
+
+ -- Michael Prokop <mika@grml.org>  Thu, 22 Nov 2007 11:13:45 +0100
+
 grml-etc-core (0.3.39) unstable; urgency=low
 
   * Move vim vs. vi from /etc/skel/.zshrc.grmlsmall to /etc/zsh/zshrc
diff --git a/etc/grml/screenrc b/etc/grml/screenrc
index f9dbd0f..48f94d6 100644
--- a/etc/grml/screenrc
+++ b/etc/grml/screenrc
@@ -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: Sam Sep 29 00:11:22 CEST 2007 [mika]
+# Latest change: YDATE [mika]
 ################################################################################
 
   backtick 1 0 60   /usr/bin/cpu-screen
@@ -12,8 +12,8 @@
   hardstatus alwayslastline "%{wr}%n%f %t %{kw} | %?%-Lw%?%{wb}%n*%f %t%?(%u)%?%{kw}%?%+Lw%? %{wk}"
 
 # switch order of caption and hardstatus:
-#  hardstatus alwayslastline "%{+b rk}$USER@%{wk}%H | %{yk}(load: %l |%{rk} cpu: %1` | %{Gk}net: %2`)  %-21=%{wk}%D %d.%m.%Y %0c"
-#  caption always "%{wr}%n%f %t %{kw} | %?%-Lw%?%{wb}%n*%f %t%?(%u)%?%{kw}%?%+Lw%? %{wk}"
+#  hardstatus alwayslastline "%{+b kr}$USER@%{kw}%H | %{ky}(load: %l |%{kr} cpu: %1` | %{kG}net: %2`)  %-21=%{kw}%D %d.%m.%Y %0c"
+#  caption always "%{rw}%n%f %t %{wk} | %?%-Lw%?%{bw}%n*%f %t%?(%u)%?%{wk}%?%+Lw%? %{wk}"
 
 # detach on hangup
   autodetach            on              # default: on
diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc
index f87f59a..820b064 100644
--- 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: Mon Nov 05 12:20:29 CET 2007 [mika]
+# Latest change: Don Nov 22 11:13:15 CET 2007 [mika]
 ################################################################################
 # This file is sourced only for interactive shells. It
 # should contain commands to set up aliases, functions,
@@ -237,17 +237,24 @@
      export EDITOR=${EDITOR:-vi}
   fi
   #v#
+
   export MAIL=${MAIL:-/var/mail/$USER}
+
   # if we don't set $SHELL then aterm, rxvt,.. will use /bin/sh or /bin/bash :-/
   export SHELL='/bin/zsh'
+
+  # color setup for ls:
   [ -x $(which dircolors) ] && eval `dircolors -b`
 
-# Search path for the cd command
-#  cdpath=(.. ~)
+  # set width of man pages to 80 for more convenient reading
+  # (( ${+MANWIDTH} )) || export MANWIDTH=80
+
+  # Search path for the cd command
+  #  cdpath=(.. ~)
 
-# completion functions go to /etc/zsh/completion.d
-# function files may be put into /etc/zsh/functions.d, from where they
-# will be automatically autoloaded.
+  # completion functions go to /etc/zsh/completion.d
+  # function files may be put into /etc/zsh/functions.d, from where they
+  # will be automatically autoloaded.
   if [ -n "$BROKEN_COMPLETION_DIR" ] ; then
      print 'Warning: not setting completion directories because broken files have been found.'>&2
   else
@@ -260,7 +267,7 @@
      fi
   fi
 
-# automatically remove duplicates from these arrays
+  # automatically remove duplicates from these arrays
   typeset -U path cdpath fpath manpath
 # }}}
 
-- 
2.1.4