X-Git-Url: http://git.madism.org/?a=blobdiff_plain;ds=sidebyside;f=pager.c;h=982f7f3fb78cc3a27f70695d083e2d5ee7b33b3b;hb=4e64abbe6c52d61bb01b85c266e33e30b257ba68;hp=0c9441f941a978f4fd98a56a208206e4b181a88b;hpb=8476307969a605bea67f6b702b0c1e7a52038bed;p=apps%2Fmadmutt.git

diff --git a/pager.c b/pager.c
index 0c9441f..982f7f3 100644
--- a/pager.c
+++ b/pager.c
@@ -662,13 +662,8 @@ resolve_types (char *buf, char *rawbuf, struct line_t *lineInfo, int n, int last
   }
   else if (m_strncmp("\033[0m", rawbuf, 4) == 0)       /* a little hack... */
     lineInfo[n].type = MT_COLOR_NORMAL;
-#if 0
-  else if (m_strncmp("[-- ", buf, 4) == 0)
-    lineInfo[n].type = MT_COLOR_ATTACHMENT;
-#else
   else if (check_attachment_marker ((char *) rawbuf) == 0)
     lineInfo[n].type = MT_COLOR_ATTACHMENT;
-#endif
   else if (m_strcmp("-- \n", buf) == 0
            || m_strcmp("-- \r\n", buf) == 0) {
     i = n + 1;
@@ -1426,7 +1421,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
 
   if (stat (fname, &sb) != 0) {
     mutt_perror (fname);
-    fclose (fp);
+    m_fclose(&fp);
     return (-1);
   }
   unlink (fname);
@@ -1870,7 +1865,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
                           M_CLEAR) != 0)
         break;
 
-      if (!strcmp (buffer, searchbuf)) {
+      if (!m_strcmp (buffer, searchbuf)) {
         if (SearchCompiled) {
           /* do an implicit search-next */
           if (ch == OP_SEARCH)
@@ -2559,7 +2554,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
     }
   }
 
-  fclose (fp);
+  m_fclose(&fp);
   if (IsHeader (extra)) {
     Context->msgnotreadyet = -1;
     if (rc == -1)