* lisp/shell.el (shell-delimiter-argument-list): Revert 2011-02-17 change.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6ec2cd2f038db177fad1cc4afd4489fa4e94324e..ccb1394e3d560a37ced8aa30b55ec7fa0dafd04b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-15  Glenn Morris  <rgm@gnu.org>
+
+       * shell.el (shell-delimiter-argument-list):
+       Revert 2011-02-17 change.  (Bug#8027)
+
 2012-02-15  Chong Yidong  <cyd@gnu.org>
 
        * custom.el (defcustom): Doc fix; note use of defvar.

diff --git a/lisp/shell.el b/lisp/shell.el
index e7a8953ecbe973bcac1cbe85141652162d06a5f3..b4b388655c8e451983f2398ab357e20549d60b9f 100644 (file)
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -153,13 +153,14 @@ This is a fine thing to set in your `.emacs' file."
   :type '(repeat (string :tag "Suffix"))
   :group 'shell)
 
-(defcustom shell-delimiter-argument-list nil ; '(?\| ?& ?< ?> ?\( ?\) ?\;)
+(defcustom shell-delimiter-argument-list '(?\| ?& ?< ?> ?\( ?\) ?\;)
   "List of characters to recognize as separate arguments.
 This variable is used to initialize `comint-delimiter-argument-list' in the
 shell buffer.  The value may depend on the operating system or shell."
   :type '(choice (const nil)
                 (repeat :tag "List of characters" character))
-  :version "24.1"                      ; changed to nil (bug#8027)
+  ;; Reverted.
+;;  :version "24.1"                    ; changed to nil (bug#8027)
   :group 'shell)
 
 (defvar shell-file-name-chars