From 753c3b3409564dc4fe3824cba6272babc6db5fe6 Mon Sep 17 00:00:00 2001 From: Antonio Radici Date: Sat, 30 Apr 2011 22:23:26 +0100 Subject: [PATCH] a better way of closing 603186 (sidebar-{sorted,dotted} documentation) --- debian/changelog | 5 +++-- debian/extra/samples/sidebar.muttrc | 7 +++++++ debian/patches/mutt-patched/sidebar-dotted | 15 --------------- debian/patches/mutt-patched/sidebar-sorted | 12 ------------ 4 files changed, 10 insertions(+), 29 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5c50b7e..c24d2e2 100644 --- 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 Fri, 29 Apr 2011 17:24:49 +0100 diff --git a/debian/extra/samples/sidebar.muttrc b/debian/extra/samples/sidebar.muttrc index 8bb1574..3a9e3bb 100644 --- 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 070a0cb..2900889 100644 --- 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 c5211b8..df4c672 100644 --- 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. -- 2.43.0