summaryrefslogtreecommitdiff
path: root/lisp/shell.el
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2012-05-09 13:20:24 -0400
committerStefan Monnier <monnier@iro.umontreal.ca>2012-05-09 13:20:24 -0400
commitfe263b8f57f4f55e17a4a39f36e52f585e0cba70 (patch)
tree185d736e53500307621b1badcb69e6317f3be2a3 /lisp/shell.el
parent0a454caf059b4cc050984a41decc2344cd9a083f (diff)
downloademacs-fe263b8f57f4f55e17a4a39f36e52f585e0cba70.tar.gz
* lisp/shell.el (shell-parse-pcomplete-arguments):
Obey pcomplete-arg-quote-list inside double-quoted args as well. Fixes: debbugs:11348
Diffstat (limited to 'lisp/shell.el')
-rw-r--r--lisp/shell.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/shell.el b/lisp/shell.el
index f7a530102ff..1784188f6ad 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -400,8 +400,9 @@ Thus, this does not include the shell's current directory.")
(t (match-string 3)))
arg))
((match-beginning 2) ;Double quote.
- (push (replace-regexp-in-string
- "\\\\\\(.\\)" "\\1" (match-string 2))
+ (push (if (null pcomplete-arg-quote-list) (match-string 2)
+ (replace-regexp-in-string
+ "\\\\\\(.\\)" "\\1" (match-string 2)))
arg))
((match-beginning 1) ;Single quote.
(push (match-string 1) arg))