From: Richard Russon <rich@flatcap.org>
Date: Sun, 24 Feb 2019 16:41:48 +0000 (+0000)
Subject: fix backing global variable for config
X-Git-Tag: 2019-10-25~354^2~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=efa2de01647150bd7021c45056da6b7f132bf636;p=neomutt

fix backing global variable for config

Global name didn't match config name.
---

diff --git a/globals.h b/globals.h
index 01f9b42a0..05b9d9a43 100644
--- a/globals.h
+++ b/globals.h
@@ -110,6 +110,7 @@ WHERE char *DateFormat;                    ///< Config: strftime format string f
 WHERE char *DsnNotify;                     ///< Config: Request notification for message delivery or delay
 WHERE char *DsnReturn;                     ///< Config: What to send as a notification of message delivery or delay
 WHERE char *Editor;                        ///< Config: External command to use as an email editor
+WHERE char *ExternalSearchCommand;         ///< Config: External search command
 WHERE char *Hostname;                      ///< Config: Fully-qualified domain name of this machine
 WHERE char *IndexFormat;                   ///< Config: printf-like format string for the index menu (emails)
 
@@ -141,7 +142,6 @@ WHERE char *IndentString;                  ///< Config: String used to indent 'r
 WHERE char *PrintCommand;                  ///< Config: External command to print a message
 WHERE char *NewMailCommand;                ///< Config: External command to run when new mail arrives
 WHERE char *Realname;                      ///< Config: Real name of the user
-WHERE char *SearchCommand;                 ///< Config: External search command
 WHERE char *Shell;                         ///< Config: External command to run subshells in
 WHERE char *SimpleSearch;                  ///< Config: Pattern to search for when search doesn't contain ~'s
 #ifdef USE_SMTP
diff --git a/init.h b/init.h
index 40c107137..b5621246a 100644
--- a/init.h
+++ b/init.h
@@ -1020,7 +1020,7 @@ struct ConfigDef MuttVars[] = {
   ** .pp
   ** Escape character to use for functions in the built-in editor.
   */
-  { "external_search_command",   DT_COMMAND, R_NONE, &SearchCommand, 0 },
+  { "external_search_command",   DT_COMMAND, R_NONE, &ExternalSearchCommand, 0 },
   /*
    ** .pp
    ** If set, contains the name of the external program used by "~I" patterns.
diff --git a/pattern.c b/pattern.c
index 6e8f15a53..6d33ac733 100644
--- a/pattern.c
+++ b/pattern.c
@@ -273,7 +273,7 @@ static bool eat_query(struct Pattern *pat, struct Buffer *s, struct Buffer *err)
   struct Buffer tok_buf;
   FILE *fp = NULL;
 
-  if (!SearchCommand)
+  if (!ExternalSearchCommand)
   {
     mutt_buffer_printf(err, "%s", _("No search command defined"));
     return false;
@@ -295,7 +295,7 @@ static bool eat_query(struct Pattern *pat, struct Buffer *s, struct Buffer *err)
   }
 
   mutt_buffer_init(&cmd_buf);
-  mutt_buffer_addstr(&cmd_buf, SearchCommand);
+  mutt_buffer_addstr(&cmd_buf, ExternalSearchCommand);
   mutt_buffer_addch(&cmd_buf, ' ');
   if (!Context || !Context->mailbox)
   {