From: Richard Russon <rich@flatcap.org>
Date: Mon, 5 Jun 2017 17:40:55 +0000 (+0100)
Subject: drop configure option --with-exec-shell
X-Git-Tag: neomutt-20170707~53^2~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7a5914ea01d9dd716c721533aac7f0cdc0ab1b5b;p=neomutt

drop configure option --with-exec-shell

Using /bin/sh is safe.
---

diff --git a/INSTALL b/INSTALL
index be41a8939..75d16b7cb 100644
--- a/INSTALL
+++ b/INSTALL
@@ -116,22 +116,6 @@ to ``configure'' to help it out, or change the default behavior:
 	LC_CTYPE correctly, then you might find you can solve the problem
 	with either or both of --enable-locales-fix and --without-wc-funcs.
 
---with-exec-shell=SHELL
-	on some versions of unix, /bin/sh has a bug that makes using emacs
-	with mutt very difficult.  If you have the problem that whenever
-	you press control-G in emacs, mutt and emacs become very confused,
-	you may want to try using a Bourne-derived shell other than
-	/bin/sh here.  Some shells that may work are bash, zsh, and ksh.
-	C shells such as csh and tcsh will amost certainly not work right.
-	Note that this option is unrelated to what shell mutt gives you
-	when you press '!'.  Only use this option to solve the above problem,
-	and only specify one of the above shells as its argument.
-
-	(If you encounter this problem with your platform's native
-	Bourne shell, please send a short report to mutt-dev@mutt.org,
-	so a short note on this topic can be added to the Platform notes
-	section below.)
-
 --enable-exact-address
 	By default, Mutt will rewrite all addresses in the form
 		Personal Name <user@host.domain>
diff --git a/configure.ac b/configure.ac
index 13fd1e962..590570a4d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -630,15 +630,6 @@ AC_ARG_ENABLE(locales-fix, AS_HELP_STRING([--enable-locales-fix],[The result of
 		AC_DEFINE(LOCALES_HACK,1,[ Define if the result of isprint() is unreliable. ])
 	fi])
 
-AC_ARG_WITH(exec-shell, AS_HELP_STRING([--with-exec-shell=SHELL],[Specify alternate shell (ONLY if /bin/sh is broken)]),
-	[if test $withval != yes; then
-		AC_DEFINE_UNQUOTED(EXECSHELL, "$withval",
-		[program to use for shell commands])
-	else
-		AC_DEFINE_UNQUOTED(EXECSHELL, "/bin/sh")
-	fi],
-	[AC_DEFINE_UNQUOTED(EXECSHELL, "/bin/sh")])
-
 AC_ARG_ENABLE(exact-address, AS_HELP_STRING([--enable-exact-address],[Enable regeneration of email addresses]),
 	[if test $enableval = yes; then
 		AC_DEFINE(EXACT_ADDRESS,1,
diff --git a/filter.c b/filter.c
index 4603bcb06..a3fec3b72 100644
--- a/filter.c
+++ b/filter.c
@@ -20,6 +20,7 @@
 #include <sys/wait.h>
 #include <unistd.h>
 #include "filter.h"
+#include "mutt.h"
 #include "mutt_curses.h"
 #include "protos.h"
 
diff --git a/mutt.h b/mutt.h
index 1d43de11c..4c6bc984b 100644
--- a/mutt.h
+++ b/mutt.h
@@ -348,4 +348,6 @@ struct AttachMatch
 
 #define MUTT_PARTS_TOPLEVEL (1 << 0) /* is the top-level part */
 
+#define EXECSHELL "/bin/sh"
+
 #endif /* _MUTT_H */
diff --git a/version.c b/version.c
index 2ec941025..dea021c7e 100644
--- a/version.c
+++ b/version.c
@@ -425,7 +425,6 @@ void print_version(void)
 #ifdef DOMAIN
   printf("DOMAIN=\"%s\"\n", DOMAIN);
 #endif
-  printf("EXECSHELL=\"%s\"\n", EXECSHELL);
 #ifdef ISPELL
   printf("ISPELL=\"%s\"\n", ISPELL);
 #endif