[Emacs-diffs] /srv/bzr/emacs/trunk r104073: Decode &_ => SPC in the reply.

[Lars Magne Ingebrigtsen]

------------------------------------------------------------
revno: 104073
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Mon 2011-05-02 04:33:11 +0200
message:
  Decode &_ => SPC in the reply.
modified:
  lisp/server.el

=== modified file 'lisp/server.el'
--- a/lisp/server.el    2011-05-02 02:06:53 +0000
+++ b/lisp/server.el    2011-05-02 02:33:11 +0000
@@ -1487,8 +1487,8 @@
 (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 @@
       (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)