Add a missing else.

diff --git a/init.c b/init.c
index b41a2ad4cf7e8d036ac250b2ee0f5baf36f09c1b..53470991908486ee21da431163a2f444c270441a 100644 (file)
--- a/init.c
+++ b/init.c
@@ -233,7 +233,7 @@ int mutt_extract_token (BUFFER *dest, BUFFER *tok, int flags)
        mutt_buffer_addstr (dest, expn.data);
        FREE (&expn.data);
       }
-      if (expn.data)
+      else if (expn.data)
       {
        expnlen = mutt_strlen (expn.data);
        tok->dsize = expnlen + mutt_strlen (tok->dptr) + 1;

diff --git a/pager.c b/pager.c
index c2154d863947dcd39c6fcb8f3e48b9e61a8ca1f3..4d1d38da2fb11da9450c90edd36e558d8d3a5607 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -1056,6 +1056,8 @@ static int format_line (struct line_t **lineInfo, int n, unsigned char *buf,
     k = mbrtowc (&wc, (char *)buf+ch, cnt-ch, &mbstate);
     if (k == -2 || k == -1)
     {
+      dprint (1, (debugfile, "%s:%d: mbrtowc returned %d; errno = %d.\n",
+                 __FILE__, __LINE__, k, errno));
       if (col + 4 > wrap_cols)
        break;
       col += 4;