Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
356a3681
Commit
356a3681
authored
Aug 28, 2011
by
Stefan Monnier
Browse files
* lisp/shell.el (shell-parse-pcomplete-arguments): Unquote args.
Fixes: debbugs:9160
parent
dca4927e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
4 deletions
+26
-4
lisp/ChangeLog
lisp/ChangeLog
+4
-0
lisp/shell.el
lisp/shell.el
+22
-4
No files found.
lisp/ChangeLog
View file @
356a3681
2011-08-28 Stefan Monnier <monnier@iro.umontreal.ca>
* shell.el (shell-parse-pcomplete-arguments): Unquote args (bug#9160).
2011-08-27 Alan Mackenzie <acm@muc.de>
* progmodes/cc-menus.el (cc-imenu-c++-generic-expression): Make it
...
...
lisp/shell.el
View file @
356a3681
...
...
@@ -393,10 +393,28 @@ to `dirtrack-mode'."
(
while
(
<
(
point
)
end
)
(
skip-chars-forward
" \t\n"
)
(
push
(
point
)
begins
)
(
looking-at
"\\(?:[^\s\t\n\\]\\|'[^']*'\\|\"\\(?:[^\"\\]\\|\\\\.\\)*\"\\|\\\\.\\)*\\(?:\\\\\\|'[^']*\\|\"\\(?:[^\"\\]\\|\\\\.\\)*\\)?"
)
(
goto-char
(
match-end
0
))
(
push
(
buffer-substring-no-properties
(
car
begins
)
(
point
))
args
))
(
let
((
arg
()))
(
while
(
looking-at
(
eval-when-compile
(
concat
"\\(?:[^\s\t\n\\\"']+"
"\\|'\\([^']*\\)'?"
"\\|\"\\(\\(?:[^\"\\]\\|\\\\.\\)*\\)\"?"
"\\|\\\\\\(\\(?:.\\|\n\\)?\\)\\)"
)))
(
goto-char
(
match-end
0
))
(
cond
((
match-beginning
3
)
;Backslash escape.
(
push
(
if
(
=
(
match-beginning
3
)
(
match-end
3
))
"\\"
(
match-string
3
))
arg
))
((
match-beginning
2
)
;Double quote.
(
push
(
replace-regexp-in-string
"\\\\\\(.\\)"
"\\1"
(
match-string
2
))
arg
))
((
match-beginning
1
)
;Single quote.
(
push
(
match-string
1
)
arg
))
(
t
(
push
(
match-string
0
)
arg
))))
(
push
(
mapconcat
#'
identity
(
nreverse
arg
)
""
)
args
)))
(
cons
(
nreverse
args
)
(
nreverse
begins
)))))
(
defun
shell-completion-vars
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment