Revert "screenrc: Change hardstatus color when in copy mode."

This reverts commit 4ec19d0e9a84b5155885e47908d7974d191f9492.

I find the visual change to be too distracting.

diff --git a/shell/screenrc.in b/shell/screenrc.in
index a40308357d8428d1d5135e2aa02c93ebf3dd9f48..aef00163d61b9ebafb7c1717d45fe399260a83a6 100644 (file)
--- a/shell/screenrc.in
+++ b/shell/screenrc.in
@@ -1,9 +1,5 @@
 # GNU screen configuration file.
 #
-# Features which are only available in (very) recent screen releases or in
-# current Git are marked with "(GIT)" so they can be removed by the setup
-# script on machines with older versions.
-#
 # (BATTERY) is only used on laptops, (ROOT) only if running as root.
 
 # Copyright (C) 2011-2013  Simon Ruderich
@@ -80,9 +76,6 @@ unsetenv s
 setenv s "$s%{= Bw}" # - white on light blue background, also reset all
                      #   attributes (necessary so everything is displayed
                      #   correctly)
-setenv s "$s%?%P"    # - is copy mode enabled? (GIT)
-setenv s "$s%{= wB}" #   - if so change colors to light blue on white (GIT)
-setenv s "$s%?"      # - end if (GIT)
 setenv s "$s%3n"     # - window number
 setenv s "$s "       # - space
 setenv s "$s%t"      # - window name

diff --git a/shell/setup.sh b/shell/setup.sh
index eec1ded59a0911614c2f0586df54fa3b086c088c..ef74ba130f083bf7343e0d60251074e583280cdd 100755 (executable)
--- a/shell/setup.sh
+++ b/shell/setup.sh
@@ -167,13 +167,6 @@ if test "`id -u`" -ne 0; then
     echo 'screenrc: removing root options'
     grep_i -v '(ROOT)' screenrc
 fi
-# I use some features of GNU screen which are only in Git or very recent GNU
-# screen versions. Drop them on machines which have older versions. They are
-# marked as "(GIT)".
-if test ! -d "$HOME/development/shell/screen"; then
-    echo 'screenrc: removing Git features'
-    grep_i -v '(GIT)' screenrc
-fi
 # Rxvt doesn't need the attrcolor "fix". As I prefer rxvt assume I use it when
 # it's installed.
 if installed rxvt; then