projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move the last crypt-* things into lib-crypt, adapt configure.ac
[apps/madmutt.git]
/
menu.c
diff --git
a/menu.c
b/menu.c
index
05b6b11
..
4c58f1b
100644
(file)
--- a/
menu.c
+++ b/
menu.c
@@
-15,17
+15,15
@@
#include <lib-lib/str.h>
#include <lib-lib/macros.h>
#include <lib-lib/str.h>
#include <lib-lib/macros.h>
+#include <lib-ui/curses.h>
+#include <lib-ui/enter.h>
+
#include "mutt.h"
#include "mutt.h"
-#include "enter.h"
-#include "mutt_curses.h"
#include "mutt_menu.h"
#include "mbyte.h"
#include "sidebar.h"
#include "mutt_menu.h"
#include "mbyte.h"
#include "sidebar.h"
-#ifdef USE_IMAP
-#include "imap.h"
-#endif
-
+#include <imap/imap.h>
#include <string.h>
#include <stdlib.h>
#include <string.h>
#include <stdlib.h>
@@
-628,7
+626,7
@@
void menu_prev_entry (MUTTMENU * menu)
mutt_error _("You are on the first entry.");
}
mutt_error _("You are on the first entry.");
}
-static int default_color (int i)
+static int default_color (int i
__attribute__ ((unused))
)
{
return ColorDefs[MT_COLOR_NORMAL];
}
{
return ColorDefs[MT_COLOR_NORMAL];
}
@@
-808,10
+806,7
@@
int mutt_menuLoop (MUTTMENU * menu)
mutt_curs_set (0);
mutt_curs_set (0);
-
-#ifdef USE_IMAP
imap_keepalive ();
imap_keepalive ();
-#endif
if (menu_redraw (menu) == OP_REDRAW)
return OP_REDRAW;
if (menu_redraw (menu) == OP_REDRAW)
return OP_REDRAW;
@@
-976,10
+971,10
@@
int mutt_menuLoop (MUTTMENU * menu)
menu->redraw = REDRAW_INDEX;
}
else if (menu->max) {
menu->redraw = REDRAW_INDEX;
}
else if (menu->max) {
- int
i
= menu->tag (menu, menu->current, -1);
+ int
t
= menu->tag (menu, menu->current, -1);
- menu->tagged +=
i
;
- if (
i
&& option (OPTRESOLVE) && menu->current < menu->max - 1) {
+ menu->tagged +=
t
;
+ if (
t
&& option (OPTRESOLVE) && menu->current < menu->max - 1) {
menu->current++;
menu->redraw = REDRAW_MOTION_RESYNCH;
}
menu->current++;
menu->redraw = REDRAW_MOTION_RESYNCH;
}