* lisp/subr.el (shell-quote-argument): Properly quote \n.

Suggested by Flo <sensorflo@gmail.com>.

Fixes: debbugs:7687

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 865f46562cf8a0c50720d1c138fed18d67d4df36..ac0181e9632db073a3a6f94e976d10eea8daa89c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-21  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * subr.el (shell-quote-argument): Properly quote \n (bug#7687).
+       Suggested by Flo <sensorflo@gmail.com>.
+
 2011-01-21  Glenn Morris  <rgm@gnu.org>
 
        * progmodes/compile.el (compilation-error-regexp-alist):

diff --git a/lisp/subr.el b/lisp/subr.el
index 2a0dee6933899e1aaa35e4273055b2630da7389f..391510c4acb878fdebd9067d8e71ce7515f06b1b 100644 (file)
--- 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.