projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
oops, we don't need that. fix a regression in <esc>e
[apps/madmutt.git]
/
history.c
diff --git
a/history.c
b/history.c
index
27c345b
..
92bdb9f
100644
(file)
--- a/
history.c
+++ b/
history.c
@@
-11,9
+11,10
@@
# include "config.h"
#endif
# include "config.h"
#endif
+#include <lib-lib/mem.h>
+
#include "mutt.h"
#include "history.h"
#include "mutt.h"
#include "history.h"
-#include "lib/mem.h"
/* global vars used for the string-history routines */
/* global vars used for the string-history routines */
@@
-33,13
+34,13
@@
static void init_history (struct history *h)
if (OldSize) {
if (h->hist) {
for (i = 0; i < OldSize; i++)
if (OldSize) {
if (h->hist) {
for (i = 0; i < OldSize; i++)
-
FREE
(&h->hist[i]);
-
FREE
(&h->hist);
+
p_delete
(&h->hist[i]);
+
p_delete
(&h->hist);
}
}
if (HistSize)
}
}
if (HistSize)
- h->hist =
safe_calloc (HistSize, sizeof (char *)
);
+ h->hist =
p_new(char *, HistSize
);
h->cur = 0;
h->last = 0;
h->cur = 0;
h->last = 0;
@@
-70,8
+71,8
@@
void mutt_history_add (history_class_t hclass, const char *s)
prev = h->last - 1;
if (prev < 0)
prev = HistSize - 1;
prev = h->last - 1;
if (prev < 0)
prev = HistSize - 1;
- if (!h->hist[prev] || m
utt_strcmp
(h->hist[prev], s) != 0) {
- m
utt_str_replace
(&h->hist[h->last++], s);
+ if (!h->hist[prev] || m
_strcmp
(h->hist[prev], s) != 0) {
+ m
_strreplace
(&h->hist[h->last++], s);
if (h->last > HistSize - 1)
h->last = 0;
}
if (h->last > HistSize - 1)
h->last = 0;
}
@@
-79,7
+80,7
@@
void mutt_history_add (history_class_t hclass, const char *s)
h->cur = h->last; /* reset to the last entry */
}
h->cur = h->last; /* reset to the last entry */
}
-char *mutt_history_next (history_class_t hclass)
+c
onst c
har *mutt_history_next (history_class_t hclass)
{
int next;
struct history *h = &History[hclass];
{
int next;
struct history *h = &History[hclass];
@@
-94,7
+95,7
@@
char *mutt_history_next (history_class_t hclass)
return (h->hist[h->cur] ? h->hist[h->cur] : "");
}
return (h->hist[h->cur] ? h->hist[h->cur] : "");
}
-char *mutt_history_prev (history_class_t hclass)
+c
onst c
har *mutt_history_prev (history_class_t hclass)
{
int prev;
struct history *h = &History[hclass];
{
int prev;
struct history *h = &History[hclass];