diff options
| author | Stefan Monnier | 2012-05-09 13:20:24 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2012-05-09 13:20:24 -0400 |
| commit | fe263b8f57f4f55e17a4a39f36e52f585e0cba70 (patch) | |
| tree | 185d736e53500307621b1badcb69e6317f3be2a3 /lisp/shell.el | |
| parent | 0a454caf059b4cc050984a41decc2344cd9a083f (diff) | |
| download | emacs-fe263b8f57f4f55e17a4a39f36e52f585e0cba70.tar.gz emacs-fe263b8f57f4f55e17a4a39f36e52f585e0cba70.zip | |
* 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.el | 5 |
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.") | |||
| 400 | (t (match-string 3))) | 400 | (t (match-string 3))) |
| 401 | arg)) | 401 | arg)) |
| 402 | ((match-beginning 2) ;Double quote. | 402 | ((match-beginning 2) ;Double quote. |
| 403 | (push (replace-regexp-in-string | 403 | (push (if (null pcomplete-arg-quote-list) (match-string 2) |
| 404 | "\\\\\\(.\\)" "\\1" (match-string 2)) | 404 | (replace-regexp-in-string |
| 405 | "\\\\\\(.\\)" "\\1" (match-string 2))) | ||
| 405 | arg)) | 406 | arg)) |
| 406 | ((match-beginning 1) ;Single quote. | 407 | ((match-beginning 1) ;Single quote. |
| 407 | (push (match-string 1) arg)) | 408 | (push (match-string 1) arg)) |