rpm/mutt
1
0
Fork 1
forked from pool/mutt
Code Pull Requests Activity

Accepting request 352063 from server:mail

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/352063
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mutt?expand=0&rev=63
This commit is contained in:
Dominique Leuenberger 2016-01-06 23:24:41 +00:00 committed by Git OBS Bridge
commit e65a9494d1
7 changed files with 427 additions and 308 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
aw.listreply.diff
View File

@ -11,7 +11,7 @@ ask when sending list message replies to author only - Armin Wolfermann (aw)
+++ mutt-1.5.23/PATCHES 2015-01-26 15:34:40.133518493 +0000 +++ mutt-1.5.23/PATCHES 2015-01-26 15:34:40.133518493 +0000
@@ -1,2 +1,3 @@ @@ -1,2 +1,3 @@
+patch-1.5.9.aw.listreply.1 +patch-1.5.9.aw.listreply.1
patch-1.5.23.sidebar.20140412.txt patch-1.5.24.sidebar.20151111.txt
rr.compressed rr.compressed
--- mutt-1.5.23/init.h --- mutt-1.5.23/init.h
+++ mutt-1.5.23/init.h 2012-06-21 09:48:22.000000000 +0000 +++ mutt-1.5.23/init.h 2012-06-21 09:48:22.000000000 +0000

16
mutt.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Tue Dec 22 09:44:55 UTC 2015 - vmiklos@collabora.co.uk
- Update patch-1.5.24.sidebar.20140412.patch to
patch-1.5.24.sidebar.20151111.patch
+ Updated patch for pristine mutt-1.5.24 source package.
+ Corrected the version info in PATCHES for mutt-1.5.24 and added two small
patches courtesy of mutt user flatcap. The patch makes %S optional in
sidebar_format_str and the other patch fixes a problem with viewing an imap
folder that gets deleted by another user which causes a mutt crash.
- Modified patches
+ aw.listreply.diff
+ nion.sidebar-color.diff
+ patch-1.5.24.vk.pgp_verbose_mime
+ widechar.sidebar.dif
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Sep 11 15:14:48 UTC 2015 - werner@suse.de Fri Sep 11 15:14:48 UTC 2015 - werner@suse.de

8
mutt.spec
View File

@ -90,7 +90,7 @@ Patch2: %name-1.5.9i-pgpewrap.diff
Patch3: %name-1.5.20-sendgroupreplyto.diff Patch3: %name-1.5.20-sendgroupreplyto.diff
Patch4: %name-1.5.15-wrapcolumn.diff Patch4: %name-1.5.15-wrapcolumn.diff
# http://lunar-linux.org/mutt-sidebar # http://lunar-linux.org/mutt-sidebar
Patch6: patch-1.5.24.sidebar.20140412.patch Patch6: patch-1.5.24.sidebar.20151111.patch
Patch7: mutt-1.5.24-opennfs.dif Patch7: mutt-1.5.24-opennfs.dif
Patch9: bug-676388-largefile.patch Patch9: bug-676388-largefile.patch
Patch10: mutt-1.5.21-tinfo.dif Patch10: mutt-1.5.21-tinfo.dif
@ -126,14 +126,14 @@ done
%patch2 -p0 -b .pgpewrap %patch2 -p0 -b .pgpewrap
%patch3 -p1 -b .sendgroupreplyto %patch3 -p1 -b .sendgroupreplyto
%patch4 -p0 -b .wrapcolumn %patch4 -p0 -b .wrapcolumn
%patch6 -p0 -b .sidebar %patch6 -p1 -b .sidebar
%patch7 -p0 -b .opennfs %patch7 -p0 -b .opennfs
%patch9 -p1 -b .largefile %patch9 -p1 -b .largefile
%patch10 -p0 -b .tinfo %patch10 -p0 -b .tinfo
%patch11 -p1 -b .listreply %patch11 -p1 -b .listreply
%patch12 -p0 -b .pgp_verbose_mtime %patch12 -p0 -b .pgp_verbose_mtime
%patch14 -p2 -b .sidebar.color %patch14 -p1 -b .sidebar.color
%patch15 -p0 -b .widechar.sidebar %patch15 -p1 -b .widechar.sidebar
%patch16 -p0 -b .crlf %patch16 -p0 -b .crlf
%patch18 -p1 -b .mailcap %patch18 -p1 -b .mailcap
%patch19 -p1 -b .cvw2014.9116 %patch19 -p1 -b .cvw2014.9116

33
nion.sidebar-color.diff
View File

