From 046ce3c515dd8c642ce3a89e155f18a554ab183e Mon Sep 17 00:00:00 2001
From: Richard Russon <rich@flatcap.org>
Date: Mon, 27 Aug 2018 00:35:33 +0100
Subject: [PATCH] very minor fixes

- put listener prototype in the right header
- update list of message files
- fix comments
---
 hdrline.c      | 1 -
 mutt/history.h | 2 --
 mutt_history.h | 1 +
 po/POTFILES.in | 1 +
 sidebar.c      | 2 +-
 5 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/hdrline.c b/hdrline.c
index 35e982edb..ad3962464 100644
--- a/hdrline.c
+++ b/hdrline.c
@@ -480,7 +480,6 @@ static bool thread_is_old(struct Context *ctx, struct Header *hdr)
  * | \%E     | Number of messages in current thread
  * | \%F     | Author name, or recipient name if the message is from you
  * | \%f     | Sender (address + real name), either From: or Return-Path:
- * | \%g     | Newsgroup name (if compiled with NNTP support)
  * | \%g     | Message tags (e.g. notmuch tags/imap flags)
  * | \%Gx    | Individual message tag (e.g. notmuch tags/imap flags)
  * | \%H     | Spam attribute(s) of this message
diff --git a/mutt/history.h b/mutt/history.h
index e36556c6b..c77df2154 100644
--- a/mutt/history.h
+++ b/mutt/history.h
@@ -60,6 +60,4 @@ void  mutt_hist_reset_state(enum HistoryClass hclass);
 void  mutt_hist_save_scratch(enum HistoryClass hclass, const char *str);
 int   mutt_hist_search(char *search_buf, enum HistoryClass hclass, char **matches);
 
-bool mutt_hist_listener(const struct ConfigSet *cs, struct HashElem *he, const char *name, enum ConfigEvent ev);
-
 #endif /* _MUTT_HISTORY_H */
diff --git a/mutt_history.h b/mutt_history.h
index 1ee781415..42fd861bf 100644
--- a/mutt_history.h
+++ b/mutt_history.h
@@ -27,6 +27,7 @@
 #include "mutt/mutt.h"
 
 void mutt_hist_complete(char *buf, size_t buflen, enum HistoryClass hclass);
+bool mutt_hist_listener(const struct ConfigSet *cs, struct HashElem *he, const char *name, enum ConfigEvent ev);
 
 #endif /* _MUTT_HISTORY2_H */
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index ee05091d1..87c0296d3 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -123,6 +123,7 @@ mutt_thread.c
 mutt_url.c
 mutt_window.c
 mx.c
+myvar.c
 ncrypt/crypt.c
 ncrypt/cryptglue.c
 ncrypt/crypt_gpgme.c
diff --git a/sidebar.c b/sidebar.c
index 1dfb1c260..490fb61d6 100644
--- a/sidebar.c
+++ b/sidebar.c
@@ -647,7 +647,7 @@ static bool prepare_sidebar(int page_size)
 
   /* Set the Top and Bottom to frame the HilIndex in groups of page_size */
 
-  /* If OPTSIDEBARNEMAILONLY is set, some entries may be hidden so we
+  /* If SidebarNewMailOnly is set, some entries may be hidden so we
    * need to scan for the framing interval */
   if (SidebarNewMailOnly)
   {
-- 
2.40.0