[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/emacs-24 r107970: * lisp/shell.el (shell-co
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/emacs-24 r107970: * lisp/shell.el (shell-completion-vars): Set pcomplete-arg-quote-list like |
Date: |
Sat, 05 May 2012 00:18:49 -0400 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 107970
fixes bug(s): http://debbugs.gnu.org/cgi/bugreport.cgi?bug=11348
committer: Stefan Monnier <address@hidden>
branch nick: emacs-24
timestamp: Sat 2012-05-05 00:18:49 -0400
message:
* lisp/shell.el (shell-completion-vars): Set pcomplete-arg-quote-list like
shell-delimiter-argument-list.
(shell-parse-pcomplete-arguments): Obey pcomplete-arg-quote-list.
modified:
lisp/ChangeLog
lisp/shell.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2012-05-04 10:26:36 +0000
+++ b/lisp/ChangeLog 2012-05-05 04:18:49 +0000
@@ -1,3 +1,9 @@
+2012-05-05 Stefan Monnier <address@hidden>
+
+ * 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 <address@hidden>
* select.el (xselect--encode-string): Always use utf-8 for TEXT on
=== modified file 'lisp/shell.el'
--- a/lisp/shell.el 2012-02-28 08:17:21 +0000
+++ b/lisp/shell.el 2012-05-05 04:18:49 +0000
@@ -393,8 +393,11 @@
(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 @@
(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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/emacs-24 r107970: * lisp/shell.el (shell-completion-vars): Set pcomplete-arg-quote-list like,
Stefan Monnier <=