diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2012-05-09 13:20:24 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2012-05-09 13:20:24 -0400 |
| commit | fe263b8f57f4f55e17a4a39f36e52f585e0cba70 (patch) | |
| tree | 185d736e53500307621b1badcb69e6317f3be2a3 | |
| parent | 0a454caf059b4cc050984a41decc2344cd9a083f (diff) | |
| download | emacs-fe263b8f57f4f55e17a4a39f36e52f585e0cba70.tar.gz | |
* lisp/shell.el (shell-parse-pcomplete-arguments):
Obey pcomplete-arg-quote-list inside double-quoted args as well.
Fixes: debbugs:11348
| -rw-r--r-- | lisp/ChangeLog | 17 | ||||
| -rw-r--r-- | lisp/shell.el | 5 |
2 files changed, 14 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ec29758fd51..d72e098579c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2012-05-09 Stefan Monnier <monnier@iro.umontreal.ca> + + * shell.el (shell-parse-pcomplete-arguments): Obey + pcomplete-arg-quote-list inside double-quoted args as well (bug#11348). + 2012-05-08 Stefan Monnier <monnier@iro.umontreal.ca> * shell.el (shell-completion-vars): Fix last change (bug#11348). @@ -48,8 +53,8 @@ 2012-04-30 Martin Rudalics <rudalics@gmx.at> - * window.el (display-buffer--action-function-custom-type): Fix - entry. + * window.el (display-buffer--action-function-custom-type): + Fix entry. 2012-04-27 Alan Mackenzie <acm@muc.de> @@ -152,8 +157,8 @@ 2012-04-19 Chong Yidong <cyd@gnu.org> - * progmodes/gdb-mi.el (gdb-inferior-io--maybe-delete-pty): New - function to call delete-process on the gdb-inferior buffer's pty. + * progmodes/gdb-mi.el (gdb-inferior-io--maybe-delete-pty): + New function to call delete-process on the gdb-inferior buffer's pty. (gdb-reset): Use it, instead of relying on kill-buffer to kill the pty process (Bug#11273). (gdb-update): New arg to suppress talking to the gdb process. @@ -186,8 +191,8 @@ (c-comment-indent, c-scan-conditionals, c-indent-defun) (c-context-line-break): bind case-fold-search to nil. - * progmodes/cc-mode.el (c-font-lock-fontify-region): bind - case-fold-search to nil. + * progmodes/cc-mode.el (c-font-lock-fontify-region): + bind case-fold-search to nil. 2012-04-16 Chong Yidong <cyd@gnu.org> 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)) |