projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix comparison between int and size_t
[apps/madmutt.git]
/
menu.c
diff --git
a/menu.c
b/menu.c
index
91abff1
..
90e2bdc
100644
(file)
--- a/
menu.c
+++ b/
menu.c
@@
-22,10
+22,7
@@
#include "mbyte.h"
#include "sidebar.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
+625,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];
}
@@
-687,7
+684,7
@@
static int menu_search (MUTTMENU * menu, int op)
_("Reverse search for: "),
buf, sizeof (buf), M_CLEAR) != 0 || !buf[0])
return (-1);
_("Reverse search for: "),
buf, sizeof (buf), M_CLEAR) != 0 || !buf[0])
return (-1);
-
str_replace
(&menu->searchBuf, buf);
+
m_strreplace
(&menu->searchBuf, buf);
menu->searchDir = (op == OP_SEARCH) ? M_SEARCH_DOWN : M_SEARCH_UP;
}
else {
menu->searchDir = (op == OP_SEARCH) ? M_SEARCH_DOWN : M_SEARCH_UP;
}
else {
@@
-808,10
+805,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
+970,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;
}