diff options
Diffstat (limited to 'mail-client/mutt-kz/files')
| -rw-r--r-- | mail-client/mutt-kz/files/Muttrc | 28 | ||||
| -rw-r--r-- | mail-client/mutt-kz/files/Muttrc.mbox | 9 | ||||
| -rw-r--r-- | mail-client/mutt-kz/files/mutt-kz-0_pre20120627-progress-bar.patch | 123 | ||||
| -rw-r--r-- | mail-client/mutt-kz/files/mutt-kz-0_pre20120627-severe-warnings.patch | 16 |
4 files changed, 0 insertions, 176 deletions
diff --git a/mail-client/mutt-kz/files/Muttrc b/mail-client/mutt-kz/files/Muttrc deleted file mode 100644 index 6cd595b..0000000 --- a/mail-client/mutt-kz/files/Muttrc +++ /dev/null @@ -1,28 +0,0 @@ -# Some minimal Mutt settings, Gentoo-style. These reflect the Gentoo -# predilection for maildir folders. -# -# Please don't add settings to this file to change other user -# preferences (such as colors), since those can be hard for a user to -# undo if their preference doesn't match yours! For example, it is -# *impossible* currently in mutt to remove color settings from objects -# other than the index. - -set mbox_type=Maildir -set folder=~/.maildir -set spoolfile=~/.maildir/ -set record=~/.maildir-sent/ -set move=no - -# Maybe we shouldn't set index_format here, but this is a recommended -# one for maildir-style folders. - -set index_format="%4C %Z %{%b %d} %-16.16L %s" - -# set some defaults for the sidebar feature, it's integrated anyway -set sidebar_width = 35 -set sidebar_visible = yes -# color sidebar_new yellow default -bind index <left> sidebar-prev -bind index <right> sidebar-next -bind index <space> sidebar-open -bind index <Esc>S sidebar-toggle diff --git a/mail-client/mutt-kz/files/Muttrc.mbox b/mail-client/mutt-kz/files/Muttrc.mbox deleted file mode 100644 index 1382a37..0000000 --- a/mail-client/mutt-kz/files/Muttrc.mbox +++ /dev/null @@ -1,9 +0,0 @@ -# Some minimal Mutt settings, Gentoo-style. Since mutt was installed -# with USE=mbox, this file doesn't have any changes from the default -# mutt settings, making it very minimal indeed... -# -# Please don't add settings to this file to change other user -# preferences (such as colors), since those can be hard for a user to -# undo if their preference doesn't match yours! For example, it is -# *impossible* currently in mutt to remove color settings from objects -# other than the index. diff --git a/mail-client/mutt-kz/files/mutt-kz-0_pre20120627-progress-bar.patch b/mail-client/mutt-kz/files/mutt-kz-0_pre20120627-progress-bar.patch deleted file mode 100644 index 67629a0..0000000 --- a/mail-client/mutt-kz/files/mutt-kz-0_pre20120627-progress-bar.patch +++ /dev/null @@ -1,123 +0,0 @@ -Adds the Gentoo specific progress bar that is used in Gentoo's Mutt guide. -Proposed upstreams in https://github.com/karelzak/mutt-kz/pull/23 -diff --git a/PATCHES b/PATCHES -index e69de29..785edd0 100644 ---- a/PATCHES -+++ b/PATCHES -@@ -0,0 +1 @@ -+patch-1.5.20hg.pdmef.progress.vl.2 -diff --git a/color.c b/color.c -index 9a3a552..f7db847 100644 ---- a/color.c -+++ b/color.c -@@ -96,6 +96,7 @@ static const struct mapping_t Fields[] = - { "sidebar_new", MT_COLOR_NEW }, - { "sidebar_flagged", MT_COLOR_FLAGGED }, - { "sidebar", MT_COLOR_SIDEBAR }, -+ { "progress", MT_COLOR_PROGRESS }, - { NULL, 0 } - }; - -diff --git a/curs_lib.c b/curs_lib.c -index e5a0113..c5ee2e6 100644 ---- a/curs_lib.c -+++ b/curs_lib.c -@@ -390,6 +390,52 @@ void mutt_progress_init (progress_t* progress, const char *msg, - mutt_progress_update (progress, 0, 0); - } - -+static void message_bar (int percent, const char *fmt, ...) -+{ -+ va_list ap; -+ char buf[STRING], buf2[STRING]; -+ int w = percent * COLS / 100; -+ size_t l; -+ -+ va_start (ap, fmt); -+ vsnprintf (buf, sizeof (buf), fmt, ap); -+ l = mutt_strwidth (buf); -+ va_end (ap); -+ -+ mutt_format_string(buf2, sizeof (buf2), -+ 0, COLS-2, FMT_LEFT, 0, buf, sizeof (buf), 0); -+ -+ move (LINES - 1, 0); -+ -+ if (l < w) -+ { -+ SETCOLOR(MT_COLOR_PROGRESS); -+ addstr (buf2); -+ w -= l; -+ while (w--) -+ addch(' '); -+ SETCOLOR(MT_COLOR_NORMAL); -+ clrtoeol (); -+ mutt_refresh(); -+ } -+ else -+ { -+ size_t bw; -+ char ch; -+ int off = mutt_wstr_trunc (buf2, sizeof (buf2), w, &bw); -+ -+ ch = buf2[off]; -+ buf2[off] = 0; -+ SETCOLOR(MT_COLOR_PROGRESS); -+ addstr (buf2); -+ buf2[off] = ch; -+ SETCOLOR(MT_COLOR_NORMAL); -+ addstr (&buf2[off]); -+ clrtoeol (); -+ mutt_refresh(); -+ } -+} -+ - void mutt_progress_update (progress_t* progress, long pos, int percent) - { - char posstr[SHORT_STRING]; -@@ -440,16 +486,16 @@ void mutt_progress_update (progress_t* progress, long pos, int percent) - - if (progress->size > 0) - { -- mutt_message ("%s %s/%s (%d%%)", progress->msg, posstr, progress->sizestr, -- percent > 0 ? percent : -- (int) (100.0 * (double) progress->pos / progress->size)); -+ message_bar (percent > 0 ? percent : (int) (100.0 * (double) progress->pos / progress->size), -+ "%s %s/%s (%d%%)", progress->msg, posstr, progress->sizestr, -+ percent > 0 ? percent : (int) (100.0 * (double) progress->pos / progress->size)); - } - else - { - if (percent > 0) -- mutt_message ("%s %s (%d%%)", progress->msg, posstr, percent); -+ message_bar (percent, "%s %s (%d%%)", progress->msg, posstr, percent); - else -- mutt_message ("%s %s", progress->msg, posstr); -+ mutt_message ("%s %s", progress->msg, posstr); - } - } - -diff --git a/doc/manual.xml.head b/doc/manual.xml.head -index 0d95886..025af03 100644 ---- a/doc/manual.xml.head -+++ b/doc/manual.xml.head -@@ -2641,6 +2641,7 @@ specify one or the other). - <listitem><para>markers (the <quote>+</quote> markers at the beginning of wrapped lines in the pager)</para></listitem> - <listitem><para>message (informational messages)</para></listitem> - <listitem><para>normal</para></listitem> -+<listitem><para>progress (visual progress bar)</para></listitem> - <listitem><para>quoted (text matching <link linkend="quote-regexp">$quote_regexp</link> in the body of a message)</para></listitem> - <listitem><para>quoted1, quoted2, ..., quoted<emphasis>N</emphasis> (higher levels of quoting)</para></listitem> - <listitem><para>search (highlighting of words in the pager)</para></listitem> -diff --git a/mutt_curses.h b/mutt_curses.h -index cb1acf2..b915fd7 100644 ---- a/mutt_curses.h -+++ b/mutt_curses.h -@@ -128,6 +128,7 @@ enum - MT_COLOR_SIDEBAR, - MT_COLOR_UNDERLINE, - MT_COLOR_INDEX, -+ MT_COLOR_PROGRESS, - MT_COLOR_NEW, - MT_COLOR_FLAGGED, - MT_COLOR_MAX diff --git a/mail-client/mutt-kz/files/mutt-kz-0_pre20120627-severe-warnings.patch b/mail-client/mutt-kz/files/mutt-kz-0_pre20120627-severe-warnings.patch deleted file mode 100644 index cb2a753..0000000 --- a/mail-client/mutt-kz/files/mutt-kz-0_pre20120627-severe-warnings.patch +++ /dev/null @@ -1,16 +0,0 @@ -Fixes for QA notices about severe warning -* mh.c:1415:2: warning: implicit declaration of function ‘nm_update_filename’ -see upstream bugs #22/#23 at https://github.com/karelzak/mutt-kz/issues?state=open ---- mh.c 2012-07-29 16:16:46.076000048 +0200 -+++ mh.c 2012-07-29 16:17:32.579999940 +0200 -@@ -54,6 +54,10 @@ - #include <sys/time.h> - #endif - -+#ifdef USE_NOTMUCH -+#include "mutt_notmuch.h" -+#endif -+ - #define INS_SORT_THRESHOLD 6 - - struct maildir |