#endif
#include "mutt.h"
+#include "enter.h"
#include "mutt_curses.h"
#include "keymap.h"
#include "mutt_menu.h"
#include "sort.h"
#include "pager.h"
#include "attach.h"
+#include "recvattach.h"
#include "mbyte.h"
#include "sidebar.h"
#include "buffy.h"
static const char *Function_not_permitted_in_attach_message_mode =
N_("Function not permitted in attach-message mode.");
+/* hack to return to position when returning from index to same message */
+static int TopLine = 0;
+static HEADER *OldHdr = NULL;
+
#define CHECK_MODE(x) if (!(x)) \
{ \
mutt_flushinp (); \
cleanup_quote (&((*QuoteList)->down));
ptr = (*QuoteList)->next;
if ((*QuoteList)->prefix)
- FREE (&(*QuoteList)->prefix);
- FREE (QuoteList);
+ mem_free (&(*QuoteList)->prefix);
+ mem_free (QuoteList);
*QuoteList = ptr;
}
/* not much point in classifying quotes... */
if (*QuoteList == NULL) {
- class = (struct q_class_t *) safe_calloc (1, sizeof (struct q_class_t));
+ class = (struct q_class_t *) mem_calloc (1, sizeof (struct q_class_t));
class->color = ColorQuote[0];
*QuoteList = class;
}
if (tmp == NULL) {
/* add a node above q_list */
tmp =
- (struct q_class_t *) safe_calloc (1, sizeof (struct q_class_t));
- tmp->prefix = (char *) safe_calloc (1, length + 1);
+ (struct q_class_t *) mem_calloc (1, sizeof (struct q_class_t));
+ tmp->prefix = (char *) mem_calloc (1, length + 1);
strncpy (tmp->prefix, qptr, length);
tmp->length = length;
/* found shorter common prefix */
if (tmp == NULL) {
/* add a node above q_list */
- tmp = (struct q_class_t *) safe_calloc (1,
+ tmp = (struct q_class_t *) mem_calloc (1,
sizeof (struct
q_class_t));
- tmp->prefix = (char *) safe_calloc (1, length + 1);
+ tmp->prefix = (char *) mem_calloc (1, length + 1);
strncpy (tmp->prefix, qptr, length);
tmp->length = length;
/* still not found so far: add it as a sibling to the current node */
if (class == NULL) {
tmp =
- (struct q_class_t *) safe_calloc (1, sizeof (struct q_class_t));
- tmp->prefix = (char *) safe_calloc (1, length + 1);
+ (struct q_class_t *) mem_calloc (1, sizeof (struct q_class_t));
+ tmp->prefix = (char *) mem_calloc (1, length + 1);
strncpy (tmp->prefix, qptr, length);
tmp->length = length;
if (class == NULL) {
/* not found so far: add it as a top level class */
- class = (struct q_class_t *) safe_calloc (1, sizeof (struct q_class_t));
- class->prefix = (char *) safe_calloc (1, length + 1);
+ class = (struct q_class_t *) mem_calloc (1, sizeof (struct q_class_t));
+ class->prefix = (char *) mem_calloc (1, length + 1);
strncpy (class->prefix, qptr, length);
class->length = length;
new_class_color (class, q_level);
/* oops... */
if (lineInfo[i].chunks) {
lineInfo[i].chunks = 0;
- safe_realloc (&(lineInfo[n].syntax), sizeof (struct syntax_t));
+ mem_realloc (&(lineInfo[n].syntax), sizeof (struct syntax_t));
}
lineInfo[i++].type = MT_COLOR_SIGNATURE;
}
if (pmatch[0].rm_eo != pmatch[0].rm_so) {
if (!found) {
if (++(lineInfo[n].chunks) > 1)
- safe_realloc (&(lineInfo[n].syntax),
+ mem_realloc (&(lineInfo[n].syntax),
(lineInfo[n].chunks) *
sizeof (struct syntax_t));
}
}
if (*last == *max) {
- safe_realloc (lineInfo, sizeof (struct line_t) * (*max += LINES));
+ mem_realloc (lineInfo, sizeof (struct line_t) * (*max += LINES));
for (ch = *last; ch < *max; ch++) {
memset (&((*lineInfo)[ch]), 0, sizeof (struct line_t));
(*lineInfo)[ch].type = -1;
(*lineInfo)[ch].search_cnt = -1;
- (*lineInfo)[ch].syntax = safe_malloc (sizeof (struct syntax_t));
+ (*lineInfo)[ch].syntax = mem_malloc (sizeof (struct syntax_t));
((*lineInfo)[ch].syntax)[0].first = ((*lineInfo)[ch].syntax)[0].last =
-1;
}
(SearchRE, (char *) fmt + offset, 1, pmatch,
(offset ? REG_NOTBOL : 0)) == 0) {
if (++((*lineInfo)[n].search_cnt) > 1)
- safe_realloc (&((*lineInfo)[n].search),
+ mem_realloc (&((*lineInfo)[n].search),
((*lineInfo)[n].search_cnt) * sizeof (struct syntax_t));
else
- (*lineInfo)[n].search = safe_malloc (sizeof (struct syntax_t));
+ (*lineInfo)[n].search = mem_malloc (sizeof (struct syntax_t));
pmatch[0].rm_so += offset;
pmatch[0].rm_eo += offset;
((*lineInfo)[n].search)[(*lineInfo)[n].search_cnt - 1].first =
mutt_set_flag (Context, extra->hdr, M_READ, 1);
}
- lineInfo = safe_malloc (sizeof (struct line_t) * (maxLine = LINES));
+ lineInfo = mem_malloc (sizeof (struct line_t) * (maxLine = LINES));
for (i = 0; i < maxLine; i++) {
memset (&lineInfo[i], 0, sizeof (struct line_t));
lineInfo[i].type = -1;
lineInfo[i].search_cnt = -1;
- lineInfo[i].syntax = safe_malloc (sizeof (struct syntax_t));
+ lineInfo[i].syntax = mem_malloc (sizeof (struct syntax_t));
(lineInfo[i].syntax)[0].first = (lineInfo[i].syntax)[0].last = -1;
}
lines = Resize->line;
redraw |= REDRAW_SIGWINCH;
- FREE (&Resize);
+ mem_free (&Resize);
}
#endif
move (statusoffset, COLS - 1);
mutt_refresh ();
+
+ if (IsHeader (extra) && OldHdr == extra->hdr && TopLine != topline
+ && lineInfo[curline].offset < sb.st_size-1) {
+ if (TopLine - topline > lines)
+ topline += lines;
+ else
+ topline = TopLine;
+ continue;
+ }
+ else
+ OldHdr = NULL;
+
ch = km_dokey (MENU_PAGER);
if (ch != -1)
mutt_clear_error ();
lines++;
if (flags & M_PAGER_RETWINCH) {
- Resize = safe_malloc (sizeof (struct resize));
+ Resize = mem_malloc (sizeof (struct resize));
Resize->line = lines;
Resize->SearchCompiled = SearchCompiled;
lineInfo[i].search_cnt = -1;
lineInfo[i].quote = NULL;
- safe_realloc (&(lineInfo[i].syntax), sizeof (struct syntax_t));
+ mem_realloc (&(lineInfo[i].syntax), sizeof (struct syntax_t));
if (SearchCompiled && lineInfo[i].search)
- FREE (&(lineInfo[i].search));
+ mem_free (&(lineInfo[i].search));
}
lastLine = 0;
regfree (&SearchRE);
for (i = 0; i < lastLine; i++) {
if (lineInfo[i].search)
- FREE (&(lineInfo[i].search));
+ mem_free (&(lineInfo[i].search));
lineInfo[i].search_cnt = -1;
}
}
for (i = 0; i < maxLine; i++) {
/* cleanup */
if (lineInfo[i].search)
- FREE (&(lineInfo[i].search));
+ mem_free (&(lineInfo[i].search));
lineInfo[i].search_cnt = -1;
}
SearchFlag = 0;
lineInfo[i].search_cnt = -1;
lineInfo[i].quote = NULL;
- safe_realloc (&(lineInfo[i].syntax), sizeof (struct syntax_t));
+ mem_realloc (&(lineInfo[i].syntax), sizeof (struct syntax_t));
if (SearchCompiled && lineInfo[i].search)
- FREE (&(lineInfo[i].search));
+ mem_free (&(lineInfo[i].search));
}
if (SearchCompiled) {
break;
case OP_BUFFY_LIST:
+ if (option (OPTFORCEBUFFYCHECK))
+ buffy_check (1);
buffy_list ();
redraw |= REDRAW_SIDEBAR;
break;
}
fclose (fp);
- if (IsHeader (extra))
+ if (IsHeader (extra)) {
Context->msgnotreadyet = -1;
+ if (rc == -1)
+ OldHdr = NULL;
+ else {
+ TopLine = topline;
+ OldHdr = extra->hdr;
+ }
+ }
cleanup_quote (&QuoteList);
for (i = 0; i < maxLine; i++) {
- FREE (&(lineInfo[i].syntax));
+ mem_free (&(lineInfo[i].syntax));
if (SearchCompiled && lineInfo[i].search)
- FREE (&(lineInfo[i].search));
+ mem_free (&(lineInfo[i].search));
}
if (SearchCompiled) {
regfree (&SearchRE);
SearchCompiled = 0;
}
- FREE (&lineInfo);
+ mem_free (&lineInfo);
if (index)
mutt_menuDestroy (&index);
return (rc != -1 ? rc : 0);