From 690944eebbe058753a56dd10a455943507dc44e7 Mon Sep 17 00:00:00 2001 From: Pierre Habouzit Date: Wed, 7 Nov 2007 22:35:21 +0100 Subject: [PATCH 1/1] Fix compilation issues. Signed-off-by: Pierre Habouzit --- compose.c | 2 +- init.c | 2 +- lib-mx/mbox.c | 6 ++---- pager.c | 4 +--- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/compose.c b/compose.c index 02d4aae..d36008b 100644 --- a/compose.c +++ b/compose.c @@ -1007,7 +1007,7 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ if (msg->content->next) msg->content = mutt_make_multipart (msg->content); - if (mutt_write_fcc (NONULL (fname), msg, NULL, 1, NULL) < 0) + if (mutt_write_fcc (fname, msg, NULL, 1, NULL) < 0) msg->content = mutt_remove_multipart (msg->content); else mutt_message _("Message written."); diff --git a/init.c b/init.c index beca05f..aac359d 100644 --- a/init.c +++ b/init.c @@ -882,7 +882,7 @@ static void mutt_set_default(const char *name __attribute__ ((unused)), void* p, return; mutt_option_value(ptr->option, buf, sizeof(buf)); - if (m_strlen(ptr->init) == 0 && buf && *buf) + if (m_strlen(ptr->init) == 0 && *buf) ptr->init = m_strdup(buf); } diff --git a/lib-mx/mbox.c b/lib-mx/mbox.c index 857ba86..a1f1fcc 100644 --- a/lib-mx/mbox.c +++ b/lib-mx/mbox.c @@ -99,10 +99,8 @@ static int mbox_parse_mailbox (CONTEXT * ctx) /* precompute the local timezone to speed up calculation of the date received */ - { - time_t t = time(NULL); - tz = localtime(&t)->tm_gmtoff; - } + t = time(NULL); + tz = localtime(&t)->tm_gmtoff; loc = ftello (ctx->fp); while (fgets (buf, sizeof (buf), ctx->fp) != NULL) { diff --git a/pager.c b/pager.c index b287a6b..19a8c70 100644 --- a/pager.c +++ b/pager.c @@ -1443,10 +1443,8 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra) SETCOLOR(main_w, MT_COLOR_NORMAL); BKGDSET(main_w, MT_COLOR_NORMAL); } - /* if we're not using the index, update every time */ - if (index == 0) - sidebar_draw (); + sidebar_draw (); redraw = 0; mutt_refresh(); -- 2.20.1