From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Mon, 2 May 2011 02:33:11 +0000 (+0200)
Subject: Decode &_ => SPC in the reply.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~153
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=84621b7162b84bffeb5e46bf975ccd7318ad7cfb;p=emacs.git

Decode &_ => SPC in the reply.
---

diff --git a/lisp/server.el b/lisp/server.el
index ab7dd409736..c421ee09812 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -1487,8 +1487,8 @@ only these files will be asked to be saved."
 (defun server-eval-at (server form)
   "Eval FORM on Emacs Server SERVER."
   (let ((auth-file (expand-file-name server server-auth-dir))
-	;;(coding-system-for-read 'binary)
-	;;(coding-system-for-write 'binary)
+	(coding-system-for-read 'binary)
+	(coding-system-for-write 'binary)
 	address port secret process)
     (unless (file-exists-p auth-file)
       (error "No such server definition: %s" auth-file))
@@ -1516,8 +1516,12 @@ only these files will be asked to be saved."
       (goto-char (point-min))
       ;; If the result is nil, there's nothing in the buffer.  If the
       ;; result is non-nil, it's after "-print ".
-      (and (search-forward "\n-print" nil t)
-	   (read (current-buffer))))))
+      (when (search-forward "\n-print" nil t)
+	(let ((start (point)))
+	  (while (search-forward "&_" nil t)
+	    (replace-match " " t t))
+	  (goto-char start)
+	  (read (current-buffer)))))))
 
 
 (provide 'server)