[Emacs-diffs] /srv/bzr/emacs/trunk r105537: * lisp/shell.el (shell-completion-vars): Set pcomplete-arg-quote-list.

[Stefan Monnier]

------------------------------------------------------------
revno: 105537
fixes bug(s): http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9161
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Tue 2011-08-23 01:25:17 -0400
message:
  * lisp/shell.el (shell-completion-vars): Set pcomplete-arg-quote-list.
  * lisp/pcomplete.el (pcomplete-quote-argument): Fix thinko.
modified:
  lisp/ChangeLog
  lisp/pcomplete.el
  lisp/shell.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-08-23 05:21:09 +0000
+++ b/lisp/ChangeLog    2011-08-23 05:25:17 +0000
@@ -1,5 +1,8 @@
 2011-08-23  Stefan Monnier  <address@hidden>
 
+       * shell.el (shell-completion-vars): Set pcomplete-arg-quote-list.
+       * pcomplete.el (pcomplete-quote-argument): Fix thinko (bug#9161).
+
        * pcomplete.el (pcomplete-parse-comint-arguments): Fix inf-loop.
        Mark obsolete.
        * shell.el (shell-parse-pcomplete-arguments): New function.

=== modified file 'lisp/pcomplete.el'
--- a/lisp/pcomplete.el 2011-08-23 05:21:09 +0000
+++ b/lisp/pcomplete.el 2011-08-23 05:25:17 +0000
@@ -883,7 +883,7 @@
                        (or (run-hook-with-args-until-success
                             'pcomplete-quote-arg-hook filename index)
                            (when (memq c pcomplete-arg-quote-list)
-                             (string "\\" c))
+                             (string ?\\ c))
                            (char-to-string c))
                      (setq index (1+ index))))
                  filename

=== modified file 'lisp/shell.el'
--- a/lisp/shell.el     2011-08-23 05:21:09 +0000
+++ b/lisp/shell.el     2011-08-23 05:25:17 +0000
@@ -412,6 +412,8 @@
        shell-dynamic-complete-functions)
   (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))
   (set (make-local-variable 'pcomplete-termination-string)
        (cond ((not comint-completion-addsuffix) "")
              ((stringp comint-completion-addsuffix)