(server-start): Also don't get confused by CRs since we

don't quote them.

2 files changed, 8 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3c5a1e6994e..9ac6b7a541f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * server.el (server-start): Also don't get confused by CRs since we
+        don't quote them.
+
 2008-04-12  Nick Roberts  <nickrob@snap.net.nz>
 
         * progmodes/gdb-ui.el (gdb-init-buffer): New function.
diff --git a/lisp/server.el b/lisp/server.el
index 90adaace156..88bb8cd769d 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -500,8 +500,9 @@ kill any existing server communications subprocess."
                        :filter 'server-process-filter
                        ;; We must receive file names without being decoded.
                        ;; Those are decoded by server-process-filter according
-                       ;; to file-name-coding-system.
-                       :coding 'raw-text
+                       ;; to file-name-coding-system.  Also don't get
+                       ;; confused by CRs since we don't quote them.
+                       :coding 'raw-text-unix
                        ;; The other args depend on the kind of socket used.
                        (if server-use-tcp
                            (list :family nil