diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/subr.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3aae7e5b678..e6517f77b32 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-04-27 Daniel Colascione <dan.colascione@gmail.com> + + * subr.el (shell-quote-argument): Use alternate escaping strategy + when we spot a variable reference in a string. + 2011-04-26 Daniel Colascione <dan.colascione@gmail.com> * cus-start.el (all): Define customization for debug-on-event. diff --git a/lisp/subr.el b/lisp/subr.el index 2b6a5404060..e374b56d2a8 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -2543,7 +2543,7 @@ Note: :data and :device are currently not supported on Windows." "\\1\\1\\\\\"" argument))) - (if (string-match "\"" argument) + (if (string-match "[%!\"]" argument) (concat "^\"" (replace-regexp-in-string |