mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 04:10:54 -08:00
Code Issues Projects Releases Wiki Activity

* lisp/shell.el (shell-completion-vars): Set pcomplete-arg-quote-list like

Browse source 
shell-delimiter-argument-list.
(shell-parse-pcomplete-arguments): Obey pcomplete-arg-quote-list.

Fixes: debbugs:11348
This commit is contained in:
Stefan Monnier 2012-05-05 00:18:49 -04:00
parent e68b393e60
commit 3d53ee1b2d
2 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lisp/ChangeLog
View file

@ -1,3 +1,9 @@
2012-05-05 Stefan Monnier <monnier@iro.umontreal.ca>
* shell.el (shell-completion-vars): Set pcomplete-arg-quote-list like
shell-delimiter-argument-list (bug#11348).
(shell-parse-pcomplete-arguments): Obey pcomplete-arg-quote-list.
2012-05-04 Chong Yidong <cyd@gnu.org>
* select.el (xselect--encode-string): Always use utf-8 for TEXT on

9
lisp/shell.el
View file

@ -393,8 +393,11 @@ Thus, this does not include the shell's current directory.")
(goto-char (match-end 0))
(cond
((match-beginning 3) ;Backslash escape.
(push (if (= (match-beginning 3) (match-end 3))
"\\" (match-string 3))
(push (cond
((null pcomplete-arg-quote-list)
(goto-char (match-beginning 3)) "\\")
((= (match-beginning 3) (match-end 3)) "\\")
(t (match-string 3)))
arg))
((match-beginning 2) ;Double quote.
(push (replace-regexp-in-string
@ -429,7 +432,7 @@ Shell buffers. It implements `shell-completion-execonly' for
(set (make-local-variable 'pcomplete-parse-arguments-function)
#'shell-parse-pcomplete-arguments)
(set (make-local-variable 'pcomplete-arg-quote-list)
(append "\\ \t\n\r\"'`$|&;(){}[]<>#" nil))
shell-delimiter-argument-list)
(set (make-local-variable 'pcomplete-termination-string)
(cond ((not comint-completion-addsuffix) "")
((stringp comint-completion-addsuffix)