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]
/
keymap.c
diff --git
a/keymap.c
b/keymap.c
index
9db65e9
..
b480455
100644
(file)
--- a/
keymap.c
+++ b/
keymap.c
@@
-12,6
+12,8
@@
#endif
#include "mutt.h"
#endif
#include "mutt.h"
+#include "buffer.h"
+#include "ascii.h"
#include "mutt_menu.h"
#include "mutt_curses.h"
#include "keymap.h"
#include "mutt_menu.h"
#include "mutt_curses.h"
#include "keymap.h"
@@
-79,6
+81,9
@@
static struct mapping_t KeyNames[] = {
{"<Space>", ' '},
#ifdef KEY_BTAB
{"<BackTab>", KEY_BTAB},
{"<Space>", ' '},
#ifdef KEY_BTAB
{"<BackTab>", KEY_BTAB},
+#endif
+#ifdef KEY_NEXT
+ {"<Next>", KEY_NEXT},
#endif
{NULL, 0}
};
#endif
{NULL, 0}
};
@@
-92,9
+97,9
@@
static struct keymap_t *allocKeys (int len, keycode_t * keys)
{
struct keymap_t *p;
{
struct keymap_t *p;
- p =
safe
_calloc (1, sizeof (struct keymap_t));
+ p =
mem
_calloc (1, sizeof (struct keymap_t));
p->len = len;
p->len = len;
- p->keys =
safe
_malloc (len * sizeof (keycode_t));
+ p->keys =
mem
_malloc (len * sizeof (keycode_t));
memcpy (p->keys, keys, len * sizeof (keycode_t));
return (p);
}
memcpy (p->keys, keys, len * sizeof (keycode_t));
return (p);
}
@@
-200,10
+205,10
@@
void km_bind (char *s, int menu, int op, char *macro, char *descr)
do {
len = tmp->eq;
next = tmp->next;
do {
len = tmp->eq;
next = tmp->next;
-
FREE
(&tmp->macro);
-
FREE
(&tmp->keys);
-
FREE
(&tmp->descr);
-
FREE
(&tmp);
+
mem_free
(&tmp->macro);
+
mem_free
(&tmp->keys);
+
mem_free
(&tmp->descr);
+
mem_free
(&tmp);
tmp = next;
}
while (tmp && len >= pos);
tmp = next;
}
while (tmp && len >= pos);
@@
-316,7
+321,7
@@
static void push_string (char *s)
}
}
}
}
}
}
- mutt_ungetch (*p--, 0);
+ mutt_ungetch (
(unsigned char)
*p--, 0);
}
}
}
}
@@
-707,7
+712,7
@@
static char *parse_keymap (int *menu, BUFFER * s, int maxmenus, int *nummenus,
strfcpy (err->data, _("too few arguments"), err->dsize);
}
error:
strfcpy (err->data, _("too few arguments"), err->dsize);
}
error:
-
FREE
(&buf.data);
+
mem_free
(&buf.data);
return (NULL);
}
return (NULL);
}
@@
-807,7
+812,7
@@
int mutt_parse_bind (BUFFER * buf, BUFFER * s, unsigned long data,
}
}
}
}
}
}
-
FREE
(&key);
+
mem_free
(&key);
return (r);
}
return (r);
}
@@
-845,7
+850,7
@@
int mutt_parse_macro (BUFFER * buf, BUFFER * s, unsigned long data,
}
}
}
}
-
FREE
(&seq);
+
mem_free
(&seq);
}
else {
for (i = 0; i < nummenus; ++i) {
}
else {
for (i = 0; i < nummenus; ++i) {
@@
-854,7
+859,7
@@
int mutt_parse_macro (BUFFER * buf, BUFFER * s, unsigned long data,
}
}
}
}
}
}
-
FREE
(&key);
+
mem_free
(&key);
return (r);
}
return (r);
}