From d5e632d853da69d61b488ac26773c547ac655c6a Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Fri, 21 Jan 2011 13:07:41 -0500 Subject: [PATCH] * lisp/subr.el (shell-quote-argument): Properly quote \n. Suggested by Flo . Fixes: debbugs:7687 --- lisp/ChangeLog | 5 +++++ lisp/subr.el | 9 ++------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 865f46562cf..ac0181e9632 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-01-21 Stefan Monnier + + * subr.el (shell-quote-argument): Properly quote \n (bug#7687). + Suggested by Flo . + 2011-01-21 Glenn Morris * progmodes/compile.el (compilation-error-regexp-alist): diff --git a/lisp/subr.el b/lisp/subr.el index 2a0dee69338..391510c4acb 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -2426,13 +2426,8 @@ Note: :data and :device are currently not supported on Windows." "''" ;; Quote everything except POSIX filename characters. ;; This should be safe enough even for really weird shells. - (let ((result "") (start 0) end) - (while (string-match "[^-0-9a-zA-Z_./]" argument start) - (setq end (match-beginning 0) - result (concat result (substring argument start end) - "\\" (substring argument end (1+ end))) - start (1+ end))) - (concat result (substring argument start)))))) + (replace-regexp-in-string "\n" "'\n'" + (replace-regexp-in-string "[^-0-9a-zA-Z_./\n]" "\\\\\\&" argument))))) (defun string-or-null-p (object) "Return t if OBJECT is a string or nil. -- 2.39.5