diff options
author | Kevin McCarthy <kevin@8t8.us> | 2019-10-04 15:29:03 +0800 |
---|---|---|
committer | Kevin McCarthy <kevin@8t8.us> | 2019-10-04 15:30:08 +0800 |
commit | 48cf1092935c5fbe4f56377d8cf575867466bcba (patch) | |
tree | 3895bf05d930daf314a56c9ab24d2de378f02f54 | |
parent | a6bccbe1d1b731e69b2b609278ef0811d547a6e7 (diff) |
Fix built-in pager checks for help and attachments.
Mutt uses the built-in pager when $pager is unset too. Fix a few
checks to also handle that case.
-rw-r--r-- | help.c | 4 | ||||
-rw-r--r-- | muttlib.c | 6 |
2 files changed, 6 insertions, 4 deletions
@@ -224,7 +224,7 @@ static void format_line (FILE *f, int ismacro, if (ismacro > 0) { - if (!mutt_strcmp (Pager, "builtin")) + if (!Pager || !mutt_strcmp (Pager, "builtin")) fputs ("_\010", f); fputs ("M ", f); col += 2; @@ -264,7 +264,7 @@ static void format_line (FILE *f, int ismacro, if (*t3) { - if (mutt_strcmp (Pager, "builtin")) + if (Pager && mutt_strcmp (Pager, "builtin")) { fputc ('\n', f); n = 0; @@ -1947,13 +1947,15 @@ int state_printf (STATE *s, const char *fmt, ...) void state_mark_attach (STATE *s) { - if ((s->flags & MUTT_DISPLAY) && !mutt_strcmp (Pager, "builtin")) + if ((s->flags & MUTT_DISPLAY) && + (!Pager || !mutt_strcmp (Pager, "builtin"))) state_puts (AttachmentMarker, s); } void state_mark_protected_header (STATE *s) { - if ((s->flags & MUTT_DISPLAY) && !mutt_strcmp (Pager, "builtin")) + if ((s->flags & MUTT_DISPLAY) && + (!Pager || !mutt_strcmp (Pager, "builtin"))) state_puts (ProtectedHeaderMarker, s); } |