a better way of closing 603186 (sidebar-{sorted,dotted} documentation)

diff --git a/debian/changelog b/debian/changelog
index 5c50b7e1744962faf350cf4763b210f6e9b22027..c24d2e2139430ba90ef0b19592926d7e00257207 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,12 +5,13 @@ mutt (1.5.21-5) unstable; urgency=low
       (Closes: 619822)
     + sidebar: don't overwrite the status if status_on_top is enabled 
       (Closes: 494735)
-    + sidebar-{dotted,sorted}: documented the options that those two patches are
-      introducing; documentation submitted by Julien Valroff (Closes: 603186)
     + sidebar-sorted: use strcoll() to sort the sidebar using the locale
       settings of the system, patch by Arnaud Riess (Closes: 589240)
     + multiple-fccs: added a patch that allows multiple FCC separated by commas,
       written by Omen Wild (Closes: 586454)
+  * debian/extra/samples/sidebar.muttrc: documented the options that
+    the sidebar-{sorted,dotted} patches are introducing; documentation 
+    submitted by Julien Valroff (Closes: 603186)
 
  -- Antonio Radici <antonio@dyne.org>  Fri, 29 Apr 2011 17:24:49 +0100
 

diff --git a/debian/extra/samples/sidebar.muttrc b/debian/extra/samples/sidebar.muttrc
index 8bb15744d00824dfb01c82ac7b4e38ee212c0850..3a9e3bb076cf99ef7f8a87e210eccd138683f055 100644 (file)
--- a/debian/extra/samples/sidebar.muttrc
+++ b/debian/extra/samples/sidebar.muttrc
@@ -50,7 +50,14 @@ bind index B bounce-message
 # 
 # sidebar_delim (string)
 # Specifies the delimiter between the sidebar and other screens
+#
+# sidebar_shortpath (boolean)
+# When using IMAP, a '.' is often used as a separator. This option
+# allows to shorten the folder name to the part after the last dot.
 # 
+# sidebar_sort (boolean)
+# Sorts the folders in the sidebar alphabetically.
+#
 # color sidebar_new [fg] [bg]
 # The foreground (fg) and background (bg) color of folders that contain new
 # mail.

diff --git a/debian/patches/mutt-patched/sidebar-dotted b/debian/patches/mutt-patched/sidebar-dotted
index 070a0cb306db4cc2ceade35867679b91832078fa..2900889cd2f54a7b37e9abd2592e555a585a2fdf 100644 (file)
--- a/debian/patches/mutt-patched/sidebar-dotted
+++ b/debian/patches/mutt-patched/sidebar-dotted
@@ -62,18 +62,3 @@ I hope, it's usefull for someone ;)
    OPTSIGDASHES,
    OPTSIGONTOP,
    OPTSORTRE,
---- a/debian/extra/samples/sidebar.muttrc
-+++ b/debian/extra/samples/sidebar.muttrc
-@@ -50,7 +50,11 @@
- # 
- # sidebar_delim (string)
- # Specifies the delimiter between the sidebar and other screens
--# 
-+#
-+# sidebar_shortpath (boolean)
-+# When using IMAP, a '.' is often used as a separator. This option
-+# allows to shorten the folder name to the part after the last dot.
-+#
- # color sidebar_new [fg] [bg]
- # The foreground (fg) and background (bg) color of folders that contain new
- # mail.

diff --git a/debian/patches/mutt-patched/sidebar-sorted b/debian/patches/mutt-patched/sidebar-sorted
index c5211b8ff84c69dcdae5fe148960ce032ae17a7e..df4c6726891cebc31748fba04c16d937e2184f7c 100644 (file)
--- a/debian/patches/mutt-patched/sidebar-sorted
+++ b/debian/patches/mutt-patched/sidebar-sorted
@@ -73,15 +73,3 @@ should be easy to adopt it to a vanilla mutt.
    OPTSIGDASHES,
    OPTSIGONTOP,
    OPTSORTRE,
---- a/debian/extra/samples/sidebar.muttrc
-+++ b/debian/extra/samples/sidebar.muttrc
-@@ -55,6 +55,9 @@
- # When using IMAP, a '.' is often used as a separator. This option
- # allows to shorten the folder name to the part after the last dot.
- #
-+# sidebar_sort (boolean)
-+# Sorts the folders in the sidebar alphabetically.
-+#
- # color sidebar_new [fg] [bg]
- # The foreground (fg) and background (bg) color of folders that contain new
- # mail.