projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rocco Rutte:
[apps/madmutt.git]
/
curs_main.c
diff --git
a/curs_main.c
b/curs_main.c
index
e5b9b63
..
1e50716
100644
(file)
--- a/
curs_main.c
+++ b/
curs_main.c
@@
-195,7
+195,7
@@
int index_color (int index_no)
{
HEADER *h = Context->hdrs[Context->v2r[index_no]];
{
HEADER *h = Context->hdrs[Context->v2r[index_no]];
- if (h->pair)
+ if (h
&& h
->pair)
return h->pair;
mutt_set_header_color (Context, h);
return h->pair;
mutt_set_header_color (Context, h);
@@
-479,8
+479,12
@@
int mutt_index_menu (void)
#endif
IndexHelp);
#endif
IndexHelp);
- if (!attach_msg)
+ if (!attach_msg)
{
mutt_buffy_check(1); /* force the buffy check after we enter the folder */
mutt_buffy_check(1); /* force the buffy check after we enter the folder */
+ /* record folder we open to place sidebar indicator properly */
+ if (Context && Context->path)
+ set_curbuffy(Context->path);
+ }
FOREVER
{
FOREVER
{
@@
-1066,7
+1070,7
@@
CHECK_IMAP_ACL(IMAP_ACL_DELETE);
break;
}
break;
}
- if (query_quadoption (OPT_QUIT, _("Quit Mutt?")) == M_YES)
+ if (query_quadoption (OPT_QUIT, _("Quit Mutt
-ng
?")) == M_YES)
{
int check;
{
int check;
@@
-1277,7
+1281,11
@@
CHECK_IMAP_ACL(IMAP_ACL_DELETE);
}
else
#endif
}
else
#endif
- mutt_buffy (buf, sizeof (buf));
+ {
+ if (Context && Context->path)
+ strncpy (buf, Context->path, sizeof (buf));
+ mutt_buffy (buf, sizeof (buf));
+ }
if ( op == OP_SIDEBAR_OPEN ) {
if(!CurBuffy)
if ( op == OP_SIDEBAR_OPEN ) {
if(!CurBuffy)
@@
-1306,6
+1314,7
@@
CHECK_IMAP_ACL(IMAP_ACL_DELETE);
mutt_error (_("%s is not a mailbox."), buf);
break;
}
mutt_error (_("%s is not a mailbox."), buf);
break;
}
+ mutt_str_replace (&CurrentFolder, buf);
if (Context)
{
if (Context)
{