aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorGlenn Morris2011-02-16 21:02:02 -0800
committerGlenn Morris2011-02-16 21:02:02 -0800
commit64a14c74cb9792c3674fa8d9277e998b85ba3b30 (patch)
tree2cc6bf49753947aecfe105ac11cea837b5c1a3cd /lisp
parent92e39d6fbfd29fc9773643a8af3c4870883e1863 (diff)
downloademacs-64a14c74cb9792c3674fa8d9277e998b85ba3b30.tar.gz
emacs-64a14c74cb9792c3674fa8d9277e998b85ba3b30.zip
shell.el fix for bug#8027 and friends.
* lisp/shell.el (shell-delimiter-argument-list): Set it to nil. This is a test, to see if causes any issues.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/shell.el10
2 files changed, 8 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 638b7a2d442..ca4fa798d15 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12011-02-17 Glenn Morris <rgm@gnu.org> 12011-02-17 Glenn Morris <rgm@gnu.org>
2 2
3 * shell.el (shell-delimiter-argument-list): Set it to nil. (Bug#8027)
4
3 * vc/vc.el (vc-default-previous-version): 5 * vc/vc.el (vc-default-previous-version):
4 Remove alias that points nowhere. (Bug#4496) 6 Remove alias that points nowhere. (Bug#4496)
5 7
diff --git a/lisp/shell.el b/lisp/shell.el
index fcffc2317d5..ea89ce765c3 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -151,12 +151,14 @@ This is a fine thing to set in your `.emacs' file."
151 :type '(repeat (string :tag "Suffix")) 151 :type '(repeat (string :tag "Suffix"))
152 :group 'shell) 152 :group 'shell)
153 153
154(defvar shell-delimiter-argument-list '(?\| ?& ?< ?> ?\( ?\) ?\;) 154(defcustom shell-delimiter-argument-list nil ; '(?\| ?& ?< ?> ?\( ?\) ?\;)
155 "List of characters to recognize as separate arguments. 155 "List of characters to recognize as separate arguments.
156This variable is used to initialize `comint-delimiter-argument-list' in the 156This variable is used to initialize `comint-delimiter-argument-list' in the
157shell buffer. The value may depend on the operating system or shell. 157shell buffer. The value may depend on the operating system or shell."
158 158 :type '(choice (const nil)
159This is a fine thing to set in your `.emacs' file.") 159 (repeat :tag "List of characters" character))
160 :version "24.1" ; changed to nil (bug#8027)
161 :group 'shell)
160 162
161(defvar shell-file-name-chars 163(defvar shell-file-name-chars
162 (if (memq system-type '(ms-dos windows-nt cygwin)) 164 (if (memq system-type '(ms-dos windows-nt cygwin))