(explicit-bash-args): New user option.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 30736305ee4a64499dbec54bcf3f450cc1c2a6b7..1549bc20eaeac983d3dd4c5382af446711ec6dd7 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2002-07-30  Andreas Schwab  <schwab@suse.de>
+
+       * shell.el (explicit-bash-args): New user option.
+
 2002-07-29  Dave Love  <fx@gnu.org>
 
        * international/mule-conf.el (non-standard-designations-alist) 

diff --git a/lisp/shell.el b/lisp/shell.el
index a476660cd82d32565536feefec4a668d79124623..c6f4b8b2be9c3d7a1e66104abeec6fe9c6e4ec53 100644 (file)
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -1,6 +1,6 @@
 ;;; shell.el --- specialized comint.el for running the shell
 
-;; Copyright (C) 1988, 93, 94, 95, 96, 1997, 2000 Free Software Foundation, Inc.
+;; Copyright (C) 1988, 93, 94, 95, 96, 1997, 2000, 2002 Free Software Foundation, Inc.
 
 ;; Author: Olin Shivers <shivers@cs.cmu.edu>
 ;;     Simon Marshall <simon@gnu.org>
@@ -275,6 +275,14 @@ Value is a list of strings, which may be nil."
   :type '(repeat (string :tag "Argument"))
   :group 'shell)
 
+(defcustom explicit-bash-args
+    ;; Tell bash not to use readline.
+    '("--noediting" "-i")
+  "*Args passed to inferior shell by M-x shell, if the shell is bash.
+Value is a list of strings, which may be nil."
+  :type '(repeat (string :tag "Argument"))
+  :group 'shell)
+
 (defcustom shell-input-autoexpand 'history
   "*If non-nil, expand input command history references on completion.
 This mirrors the optional behavior of tcsh (its autoexpand and histlit).