From 86917d409b2166b7ff4df45ca5a75c0bf5e420f4 Mon Sep 17 00:00:00 2001
From: Simon Ruderich <simon@ruderich.org>
Date: Sun, 20 Jan 2013 18:15:01 +0100
Subject: [PATCH] mutt/display: Don't display the sidebar if this mutt patch is
 used.

---
 .gitignore                   |  3 +++
 mutt/{display => display.in} |  5 ++++-
 setup.sh                     | 10 +++++++++-
 3 files changed, 16 insertions(+), 2 deletions(-)
 rename mutt/{display => display.in} (97%)

diff --git a/.gitignore b/.gitignore
index 26354b7..9ec3403 100644
--- 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 0b1dd38..22688b7 100644
--- 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 84a3020..3df20f4 100755
--- 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
-- 
2.44.1