@ -1,16 +1,17 @@
diff --git a/mutt-1.5.24/color.c b/mutt-1.5.24/color.c diff --git a/color.c b/color.c
--- a/mutt-1.5.24/color.c index d6f9198..37786bc 100644
+++ b/mutt-1.5.24/color.c --- a/color.c
@@ -95,6 +95,7 @@ static const struct mapping_t Fields[] = +++ b/color.c
{ "index", MT_COLOR_INDEX }, @@ -96,6 +96,7 @@ static const struct mapping_t Fields[] =
{ "prompt", MT_COLOR_PROMPT },
{ "sidebar_new", MT_COLOR_NEW }, { "sidebar_new", MT_COLOR_NEW },
{ "sidebar_flagged", MT_COLOR_FLAGGED }, { "sidebar_flagged", MT_COLOR_FLAGGED },
+ { "sidebar", MT_COLOR_SIDEBAR }, + { "sidebar", MT_COLOR_SIDEBAR },
{ "prompt", MT_COLOR_PROMPT },
{ NULL, 0 } { NULL, 0 }
}; };
@@ -145,6 +146,7 @@ void ci_start_color (void) @@ -145,6 +146,7 @@ void ci_start_color (void)
/* set some defaults */ /* set some defaults */
@ -19,9 +20,10 @@ diff --git a/mutt-1.5.24/color.c b/mutt-1.5.24/color.c
ColorDefs[MT_COLOR_INDICATOR] = A_REVERSE; ColorDefs[MT_COLOR_INDICATOR] = A_REVERSE;
ColorDefs[MT_COLOR_SEARCH] = A_REVERSE; ColorDefs[MT_COLOR_SEARCH] = A_REVERSE;
ColorDefs[MT_COLOR_MARKERS] = A_REVERSE; ColorDefs[MT_COLOR_MARKERS] = A_REVERSE;
diff --git a/mutt-1.5.24/mutt_curses.h b/mutt-1.5.24/mutt_curses.h diff --git a/mutt_curses.h b/mutt_curses.h
--- a/mutt-1.5.24/mutt_curses.h index ef9884e..b2e88c8 100644
+++ b/mutt-1.5.24/mutt_curses.h --- a/mutt_curses.h
+++ b/mutt_curses.h
@@ -119,6 +119,7 @@ enum @@ -119,6 +119,7 @@ enum
MT_COLOR_ATTACHMENT, MT_COLOR_ATTACHMENT,
MT_COLOR_SEARCH, MT_COLOR_SEARCH,
@ -29,11 +31,12 @@ diff --git a/mutt-1.5.24/mutt_curses.h b/mutt-1.5.24/mutt_curses.h
+ MT_COLOR_SIDEBAR, + MT_COLOR_SIDEBAR,
MT_COLOR_UNDERLINE, MT_COLOR_UNDERLINE,
MT_COLOR_INDEX, MT_COLOR_INDEX,
MT_COLOR_NEW, MT_COLOR_PROMPT,
diff --git a/mutt-1.5.24/sidebar.c b/mutt-1.5.24/sidebar.c diff --git a/sidebar.c b/sidebar.c
--- a/mutt-1.5.24/sidebar.c index e9d9eba..8b46bff 100644
+++ b/mutt-1.5.24/sidebar.c --- a/sidebar.c
@@ -250,13 +250,14 @@ int draw_sidebar(int menu) { +++ b/sidebar.c
@@ -254,13 +254,14 @@ int draw_sidebar(int menu) {
} }
/* get attributes for divider */ /* get attributes for divider */
@ -49,7 +52,7 @@ diff --git a/mutt-1.5.24/sidebar.c b/mutt-1.5.24/sidebar.c
/* draw the divider */ /* draw the divider */
@@ -266,10 +267,14 @@ int draw_sidebar(int menu) { @@ -270,10 +271,14 @@ int draw_sidebar(int menu) {
for ( ; lines < SidebarHeight; lines++ ) { for ( ; lines < SidebarHeight; lines++ ) {
move(lines, SidebarWidth - delim_len); move(lines, SidebarWidth - delim_len);

475
patch-1.5.24.sidebar.20140412.patch → patch-1.5.24.sidebar.20151111.patch
View File

@ -1,42 +1,46 @@
--- ---
Makefile.am | 1 Makefile.am | 1 +
Makefile.in | 8 - Makefile.in | 17 ++-
OPS | 5 OPS | 5 +
PATCHES | 1 PATCHES | 1 +
buffy.c | 152 ++++++++++++++++++++- buffy.c | 152 ++++++++++++++++++++-
buffy.h | 6 buffy.h | 6 +
color.c | 2 color.c | 2 +
compose.c | 26 +-- compose.c | 26 ++--
configure.ac | 2 configure.ac | 2 +
curs_main.c | 37 ++++- curs_main.c | 37 +++++-
doc/Muttrc | 20 ++ doc/Muttrc | 20 +++
flags.c | 3 flags.c | 3 +
functions.h | 10 + functions.h | 10 ++
globals.h | 6 globals.h | 6 +
handler.c | 30 ++++ handler.c | 30 ++++-
imap/command.c | 7 imap/command.c | 7 +
imap/imap.c | 2 imap/imap.c | 2 +-
init.h | 48 ++++++ init.h | 48 +++++++
mailbox.h | 1 mailbox.h | 1 +
main.c | 11 + main.c | 11 +-
mbox.c | 2 mbox.c | 2 +
menu.c | 20 +- menu.c | 20 +--
mh.c | 26 +++ mh.c | 26 ++++
mutt.h | 6 mutt.h | 6 +
mutt_curses.h | 3 mutt_curses.h | 3 +
mutt_menu.h | 1 mutt_menu.h | 1 +
muttlib.c | 48 ++++++ muttlib.c | 48 +++++++
mx.c | 24 +++ mx.c | 24 +++-
mx.h | 1 mx.h | 1 +
pager.c | 43 +++++- pager.c | 42 +++++-
pattern.c | 38 +++++ pattern.c | 38 ++++++
protos.h | 7 protos.h | 7 +
sidebar.c | 405 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ sidebar.c | 410 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
sidebar.h | 36 +++++ sidebar.h | 36 +++++
34 files changed, 995 insertions(+), 43 deletions(-) 34 files changed, 1003 insertions(+), 48 deletions(-)
create mode 100644 sidebar.c
create mode 100644 sidebar.h
--- Makefile.am diff --git a/Makefile.am b/Makefile.am
+++ Makefile.am 2014-04-11 15:14:01.000000000 +0000 index da1c3d4..0fc7ab2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,6 +34,7 @@ mutt_SOURCES = \ @@ -34,6 +34,7 @@ mutt_SOURCES = \
rfc822.c rfc1524.c rfc2047.c rfc2231.c rfc3676.c \ rfc822.c rfc1524.c rfc2047.c rfc2231.c rfc3676.c \
score.c send.c sendlib.c signal.c sort.c \ score.c send.c sendlib.c signal.c sort.c \
@ -45,40 +49,60 @@
muttlib.c editmsg.c mbyte.c \ muttlib.c editmsg.c mbyte.c \
url.c ascii.c crypt-mod.c crypt-mod.h safe_asprintf.c url.c ascii.c crypt-mod.c crypt-mod.h safe_asprintf.c
--- Makefile.in diff --git a/Makefile.in b/Makefile.in
+++ Makefile.in 2015-09-11 14:21:58.526018901 +0000 index c830b75..3bd847d 100644
@@ -134,7 +134,8 @@ am_mutt_OBJECTS = addrbook.$(OBJEXT) ali --- a/Makefile.in
+++ b/Makefile.in
@@ -87,10 +87,10 @@ DIST_COMMON = $(top_srcdir)/flymake.am $(srcdir)/Makefile.in \
$(srcdir)/Makefile.am $(top_srcdir)/configure \
$(am__configure_deps) $(srcdir)/config.h.in \
$(top_srcdir)/intl/Makefile.in $(srcdir)/hcachever.sh.in \
- $(srcdir)/muttbug.sh.in strtok_r.c strcasecmp.c regex.c \
- snprintf.c wcscasecmp.c strcasestr.c setenv.c mkdtemp.c \
- strsep.c strdup.c depcomp ABOUT-NLS ChangeLog INSTALL NEWS \
- README TODO compile config.guess config.sub install-sh missing
+ $(srcdir)/muttbug.sh.in snprintf.c strtok_r.c regex.c strdup.c \
+ strcasecmp.c setenv.c strcasestr.c wcscasecmp.c mkdtemp.c \
+ strsep.c depcomp ABOUT-NLS ChangeLog INSTALL NEWS README TODO \
+ compile config.guess config.sub install-sh missing
EXTRA_PROGRAMS = mutt_dotlock$(EXEEXT) pgpring$(EXEEXT) \
pgpewrap$(EXEEXT) mutt_md5$(EXEEXT)
bin_PROGRAMS = mutt$(EXEEXT) $(DOTLOCK_TARGET) $(PGPAUX_TARGET)
@@ -132,9 +132,10 @@ am_mutt_OBJECTS = addrbook.$(OBJEXT) alias.$(OBJEXT) attach.$(OBJEXT) \
score.$(OBJEXT) send.$(OBJEXT) sendlib.$(OBJEXT) \
signal.$(OBJEXT) sort.$(OBJEXT) status.$(OBJEXT) \
system.$(OBJEXT) thread.$(OBJEXT) charset.$(OBJEXT) \ system.$(OBJEXT) thread.$(OBJEXT) charset.$(OBJEXT) \
history.$(OBJEXT) lib.$(OBJEXT) muttlib.$(OBJEXT) \ - history.$(OBJEXT) lib.$(OBJEXT) muttlib.$(OBJEXT) \
editmsg.$(OBJEXT) mbyte.$(OBJEXT) url.$(OBJEXT) \ - editmsg.$(OBJEXT) mbyte.$(OBJEXT) url.$(OBJEXT) \
- ascii.$(OBJEXT) crypt-mod.$(OBJEXT) safe_asprintf.$(OBJEXT) - ascii.$(OBJEXT) crypt-mod.$(OBJEXT) safe_asprintf.$(OBJEXT)
+ ascii.$(OBJEXT) crypt-mod.$(OBJEXT) safe_asprintf.$(OBJEXT) \ + history.$(OBJEXT) lib.$(OBJEXT) sidebar.$(OBJEXT) \
+ sidebar.$(OBJEXT) + muttlib.$(OBJEXT) editmsg.$(OBJEXT) mbyte.$(OBJEXT) \
+ url.$(OBJEXT) ascii.$(OBJEXT) crypt-mod.$(OBJEXT) \
+ safe_asprintf.$(OBJEXT)
am__objects_1 = am__objects_1 =
am__objects_2 = patchlist.$(OBJEXT) conststrings.$(OBJEXT) \ am__objects_2 = patchlist.$(OBJEXT) conststrings.$(OBJEXT) \
$(am__objects_1) $(am__objects_1)
@@ -479,7 +480,8 @@ mutt_SOURCES = \ @@ -478,6 +479,7 @@ mutt_SOURCES = \
rfc822.c rfc1524.c rfc2047.c rfc2231.c rfc3676.c \
score.c send.c sendlib.c signal.c sort.c \ score.c send.c sendlib.c signal.c sort.c \
status.c system.c thread.c charset.c history.c lib.c \ status.c system.c thread.c charset.c history.c lib.c \
+ sidebar.c \
muttlib.c editmsg.c mbyte.c \ muttlib.c editmsg.c mbyte.c \
- url.c ascii.c crypt-mod.c crypt-mod.h safe_asprintf.c url.c ascii.c crypt-mod.c crypt-mod.h safe_asprintf.c
+ url.c ascii.c crypt-mod.c crypt-mod.h safe_asprintf.c \
+ sidebar.c
nodist_mutt_SOURCES = $(BUILT_SOURCES) @@ -808,6 +810,7 @@ distclean-compile:
mutt_LDADD = $(MUTT_LIB_OBJECTS) $(LIBOBJS) $(LIBIMAP) $(MUTTLIBS) \ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/send.Po@am__quote@
@@ -511,7 +513,7 @@ EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP O @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sendlib.Po@am__quote@
README.SSL smime.h group.h \ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sha1.Po@am__quote@
muttbug pgppacket.h depcomp ascii.h BEWARE PATCHES patchlist.sh \ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sidebar.Po@am__quote@
ChangeLog mkchangelog.sh mutt_idna.h \ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/signal.Po@am__quote@
- snprintf.c regex.c crypt-gpgme.h hcachever.sh.in \ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/smime.Po@am__quote@
+ snprintf.c regex.c crypt-gpgme.h sidebar.h hcachever.sh.in \ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/smtp.Po@am__quote@
txt2c.c txt2c.sh version.sh check_sec.sh diff --git a/OPS b/OPS
index 8414a8b..ef14453 100644
EXTRA_SCRIPTS = smime_keys --- a/OPS
--- OPS +++ b/OPS
+++ OPS 2014-04-11 15:14:01.000000000 +0000 @@ -179,3 +179,8 @@ OP_WHAT_KEY "display the keycode for a key press"
@@ -179,3 +179,8 @@ OP_WHAT_KEY "display the keycode for a k
OP_MAIN_SHOW_LIMIT "show currently active limit pattern" OP_MAIN_SHOW_LIMIT "show currently active limit pattern"
OP_MAIN_COLLAPSE_THREAD "collapse/uncollapse current thread" OP_MAIN_COLLAPSE_THREAD "collapse/uncollapse current thread"
OP_MAIN_COLLAPSE_ALL "collapse/uncollapse all threads" OP_MAIN_COLLAPSE_ALL "collapse/uncollapse all threads"
@ -87,14 +111,18 @@
+OP_SIDEBAR_NEXT "go down to next mailbox" +OP_SIDEBAR_NEXT "go down to next mailbox"
+OP_SIDEBAR_PREV "go to previous mailbox" +OP_SIDEBAR_PREV "go to previous mailbox"
+OP_SIDEBAR_OPEN "open hilighted mailbox" +OP_SIDEBAR_OPEN "open hilighted mailbox"
--- PATCHES diff --git a/PATCHES b/PATCHES
+++ PATCHES 2014-04-12 17:36:35.000000000 +0000 index 91a8cf6..c9f9313 100644
--- a/PATCHES
+++ b/PATCHES
@@ -1 +1,2 @@ @@ -1 +1,2 @@
+patch-1.5.23.sidebar.20140412.txt +patch-1.5.24.sidebar.20151111.txt
rr.compressed rr.compressed
--- buffy.c diff --git a/buffy.c b/buffy.c
+++ buffy.c 2015-09-11 14:23:43.438018482 +0000 index 12a16d1..d108a09 100644
@@ -161,6 +161,49 @@ void mutt_buffy_cleanup (const char *buf --- a/buffy.c
+++ b/buffy.c
@@ -161,6 +161,49 @@ void mutt_buffy_cleanup (const char *buf, struct stat *st)
} }
} }
@ -158,7 +186,7 @@
buffy->next = NULL; buffy->next = NULL;
buffy->magic = 0; buffy->magic = 0;
@@ -243,8 +290,8 @@ int mutt_parse_mailboxes (BUFFER *path, @@ -243,8 +290,8 @@ int mutt_parse_mailboxes (BUFFER *path, BUFFER *s, unsigned long data, BUFFER *e
p = realpath (buf, f1); p = realpath (buf, f1);
for (tmp = &Incoming; *tmp; tmp = &((*tmp)->next)) for (tmp = &Incoming; *tmp; tmp = &((*tmp)->next))
{ {
@ -169,7 +197,7 @@
{ {
dprint(3,(debugfile,"mailbox '%s' already registered as '%s'\n", buf, (*tmp)->path)); dprint(3,(debugfile,"mailbox '%s' already registered as '%s'\n", buf, (*tmp)->path));
break; break;
@@ -282,6 +329,7 @@ int mutt_parse_mailboxes (BUFFER *path, @@ -282,6 +329,7 @@ int mutt_parse_mailboxes (BUFFER *path, BUFFER *s, unsigned long data, BUFFER *e
else else
(*tmp)->size = 0; (*tmp)->size = 0;
} }
@ -177,7 +205,7 @@
return 0; return 0;
} }
@@ -306,6 +354,11 @@ static int buffy_maildir_dir_hasnew(BUFF @@ -306,6 +354,11 @@ static int buffy_maildir_dir_hasnew(BUFFY* mailbox, const char *dir_name)
return 0; return 0;
} }
@ -189,7 +217,7 @@
if ((dirp = opendir (path)) == NULL) if ((dirp = opendir (path)) == NULL)
{ {
mailbox->magic = 0; mailbox->magic = 0;
@@ -357,6 +410,73 @@ static int buffy_maildir_hasnew (BUFFY* @@ -357,6 +410,73 @@ static int buffy_maildir_hasnew (BUFFY* mailbox)
return 0; return 0;
} }
@ -263,7 +291,7 @@
/* returns 1 if mailbox has new mail */ /* returns 1 if mailbox has new mail */
static int buffy_mbox_hasnew (BUFFY* mailbox, struct stat *sb) static int buffy_mbox_hasnew (BUFFY* mailbox, struct stat *sb)
{ {
@@ -368,7 +488,7 @@ static int buffy_mbox_hasnew (BUFFY* mai @@ -368,7 +488,7 @@ static int buffy_mbox_hasnew (BUFFY* mailbox, struct stat *sb)
else else
statcheck = sb->st_mtime > sb->st_atime statcheck = sb->st_mtime > sb->st_atime
|| (mailbox->newly_created && sb->st_ctime == sb->st_mtime && sb->st_ctime == sb->st_atime); || (mailbox->newly_created && sb->st_ctime == sb->st_mtime && sb->st_ctime == sb->st_atime);
@ -272,7 +300,7 @@
{ {
if (!option(OPTMAILCHECKRECENT) || sb->st_mtime > mailbox->last_visited) if (!option(OPTMAILCHECKRECENT) || sb->st_mtime > mailbox->last_visited)
{ {
@@ -388,6 +508,27 @@ static int buffy_mbox_hasnew (BUFFY* mai @@ -388,6 +508,27 @@ static int buffy_mbox_hasnew (BUFFY* mailbox, struct stat *sb)
return rc; return rc;
} }
@ -322,8 +350,10 @@
if (tmp->new) if (tmp->new)
BuffyCount++; BuffyCount++;
break; break;
--- buffy.h diff --git a/buffy.h b/buffy.h
+++ buffy.h 2014-04-11 15:14:01.000000000 +0000 index f9fc55a..1436451 100644
--- a/buffy.h
+++ b/buffy.h
@@ -23,13 +23,19 @@ @@ -23,13 +23,19 @@
typedef struct buffy_t typedef struct buffy_t
{ {
@ -344,19 +374,23 @@
} }
BUFFY; BUFFY;
--- color.c diff --git a/color.c b/color.c
+++ color.c 2015-09-11 14:25:20.109819549 +0000 index 64a46dc..d6f9198 100644
@@ -93,6 +93,8 @@ static const struct mapping_t Fields[] = --- a/color.c
{ "bold", MT_COLOR_BOLD }, +++ b/color.c
@@ -94,6 +94,8 @@ static const struct mapping_t Fields[] =
{ "underline", MT_COLOR_UNDERLINE }, { "underline", MT_COLOR_UNDERLINE },
{ "index", MT_COLOR_INDEX }, { "index", MT_COLOR_INDEX },
{ "prompt", MT_COLOR_PROMPT },
+ { "sidebar_new", MT_COLOR_NEW }, + { "sidebar_new", MT_COLOR_NEW },
+ { "sidebar_flagged", MT_COLOR_FLAGGED }, + { "sidebar_flagged", MT_COLOR_FLAGGED },
{ "prompt", MT_COLOR_PROMPT },
{ NULL, 0 } { NULL, 0 }
}; };
--- compose.c
+++ compose.c 2015-09-11 14:26:05.873518387 +0000 diff --git a/compose.c b/compose.c
index 9d87060..b63695f 100644
--- a/compose.c
+++ b/compose.c
@@ -72,7 +72,7 @@ enum @@ -72,7 +72,7 @@ enum
#define HDR_XOFFSET 10 #define HDR_XOFFSET 10
@ -366,7 +400,7 @@
static const char * const Prompts[] = static const char * const Prompts[] =
{ {
@@ -110,7 +110,7 @@ static void snd_entry (char *b, size_t b @@ -110,7 +110,7 @@ static void snd_entry (char *b, size_t blen, MUTTMENU *menu, int num)
static void redraw_crypt_lines (HEADER *msg) static void redraw_crypt_lines (HEADER *msg)
{ {
@ -375,7 +409,7 @@
if ((WithCrypto & (APPLICATION_PGP | APPLICATION_SMIME)) == 0) if ((WithCrypto & (APPLICATION_PGP | APPLICATION_SMIME)) == 0)
{ {
@@ -145,7 +145,7 @@ static void redraw_crypt_lines (HEADER * @@ -145,7 +145,7 @@ static void redraw_crypt_lines (HEADER *msg)
addstr (_(" (OppEnc mode)")); addstr (_(" (OppEnc mode)"));
clrtoeol (); clrtoeol ();
@ -384,7 +418,7 @@
clrtoeol (); clrtoeol ();
if ((WithCrypto & APPLICATION_PGP) if ((WithCrypto & APPLICATION_PGP)
@@ -162,7 +162,7 @@ static void redraw_crypt_lines (HEADER * @@ -162,7 +162,7 @@ static void redraw_crypt_lines (HEADER *msg)
&& (msg->security & ENCRYPT) && (msg->security & ENCRYPT)
&& SmimeCryptAlg && SmimeCryptAlg
&& *SmimeCryptAlg) { && *SmimeCryptAlg) {
@ -393,7 +427,7 @@
NONULL(SmimeCryptAlg)); NONULL(SmimeCryptAlg));
} }
} }
@@ -175,7 +175,7 @@ static void redraw_mix_line (LIST *chain @@ -175,7 +175,7 @@ static void redraw_mix_line (LIST *chain)
int c; int c;
char *t; char *t;
@ -402,7 +436,7 @@
if (!chain) if (!chain)
{ {
@@ -190,7 +190,7 @@ static void redraw_mix_line (LIST *chain @@ -190,7 +190,7 @@ static void redraw_mix_line (LIST *chain)
if (t && t[0] == '0' && t[1] == '\0') if (t && t[0] == '0' && t[1] == '\0')
t = "<random>"; t = "<random>";
@ -411,7 +445,7 @@
break; break;
addstr (NONULL(t)); addstr (NONULL(t));
@@ -242,7 +242,7 @@ static void draw_envelope_addr (int line @@ -242,7 +242,7 @@ static void draw_envelope_addr (int line, ADDRESS *addr)
buf[0] = 0; buf[0] = 0;
rfc822_write_address (buf, sizeof (buf), addr, 1); rfc822_write_address (buf, sizeof (buf), addr, 1);
@ -420,7 +454,7 @@
mutt_paddstr (W, buf); mutt_paddstr (W, buf);
} }
@@ -252,10 +252,10 @@ static void draw_envelope (HEADER *msg, @@ -252,10 +252,10 @@ static void draw_envelope (HEADER *msg, char *fcc)
draw_envelope_addr (HDR_TO, msg->env->to); draw_envelope_addr (HDR_TO, msg->env->to);
draw_envelope_addr (HDR_CC, msg->env->cc); draw_envelope_addr (HDR_CC, msg->env->cc);
draw_envelope_addr (HDR_BCC, msg->env->bcc); draw_envelope_addr (HDR_BCC, msg->env->bcc);
@ -433,7 +467,7 @@
mutt_paddstr (W, fcc); mutt_paddstr (W, fcc);
if (WithCrypto) if (WithCrypto)
@@ -266,7 +266,7 @@ static void draw_envelope (HEADER *msg, @@ -266,7 +266,7 @@ static void draw_envelope (HEADER *msg, char *fcc)
#endif #endif
SETCOLOR (MT_COLOR_STATUS); SETCOLOR (MT_COLOR_STATUS);
@ -442,7 +476,7 @@
clrtoeol (); clrtoeol ();
NORMAL_COLOR; NORMAL_COLOR;
@@ -302,7 +302,7 @@ static int edit_address_list (int line, @@ -302,7 +302,7 @@ static int edit_address_list (int line, ADDRESS **addr)
/* redraw the expanded list so the user can see the result */ /* redraw the expanded list so the user can see the result */
buf[0] = 0; buf[0] = 0;
rfc822_write_address (buf, sizeof (buf), *addr, 1); rfc822_write_address (buf, sizeof (buf), *addr, 1);
@ -451,7 +485,7 @@
mutt_paddstr (W, buf); mutt_paddstr (W, buf);
return 0; return 0;
@@ -562,7 +562,7 @@ int mutt_compose_menu (HEADER *msg, /* @@ -562,7 +562,7 @@ int mutt_compose_menu (HEADER *msg, /* structure for new message */
if (mutt_get_field ("Subject: ", buf, sizeof (buf), 0) == 0) if (mutt_get_field ("Subject: ", buf, sizeof (buf), 0) == 0)
{ {
mutt_str_replace (&msg->env->subject, buf); mutt_str_replace (&msg->env->subject, buf);
@ -460,7 +494,7 @@
if (msg->env->subject) if (msg->env->subject)
mutt_paddstr (W, msg->env->subject); mutt_paddstr (W, msg->env->subject);
else else
@@ -580,7 +580,7 @@ int mutt_compose_menu (HEADER *msg, /* @@ -580,7 +580,7 @@ int mutt_compose_menu (HEADER *msg, /* structure for new message */
{ {
strfcpy (fcc, buf, fcclen); strfcpy (fcc, buf, fcclen);
mutt_pretty_mailbox (fcc, fcclen); mutt_pretty_mailbox (fcc, fcclen);
@ -469,9 +503,11 @@
mutt_paddstr (W, fcc); mutt_paddstr (W, fcc);
fccSet = 1; fccSet = 1;
} }
--- configure.ac diff --git a/configure.ac b/configure.ac
+++ configure.ac 2014-04-11 15:14:01.000000000 +0000 index 8ff4b3c..0c81c05 100644
@@ -1315,6 +1315,8 @@ if test $mutt_cv_langinfo_yesexpr = yes; --- a/configure.ac
+++ b/configure.ac
@@ -1315,6 +1315,8 @@ if test $mutt_cv_langinfo_yesexpr = yes; then
AC_DEFINE(HAVE_LANGINFO_YESEXPR,1,[ Define if you have <langinfo.h> and nl_langinfo(YESEXPR). ]) AC_DEFINE(HAVE_LANGINFO_YESEXPR,1,[ Define if you have <langinfo.h> and nl_langinfo(YESEXPR). ])
fi fi
@ -480,8 +516,10 @@
dnl Documentation tools dnl Documentation tools
have_openjade="no" have_openjade="no"
AC_PATH_PROG([OSPCAT], [ospcat], [none]) AC_PATH_PROG([OSPCAT], [ospcat], [none])
--- curs_main.c diff --git a/curs_main.c b/curs_main.c
+++ curs_main.c 2014-04-13 02:45:21.000000000 +0000 index 3e7021b..0496232 100644
--- a/curs_main.c
+++ b/curs_main.c
@@ -26,7 +26,9 @@ @@ -26,7 +26,9 @@
#include "mailbox.h" #include "mailbox.h"
#include "mapping.h" #include "mapping.h"
@ -598,8 +636,10 @@
default: default:
if (menu->menu == MENU_MAIN) if (menu->menu == MENU_MAIN)
km_error_key (MENU_MAIN); km_error_key (MENU_MAIN);
--- doc/Muttrc diff --git a/doc/Muttrc b/doc/Muttrc
+++ doc/Muttrc 2014-04-11 15:14:01.000000000 +0000 index fa7c105..e5ae11e 100644
--- a/doc/Muttrc
+++ b/doc/Muttrc
@@ -657,6 +657,26 @@ set check_mbox_size=yes @@ -657,6 +657,26 @@ set check_mbox_size=yes
# $crypt_autosign, $crypt_replysign and $smime_is_default. # $crypt_autosign, $crypt_replysign and $smime_is_default.
# #
@ -627,8 +667,10 @@
# set crypt_autosign=no # set crypt_autosign=no
# #
# Name: crypt_autosign # Name: crypt_autosign
--- flags.c diff --git a/flags.c b/flags.c
+++ flags.c 2014-04-11 15:14:01.000000000 +0000 index f0f3d81..d675000 100644
--- a/flags.c
+++ b/flags.c
@@ -22,8 +22,10 @@ @@ -22,8 +22,10 @@
#include "mutt.h" #include "mutt.h"
@ -640,7 +682,7 @@
void _mutt_set_flag (CONTEXT *ctx, HEADER *h, int flag, int bf, int upd_ctx) void _mutt_set_flag (CONTEXT *ctx, HEADER *h, int flag, int bf, int upd_ctx)
{ {
@@ -263,6 +265,7 @@ void _mutt_set_flag (CONTEXT *ctx, HEADE @@ -263,6 +265,7 @@ void _mutt_set_flag (CONTEXT *ctx, HEADER *h, int flag, int bf, int upd_ctx)
*/ */
if (h->searched && (changed != h->changed || deleted != ctx->deleted || tagged != ctx->tagged || flagged != ctx->flagged)) if (h->searched && (changed != h->changed || deleted != ctx->deleted || tagged != ctx->tagged || flagged != ctx->flagged))
h->searched = 0; h->searched = 0;
@ -648,9 +690,11 @@
} }
void mutt_tag_set_flag (int flag, int bf) void mutt_tag_set_flag (int flag, int bf)
--- functions.h diff --git a/functions.h b/functions.h
+++ functions.h 2014-04-11 15:14:01.000000000 +0000 index 7a1c5a9..39dc50b 100644
@@ -169,6 +169,11 @@ const struct binding_t OpMain[] = { /* m --- a/functions.h
+++ b/functions.h
@@ -169,6 +169,11 @@ const struct binding_t OpMain[] = { /* map: index */
{ "decrypt-save", OP_DECRYPT_SAVE, NULL }, { "decrypt-save", OP_DECRYPT_SAVE, NULL },
@ -662,7 +706,7 @@
{ NULL, 0, NULL } { NULL, 0, NULL }
}; };
@@ -272,6 +277,11 @@ const struct binding_t OpPager[] = { /* @@ -272,6 +277,11 @@ const struct binding_t OpPager[] = { /* map: pager */
{ "what-key", OP_WHAT_KEY, NULL }, { "what-key", OP_WHAT_KEY, NULL },
@ -674,8 +718,10 @@
{ NULL, 0, NULL } { NULL, 0, NULL }
}; };
--- globals.h diff --git a/globals.h b/globals.h
+++ globals.h 2014-04-11 15:14:01.000000000 +0000 index e77030c..aa37fe9 100644
--- a/globals.h
+++ b/globals.h
@@ -118,6 +118,9 @@ WHERE short SearchContext; @@ -118,6 +118,9 @@ WHERE short SearchContext;
WHERE char *SendCharset; WHERE char *SendCharset;
WHERE char *Sendmail; WHERE char *Sendmail;
@ -696,21 +742,23 @@
#ifdef USE_IMAP #ifdef USE_IMAP
WHERE short ImapKeepalive; WHERE short ImapKeepalive;
WHERE short ImapPipelineDepth; WHERE short ImapPipelineDepth;
--- handler.c diff --git a/handler.c b/handler.c
+++ handler.c 2015-09-11 14:33:57.576024053 +0000 index 1a062be..8c3b699 100644
@@ -1601,6 +1601,11 @@ static int run_decode_and_handler (BODY --- a/handler.c
int decode = 0; +++ b/handler.c
int rc = 0; @@ -1603,6 +1603,11 @@ static int run_decode_and_handler (BODY *b, STATE *s, handler_t handler, int pla
fseeko (s->fpin, b->offset, 0);
+#ifdef HAVE_FMEMOPEN +#ifdef HAVE_FMEMOPEN
+ char *temp; + char *temp;
+ size_t tempsize; + size_t tempsize;
+#endif +#endif
+ +
fseeko (s->fpin, b->offset, 0);
/* see if we need to decode this part before processing it */ /* see if we need to decode this part before processing it */
@@ -1618,6 +1623,14 @@ static int run_decode_and_handler (BODY if (b->encoding == ENCBASE64 || b->encoding == ENCQUOTEDPRINTABLE ||
b->encoding == ENCUUENCODED || plaintext ||
@@ -1618,6 +1623,14 @@ static int run_decode_and_handler (BODY *b, STATE *s, handler_t handler, int pla
{ {
/* decode to a tempfile, saving the original destination */ /* decode to a tempfile, saving the original destination */
fp = s->fpout; fp = s->fpout;
@ -725,7 +773,7 @@
mutt_mktemp (tempfile, sizeof (tempfile)); mutt_mktemp (tempfile, sizeof (tempfile));
if ((s->fpout = safe_fopen (tempfile, "w")) == NULL) if ((s->fpout = safe_fopen (tempfile, "w")) == NULL)
{ {
@@ -1625,6 +1638,7 @@ static int run_decode_and_handler (BODY @@ -1625,6 +1638,7 @@ static int run_decode_and_handler (BODY *b, STATE *s, handler_t handler, int pla
dprint (1, (debugfile, "Can't open %s.\n", tempfile)); dprint (1, (debugfile, "Can't open %s.\n", tempfile));
return -1; return -1;
} }
@ -733,7 +781,7 @@
/* decoding the attachment changes the size and offset, so save a copy /* decoding the attachment changes the size and offset, so save a copy
* of the "real" values now, and restore them after processing * of the "real" values now, and restore them after processing
*/ */
@@ -1653,8 +1667,20 @@ static int run_decode_and_handler (BODY @@ -1653,9 +1667,19 @@ static int run_decode_and_handler (BODY *b, STATE *s, handler_t handler, int pla
/* restore final destination and substitute the tempfile for input */ /* restore final destination and substitute the tempfile for input */
s->fpout = fp; s->fpout = fp;
fp = s->fpin; fp = s->fpin;
@ -742,19 +790,19 @@
+ s->fpin = fmemopen(temp, tempsize, "r"); + s->fpin = fmemopen(temp, tempsize, "r");
+ else /* fmemopen cannot handle zero-length buffers */ + else /* fmemopen cannot handle zero-length buffers */
+ s->fpin = safe_fopen ("/dev/null", "r"); + s->fpin = safe_fopen ("/dev/null", "r");
+ if(s->fpin == NULL) + if(s->fpin == NULL) {
+ {
+ mutt_perror("failed to re-open memstream!"); + mutt_perror("failed to re-open memstream!");
+ return (-1); + return (-1);
+ } + }
+#else +#else
s->fpin = fopen (tempfile, "r"); s->fpin = fopen (tempfile, "r");
unlink (tempfile); unlink (tempfile);
-
+#endif +#endif
/* restore the prefix */ /* restore the prefix */
s->prefix = savePrefix; s->prefix = savePrefix;
@@ -1680,6 +1706,10 @@ static int run_decode_and_handler (BODY }
@@ -1680,6 +1704,10 @@ static int run_decode_and_handler (BODY *b, STATE *s, handler_t handler, int pla
/* restore the original source stream */ /* restore the original source stream */
safe_fclose (&s->fpin); safe_fclose (&s->fpin);
@ -765,9 +813,11 @@
s->fpin = fp; s->fpin = fp;
} }
} }
--- imap/command.c diff --git a/imap/command.c b/imap/command.c
+++ imap/command.c 2014-04-11 15:14:01.000000000 +0000 index 32f8417..d68e3ab 100644
@@ -1012,6 +1012,13 @@ static void cmd_parse_status (IMAP_DATA* --- a/imap/command.c
+++ b/imap/command.c
@@ -1012,6 +1012,13 @@ static void cmd_parse_status (IMAP_DATA* idata, char* s)
opened */ opened */
status->uidnext = oldun; status->uidnext = oldun;
@ -781,8 +831,10 @@
FREE (&value); FREE (&value);
return; return;
} }
--- imap/imap.c diff --git a/imap/imap.c b/imap/imap.c
+++ imap/imap.c 2014-04-11 15:14:01.000000000 +0000 index ad15f5e..6f4af88 100644
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -1523,7 +1523,7 @@ int imap_buffy_check (int force) @@ -1523,7 +1523,7 @@ int imap_buffy_check (int force)
imap_munge_mbox_name (munged, sizeof (munged), name); imap_munge_mbox_name (munged, sizeof (munged), name);
@ -792,8 +844,10 @@
if (imap_exec (idata, command, IMAP_CMD_QUEUE) < 0) if (imap_exec (idata, command, IMAP_CMD_QUEUE) < 0)
{ {
--- init.h diff --git a/init.h b/init.h
+++ init.h 2014-04-11 15:14:01.000000000 +0000 index 0055a1b..e7a1280 100644
--- a/init.h
+++ b/init.h
@@ -2016,6 +2016,54 @@ struct option_t MuttVars[] = { @@ -2016,6 +2016,54 @@ struct option_t MuttVars[] = {
** not used. ** not used.
** (PGP only) ** (PGP only)
@ -849,8 +903,10 @@
{ "pgp_use_gpg_agent", DT_BOOL, R_NONE, OPTUSEGPGAGENT, 0}, { "pgp_use_gpg_agent", DT_BOOL, R_NONE, OPTUSEGPGAGENT, 0},
/* /*
** .pp ** .pp
--- mailbox.h diff --git a/mailbox.h b/mailbox.h
+++ mailbox.h 2015-09-11 14:35:24.349518988 +0000 index 2b2c9a1..000503d 100644
--- a/mailbox.h
+++ b/mailbox.h
@@ -27,6 +27,7 @@ @@ -27,6 +27,7 @@
#define M_NEWFOLDER (1<<4) /* create a new folder - same as M_APPEND, but uses #define M_NEWFOLDER (1<<4) /* create a new folder - same as M_APPEND, but uses
* safe_fopen() for mbox-style folders. * safe_fopen() for mbox-style folders.
@ -859,8 +915,10 @@
/* mx_open_new_message() */ /* mx_open_new_message() */
#define M_ADD_FROM (1<<0) /* add a From_ line */ #define M_ADD_FROM (1<<0) /* add a From_ line */
--- main.c diff --git a/main.c b/main.c
+++ main.c 2014-04-11 15:14:01.000000000 +0000 index 9c562be..49fdc78 100644
--- a/main.c
+++ b/main.c
@@ -50,6 +50,7 @@ @@ -50,6 +50,7 @@
#include <unistd.h> #include <unistd.h>
#include <errno.h> #include <errno.h>
@ -900,8 +958,10 @@
mutt_index_menu (); mutt_index_menu ();
if (Context) if (Context)
FREE (&Context); FREE (&Context);
--- mbox.c diff --git a/mbox.c b/mbox.c
+++ mbox.c 2014-04-11 15:14:01.000000000 +0000 index 6d3b6bd..fa82eb3 100644
--- a/mbox.c
+++ b/mbox.c
@@ -104,6 +104,7 @@ int mmdf_parse_mailbox (CONTEXT *ctx) @@ -104,6 +104,7 @@ int mmdf_parse_mailbox (CONTEXT *ctx)
mutt_perror (ctx->path); mutt_perror (ctx->path);
return (-1); return (-1);
@ -918,8 +978,10 @@
#ifdef NFS_ATTRIBUTE_HACK #ifdef NFS_ATTRIBUTE_HACK
if (sb.st_mtime > sb.st_atime) if (sb.st_mtime > sb.st_atime)
--- menu.c diff --git a/menu.c b/menu.c
+++ menu.c 2014-04-13 02:31:16.000000000 +0000 index e03dd33..02c14f1 100644
--- a/menu.c
+++ b/menu.c
@@ -24,6 +24,7 @@ @@ -24,6 +24,7 @@
#include "mutt_curses.h" #include "mutt_curses.h"
#include "mutt_menu.h" #include "mutt_menu.h"
@ -928,7 +990,7 @@
extern size_t UngetCount; extern size_t UngetCount;
@@ -186,7 +187,7 @@ static void menu_pad_string (char *s, si @@ -186,7 +187,7 @@ static void menu_pad_string (char *s, size_t n)
{ {
char *scratch = safe_strdup (s); char *scratch = safe_strdup (s);
int shift = option (OPTARROWCURSOR) ? 3 : 0; int shift = option (OPTARROWCURSOR) ? 3 : 0;
@ -997,7 +1059,7 @@
print_enriched_string (menu->color(menu->current), (unsigned char *) buf, 0); print_enriched_string (menu->color(menu->current), (unsigned char *) buf, 0);
} }
menu->redraw &= REDRAW_STATUS; menu->redraw &= REDRAW_STATUS;
@@ -332,7 +334,7 @@ void menu_redraw_current (MUTTMENU *menu @@ -332,7 +334,7 @@ void menu_redraw_current (MUTTMENU *menu)
char buf[LONG_STRING]; char buf[LONG_STRING];
int attr = menu->color (menu->current); int attr = menu->color (menu->current);
@ -1015,8 +1077,10 @@
else if (option (OPTBRAILLEFRIENDLY)) else if (option (OPTBRAILLEFRIENDLY))
move (menu->current - menu->top + menu->offset, 0); move (menu->current - menu->top + menu->offset, 0);
else else
--- mh.c diff --git a/mh.c b/mh.c
+++ mh.c 2014-04-11 16:04:59.000000000 +0000 index 63e12d2..753a53c 100644
--- a/mh.c
+++ b/mh.c
@@ -295,6 +295,32 @@ void mh_buffy(BUFFY *b) @@ -295,6 +295,32 @@ void mh_buffy(BUFFY *b)
mhs_free_sequences (&mhs); mhs_free_sequences (&mhs);
} }
@ -1050,8 +1114,10 @@
static int mh_mkstemp (CONTEXT * dest, FILE ** fp, char **tgt) static int mh_mkstemp (CONTEXT * dest, FILE ** fp, char **tgt)
{ {
int fd; int fd;
--- mutt.h diff --git a/mutt.h b/mutt.h
+++ mutt.h 2015-01-26 15:01:48.000000000 +0000 index 8e92ea0..1cc3a31 100644
--- a/mutt.h
+++ b/mutt.h
@@ -429,6 +429,10 @@ enum @@ -429,6 +429,10 @@ enum
OPTSAVENAME, OPTSAVENAME,
OPTSENDGROUPREPLYTO, OPTSENDGROUPREPLYTO,
@ -1079,8 +1145,10 @@
/* driver hooks */ /* driver hooks */
void *data; /* driver specific data */ void *data; /* driver specific data */
--- mutt_curses.h diff --git a/mutt_curses.h b/mutt_curses.h
+++ mutt_curses.h 2015-09-11 14:35:48.925520615 +0000 index f8bc47c..ef9884e 100644
--- a/mutt_curses.h
+++ b/mutt_curses.h
@@ -64,6 +64,7 @@ @@ -64,6 +64,7 @@
#undef lines #undef lines
#endif /* lines */ #endif /* lines */
@ -1089,17 +1157,19 @@
#define CLEARLINE(x) move(x,0), clrtoeol() #define CLEARLINE(x) move(x,0), clrtoeol()
#define CENTERLINE(x,y) move(y, (COLS-strlen(x))/2), addstr(x) #define CENTERLINE(x,y) move(y, (COLS-strlen(x))/2), addstr(x)
#define BEEP() do { if (option (OPTBEEP)) beep(); } while (0) #define BEEP() do { if (option (OPTBEEP)) beep(); } while (0)
@@ -120,6 +121,8 @@ enum @@ -121,6 +122,8 @@ enum
MT_COLOR_BOLD,
MT_COLOR_UNDERLINE, MT_COLOR_UNDERLINE,
MT_COLOR_INDEX, MT_COLOR_INDEX,
MT_COLOR_PROMPT,
+ MT_COLOR_NEW, + MT_COLOR_NEW,
+ MT_COLOR_FLAGGED, + MT_COLOR_FLAGGED,
MT_COLOR_PROMPT,
MT_COLOR_MAX MT_COLOR_MAX
}; };
--- mutt_menu.h
+++ mutt_menu.h 2014-04-11 15:14:01.000000000 +0000 diff --git a/mutt_menu.h b/mutt_menu.h
index 8192019..aea89f1 100644
--- a/mutt_menu.h
+++ b/mutt_menu.h
@@ -34,6 +34,7 @@ @@ -34,6 +34,7 @@
#define REDRAW_FULL (1<<5) #define REDRAW_FULL (1<<5)
#define REDRAW_BODY (1<<6) #define REDRAW_BODY (1<<6)
@ -1108,9 +1178,11 @@
#define M_MODEFMT "-- Mutt: %s" #define M_MODEFMT "-- Mutt: %s"
--- muttlib.c diff --git a/muttlib.c b/muttlib.c
+++ muttlib.c 2014-04-11 15:14:01.000000000 +0000 index 02067cc..8d0c13d 100644
@@ -1276,6 +1276,8 @@ void mutt_FormatString (char *dest, /* --- a/muttlib.c
+++ b/muttlib.c
@@ -1276,6 +1276,8 @@ void mutt_FormatString (char *dest, /* output buffer */
pl = pw = 1; pl = pw = 1;
/* see if there's room to add content, else ignore */ /* see if there's room to add content, else ignore */
@ -1119,7 +1191,7 @@
if ((col < COLS && wlen < destlen) || soft) if ((col < COLS && wlen < destlen) || soft)
{ {
int pad; int pad;
@@ -1319,6 +1321,52 @@ void mutt_FormatString (char *dest, /* @@ -1319,6 +1321,52 @@ void mutt_FormatString (char *dest, /* output buffer */
col += wid; col += wid;
src += pl; src += pl;
} }
@ -1172,9 +1244,11 @@
break; /* skip rest of input */ break; /* skip rest of input */
} }
else if (ch == '|') else if (ch == '|')
--- mx.c diff --git a/mx.c b/mx.c
+++ mx.c 2015-01-26 15:02:43.000000000 +0000 index 495b295..1cb966c 100644
@@ -596,6 +596,7 @@ static int mx_open_mailbox_append (CONTE --- a/mx.c
+++ b/mx.c
@@ -596,6 +596,7 @@ static int mx_open_mailbox_append (CONTEXT *ctx, int flags)
* M_APPEND open mailbox for appending * M_APPEND open mailbox for appending
* M_READONLY open mailbox in read-only mode * M_READONLY open mailbox in read-only mode
* M_QUIET only print error messages * M_QUIET only print error messages
@ -1182,7 +1256,7 @@
* ctx if non-null, context struct to use * ctx if non-null, context struct to use
*/ */
CONTEXT *mx_open_mailbox (const char *path, int flags, CONTEXT *pctx) CONTEXT *mx_open_mailbox (const char *path, int flags, CONTEXT *pctx)
@@ -618,6 +619,8 @@ CONTEXT *mx_open_mailbox (const char *pa @@ -618,6 +619,8 @@ CONTEXT *mx_open_mailbox (const char *path, int flags, CONTEXT *pctx)
ctx->quiet = 1; ctx->quiet = 1;
if (flags & M_READONLY) if (flags & M_READONLY)
ctx->readonly = 1; ctx->readonly = 1;
@ -1191,7 +1265,7 @@
if (flags & (M_APPEND|M_NEWFOLDER)) if (flags & (M_APPEND|M_NEWFOLDER))
{ {
@@ -722,13 +725,26 @@ CONTEXT *mx_open_mailbox (const char *pa @@ -722,13 +725,26 @@ CONTEXT *mx_open_mailbox (const char *path, int flags, CONTEXT *pctx)
void mx_fastclose_mailbox (CONTEXT *ctx) void mx_fastclose_mailbox (CONTEXT *ctx)
{ {
int i; int i;
@ -1228,7 +1302,7 @@
FREE (&ctx->hdrs); FREE (&ctx->hdrs);
FREE (&ctx->v2r); FREE (&ctx->v2r);
#ifdef USE_COMPRESSED #ifdef USE_COMPRESSED
@@ -843,6 +861,10 @@ int mx_close_mailbox (CONTEXT *ctx, int @@ -843,6 +861,10 @@ int mx_close_mailbox (CONTEXT *ctx, int *index_hint)
if (!ctx->hdrs[i]->deleted && ctx->hdrs[i]->read if (!ctx->hdrs[i]->deleted && ctx->hdrs[i]->read
&& !(ctx->hdrs[i]->flagged && option (OPTKEEPFLAGGED))) && !(ctx->hdrs[i]->flagged && option (OPTKEEPFLAGGED)))
read_msgs++; read_msgs++;
@ -1239,9 +1313,11 @@
} }
if (read_msgs && quadoption (OPT_MOVE) != M_NO) if (read_msgs && quadoption (OPT_MOVE) != M_NO)
--- mx.h diff --git a/mx.h b/mx.h
+++ mx.h 2014-04-11 16:11:47.000000000 +0000 index 2ef4ec7..a6d1f0a 100644
@@ -60,6 +60,7 @@ void mbox_reset_atime (CONTEXT *, struct --- a/mx.h
+++ b/mx.h
@@ -60,6 +60,7 @@ void mbox_reset_atime (CONTEXT *, struct stat *);
int mh_read_dir (CONTEXT *, const char *); int mh_read_dir (CONTEXT *, const char *);
int mh_sync_mailbox (CONTEXT *, int *); int mh_sync_mailbox (CONTEXT *, int *);
int mh_check_mailbox (CONTEXT *, int *); int mh_check_mailbox (CONTEXT *, int *);
@ -1249,8 +1325,10 @@
int mh_check_empty (const char *); int mh_check_empty (const char *);
int maildir_read_dir (CONTEXT *); int maildir_read_dir (CONTEXT *);
--- pager.c diff --git a/pager.c b/pager.c
+++ pager.c 2015-09-11 14:38:26.933518856 +0000 index 4f7e7be..ba8ab7a 100644
--- a/pager.c
+++ b/pager.c
@@ -29,6 +29,7 @@ @@ -29,6 +29,7 @@
#include "pager.h" #include "pager.h"
#include "attach.h" #include "attach.h"
@ -1259,7 +1337,7 @@
#include "mutt_crypt.h" #include "mutt_crypt.h"
@@ -1095,6 +1096,7 @@ static int format_line (struct line_t ** @@ -1095,6 +1096,7 @@ static int format_line (struct line_t **lineInfo, int n, unsigned char *buf,
wchar_t wc; wchar_t wc;
mbstate_t mbstate; mbstate_t mbstate;
int wrap_cols = mutt_term_width ((flags & M_PAGER_NOWRAP) ? 0 : Wrap); int wrap_cols = mutt_term_width ((flags & M_PAGER_NOWRAP) ? 0 : Wrap);
@ -1267,7 +1345,7 @@
if (check_attachment_marker ((char *)buf) == 0) if (check_attachment_marker ((char *)buf) == 0)
wrap_cols = COLS; wrap_cols = COLS;
@@ -1572,6 +1574,7 @@ mutt_pager (const char *banner, const ch @@ -1572,6 +1574,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t *extra)
int bodyoffset = 1; /* offset of first line of real text */ int bodyoffset = 1; /* offset of first line of real text */
int statusoffset = 0; /* offset for the status bar */ int statusoffset = 0; /* offset for the status bar */
@ -1275,7 +1353,7 @@
int helpoffset = LINES - 2; /* offset for the help bar. */ int helpoffset = LINES - 2; /* offset for the help bar. */
int bodylen = LINES - 2 - bodyoffset; /* length of displayable area */ int bodylen = LINES - 2 - bodyoffset; /* length of displayable area */
@@ -1746,7 +1749,7 @@ mutt_pager (const char *banner, const ch @@ -1746,7 +1749,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t *extra)
if ((redraw & REDRAW_BODY) || topline != oldtopline) if ((redraw & REDRAW_BODY) || topline != oldtopline)
{ {
do { do {
@ -1284,7 +1362,7 @@
curline = oldtopline = topline; curline = oldtopline = topline;
lines = 0; lines = 0;
force_redraw = 0; force_redraw = 0;
@@ -1759,6 +1762,7 @@ mutt_pager (const char *banner, const ch @@ -1759,6 +1762,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t *extra)
&QuoteList, &q_level, &force_redraw, &SearchRE) > 0) &QuoteList, &q_level, &force_redraw, &SearchRE) > 0)
lines++; lines++;
curline++; curline++;
@ -1292,7 +1370,7 @@
} }
last_offset = lineInfo[curline].offset; last_offset = lineInfo[curline].offset;
} while (force_redraw); } while (force_redraw);
@@ -1771,6 +1775,7 @@ mutt_pager (const char *banner, const ch @@ -1771,6 +1775,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t *extra)
addch ('~'); addch ('~');
addch ('\n'); addch ('\n');
lines++; lines++;
@ -1300,7 +1378,7 @@
} }
NORMAL_COLOR; NORMAL_COLOR;
@@ -1788,29 +1793,40 @@ mutt_pager (const char *banner, const ch @@ -1788,29 +1793,39 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t *extra)
hfi.ctx = Context; hfi.ctx = Context;
hfi.pager_progress = pager_progress_str; hfi.pager_progress = pager_progress_str;
@ -1315,8 +1393,7 @@
- move (statusoffset, 0); - move (statusoffset, 0);
+ move (statusoffset, SidebarWidth); + move (statusoffset, SidebarWidth);
SETCOLOR (MT_COLOR_STATUS); SETCOLOR (MT_COLOR_STATUS);
+ if (option(OPTSTATUSONTOP) && PagerIndexLines > 0) + if(option(OPTSTATUSONTOP) && PagerIndexLines > 0) {
+ {
+ CLEARLINE_WIN (statusoffset); + CLEARLINE_WIN (statusoffset);
+ } else { + } else {
+ CLEARLINE (statusoffset); + CLEARLINE (statusoffset);
@ -1345,7 +1422,7 @@
NORMAL_COLOR; NORMAL_COLOR;
if (option(OPTTSENABLED) && TSSupported) if (option(OPTTSENABLED) && TSSupported)
{ {
@@ -1826,16 +1842,22 @@ mutt_pager (const char *banner, const ch @@ -1826,16 +1841,22 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t *extra)
/* redraw the pager_index indicator, because the /* redraw the pager_index indicator, because the
* flags for this message might have changed. */ * flags for this message might have changed. */
menu_redraw_current (index); menu_redraw_current (index);
@ -1370,7 +1447,7 @@
redraw = 0; redraw = 0;
if (option(OPTBRAILLEFRIENDLY)) { if (option(OPTBRAILLEFRIENDLY)) {
@@ -2770,6 +2792,13 @@ search_next: @@ -2770,6 +2791,13 @@ search_next:
mutt_what_key (); mutt_what_key ();
break; break;
@ -1384,9 +1461,11 @@
default: default:
ch = -1; ch = -1;
break; break;
--- pattern.c diff --git a/pattern.c b/pattern.c
+++ pattern.c 2014-04-11 15:14:01.000000000 +0000 index 7af1c38..379f064 100644
@@ -154,6 +154,10 @@ msg_search (CONTEXT *ctx, pattern_t* pat --- a/pattern.c
+++ b/pattern.c
@@ -154,6 +154,10 @@ msg_search (CONTEXT *ctx, pattern_t* pat, int msgno)
HEADER *h = ctx->hdrs[msgno]; HEADER *h = ctx->hdrs[msgno];
char *buf; char *buf;
size_t blen; size_t blen;
@ -1397,7 +1476,7 @@
if ((msg = mx_open_message (ctx, msgno)) != NULL) if ((msg = mx_open_message (ctx, msgno)) != NULL)
{ {
@@ -163,12 +167,20 @@ msg_search (CONTEXT *ctx, pattern_t* pat @@ -163,12 +167,20 @@ msg_search (CONTEXT *ctx, pattern_t* pat, int msgno)
memset (&s, 0, sizeof (s)); memset (&s, 0, sizeof (s));
s.fpin = msg->fp; s.fpin = msg->fp;
s.flags = M_CHARCONV; s.flags = M_CHARCONV;
@ -1418,7 +1497,7 @@
if (pat->op != M_BODY) if (pat->op != M_BODY)
mutt_copy_header (msg->fp, h, s.fpout, CH_FROM | CH_DECODE, NULL); mutt_copy_header (msg->fp, h, s.fpout, CH_FROM | CH_DECODE, NULL);
@@ -184,7 +196,11 @@ msg_search (CONTEXT *ctx, pattern_t* pat @@ -184,7 +196,11 @@ msg_search (CONTEXT *ctx, pattern_t* pat, int msgno)
if (s.fpout) if (s.fpout)
{ {
safe_fclose (&s.fpout); safe_fclose (&s.fpout);
@ -1430,7 +1509,7 @@
} }
return (0); return (0);
} }
@@ -193,11 +209,28 @@ msg_search (CONTEXT *ctx, pattern_t* pat @@ -193,11 +209,28 @@ msg_search (CONTEXT *ctx, pattern_t* pat, int msgno)
mutt_body_handler (h->content, &s); mutt_body_handler (h->content, &s);
} }
@ -1459,7 +1538,7 @@
} }
else else
{ {
@@ -244,7 +277,12 @@ msg_search (CONTEXT *ctx, pattern_t* pat @@ -244,7 +277,12 @@ msg_search (CONTEXT *ctx, pattern_t* pat, int msgno)
if (option (OPTTHOROUGHSRC)) if (option (OPTTHOROUGHSRC))
{ {
safe_fclose (&fp); safe_fclose (&fp);
@ -1472,8 +1551,10 @@
} }
} }
--- protos.h diff --git a/protos.h b/protos.h
+++ protos.h 2014-04-11 15:14:01.000000000 +0000 index 2ba4d1d..5126f10 100644
--- a/protos.h
+++ b/protos.h
@@ -36,6 +36,13 @@ struct hdr_format_info @@ -36,6 +36,13 @@ struct hdr_format_info
const char *pager_progress; const char *pager_progress;
}; };
@ -1488,9 +1569,12 @@
void mutt_make_string_info (char *, size_t, const char *, struct hdr_format_info *, format_flag); void mutt_make_string_info (char *, size_t, const char *, struct hdr_format_info *, format_flag);
int mutt_extract_token (BUFFER *, BUFFER *, int); int mutt_extract_token (BUFFER *, BUFFER *, int);
--- sidebar.c diff --git a/sidebar.c b/sidebar.c
+++ sidebar.c 2014-04-11 15:14:01.000000000 +0000 new file mode 100644
@@ -0,0 +1,405 @@ index 0000000..e9d9eba
--- /dev/null
+++ b/sidebar.c
@@ -0,0 +1,410 @@
+/* +/*
+ * Copyright (C) ????-2004 Justin Hibbits <jrh29@po.cwru.edu> + * Copyright (C) ????-2004 Justin Hibbits <jrh29@po.cwru.edu>
+ * Copyright (C) 2004 Thomer M. Gil <mutt@thomer.com> + * Copyright (C) 2004 Thomer M. Gil <mutt@thomer.com>
@ -1608,8 +1692,12 @@
+ break; + break;
+ +
+ case 'S': + case 'S':
+ if(!optional) {
+ snprintf (fmt, sizeof (fmt), "%%%sd", prefix); + snprintf (fmt, sizeof (fmt), "%%%sd", prefix);
+ snprintf (dest, destlen, fmt, sbe->size); + snprintf (dest, destlen, fmt, sbe->size);
+ } else if (sbe->size == 0) {
+ optional = 0;
+ }
+ break; + break;
+ +
+ case 'N': + case 'N':
@ -1789,7 +1877,8 @@
+ SETCOLOR(MT_COLOR_NORMAL); + SETCOLOR(MT_COLOR_NORMAL);
+ +
+ move( lines, 0 ); + move( lines, 0 );
+ if ( Context && (!strcmp(tmp->path, Context->path)|| + if ( Context && Context->path &&
+ (!strcmp(tmp->path, Context->path)||
+ !strcmp(tmp->realpath, Context->path)) ) { + !strcmp(tmp->realpath, Context->path)) ) {
+ tmp->msg_unread = Context->unread; + tmp->msg_unread = Context->unread;
+ tmp->msgcount = Context->msgcount; + tmp->msgcount = Context->msgcount;
@ -1896,8 +1985,11 @@
+ draw_sidebar(menu); + draw_sidebar(menu);
+} +}
+ +
--- sidebar.h diff --git a/sidebar.h b/sidebar.h
+++ sidebar.h 2014-04-11 15:14:01.000000000 +0000 new file mode 100644
index 0000000..d195f11
--- /dev/null
+++ b/sidebar.h
@@ -0,0 +1,36 @@ @@ -0,0 +1,36 @@
+/* +/*
+ * Copyright (C) ????-2004 Justin Hibbits <jrh29@po.cwru.edu> + * Copyright (C) ????-2004 Justin Hibbits <jrh29@po.cwru.edu>
@ -1935,3 +2027,6 @@
+void set_buffystats(CONTEXT*); +void set_buffystats(CONTEXT*);
+ +
+#endif /* SIDEBAR_H */ +#endif /* SIDEBAR_H */
--
2.6.2

2
patch-1.5.24.vk.pgp_verbose_mime
View File

@ -10,7 +10,7 @@
@@ -1,3 +1,4 @@ @@ -1,3 +1,4 @@
+patch-1.5.3.vk.pgp_verbose_mime +patch-1.5.3.vk.pgp_verbose_mime
patch-1.5.9.aw.listreply.1 patch-1.5.9.aw.listreply.1
patch-1.5.23.sidebar.20140412.txt patch-1.5.24.sidebar.20151111.txt
rr.compressed rr.compressed
--- globals.h --- globals.h
+++ globals.h 2012-04-11 04:52:45.000000000 +0000 +++ globals.h 2012-04-11 04:52:45.000000000 +0000

25
widechar.sidebar.dif
View File

@ -2,9 +2,11 @@
handler.c | 14 ++++++++------ handler.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-) 1 file changed, 8 insertions(+), 6 deletions(-)
--- handler.c diff --git a/handler.c b/handler.c
+++ handler.c 2015-09-11 14:52:40.778018507 +0000 index 8c3b699..6f8d77c 100644
@@ -780,7 +780,7 @@ static void enriched_set_flags (const wc --- a/handler.c
+++ b/handler.c
@@ -780,7 +780,7 @@ static void enriched_set_flags (const wchar_t *tag, struct enriched_state *stte)
static int text_enriched_handler (BODY *a, STATE *s) static int text_enriched_handler (BODY *a, STATE *s)
{ {
enum { enum {
@ -13,7 +15,7 @@
} state = TEXT; } state = TEXT;
long bytes = a->length; long bytes = a->length;
@@ -809,7 +809,7 @@ static int text_enriched_handler (BODY * @@ -809,7 +809,7 @@ static int text_enriched_handler (BODY *a, STATE *s)
{ {
if (state != ST_EOF) if (state != ST_EOF)
{ {
@ -22,7 +24,7 @@
state = ST_EOF; state = ST_EOF;
else else
bytes--; bytes--;
@@ -817,6 +817,8 @@ static int text_enriched_handler (BODY * @@ -817,6 +817,8 @@ static int text_enriched_handler (BODY *a, STATE *s)
switch (state) switch (state)
{ {
@ -31,7 +33,7 @@
case TEXT : case TEXT :
switch (wc) switch (wc)
{ {
@@ -877,9 +879,8 @@ static int text_enriched_handler (BODY * @@ -877,9 +879,8 @@ static int text_enriched_handler (BODY *a, STATE *s)
enriched_flush (&stte, 1); enriched_flush (&stte, 1);
else else
{ {
@ -42,7 +44,7 @@
} }
break; break;
@@ -1567,7 +1568,7 @@ void mutt_decode_attachment (BODY *b, ST @@ -1567,7 +1568,7 @@ void mutt_decode_attachment (BODY *b, STATE *s)
* strip all trailing spaces to improve interoperability; * strip all trailing spaces to improve interoperability;
* if $text_flowed is unset, simply verbatim copy input * if $text_flowed is unset, simply verbatim copy input
*/ */
@ -51,7 +53,7 @@
{ {
char *buf = NULL; char *buf = NULL;
size_t l = 0, sz = 0; size_t l = 0, sz = 0;
@@ -1595,7 +1596,6 @@ static int run_decode_and_handler (BODY @@ -1595,7 +1596,6 @@ static int run_decode_and_handler (BODY *b, STATE *s, handler_t handler, int pla
int origType; int origType;
char *savePrefix = NULL; char *savePrefix = NULL;
FILE *fp = NULL; FILE *fp = NULL;
@ -59,7 +61,7 @@
size_t tmplength = 0; size_t tmplength = 0;
LOFF_T tmpoffset = 0; LOFF_T tmpoffset = 0;
int decode = 0; int decode = 0;
@@ -1604,6 +1604,8 @@ static int run_decode_and_handler (BODY @@ -1606,6 +1606,8 @@ static int run_decode_and_handler (BODY *b, STATE *s, handler_t handler, int pla
#ifdef HAVE_FMEMOPEN #ifdef HAVE_FMEMOPEN
char *temp; char *temp;
size_t tempsize; size_t tempsize;
@ -67,4 +69,7 @@
+ char tempfile[_POSIX_PATH_MAX]; + char tempfile[_POSIX_PATH_MAX];
#endif #endif
fseeko (s->fpin, b->offset, 0); /* see if we need to decode this part before processing it */
--
2.6.2