mutt/display: Don't display the sidebar if this mutt patch is used.

diff --git a/.gitignore b/.gitignore
index 26354b78e80ec92f9c528c9daeda0a7298810219..9ec34031f8614376ffdb8e39984fc7f7c2cd960c 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,9 @@
 /gnupg/secring.gpg
 /gnupg/trustdb.gpg
 
+# Ignore files generated by setup.sh.
+/mutt/display
+
 # Ignore local files.
 /mutt/adfooters/
 /mutt/mlfooters/

diff --git a/mutt/display b/mutt/display.in
similarity index 97%
rename from mutt/display
rename to mutt/display.in
index 0b1dd388d7eee0d3dcfbcdcb91cfc22b4fceab87..22688b719d072a91558c9d820fc961157b4375e9 100644 (file)
--- a/mutt/display
+++ b/mutt/display.in
@@ -1,6 +1,6 @@
 # muttrc file for the mail display
 
-# Copyright (C) 2007-2012  Simon Ruderich
+# Copyright (C) 2007-2013  Simon Ruderich
 #
 # This file is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,6 +19,9 @@
 # Don't display help bar at the top of the screen.
 set help=no
 
+# don't display sidebar, enabled by setup.sh if the sidebar patch is used:
+#set sidebar_visible=no
+
 # automatically display html mails as plain text:
 auto_view text/html
 # but ensure plain mail is used if it exists:

diff --git a/setup.sh b/setup.sh
index 84a3020360929276950550538815f35be3ef8ea0..3df20f496c9d7ff2f61daac7c2cbc71314f94d27 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -2,7 +2,7 @@
 
 # Setup script for mail configuration files.
 
-# Copyright (C) 2009-2012  Simon Ruderich
+# Copyright (C) 2009-2013  Simon Ruderich
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,6 +20,14 @@
 
 . ../lib.sh
 
+
+generate cat mutt/display .in
+if mutt -v | grep sidebar >/dev/null 2>&1; then
+    echo 'mutt/display: enabling mutt sidebar settings'
+    sed 's/^#set sidebar_/set sidebar_/' mutt/display > mutt/display.tmp
+    mv mutt/display.tmp mutt/display
+fi
+
 # Link setup.
 link abook ~/.abook
 link gnupg ~/.gnupg