(server-process-filter): In file name, collapse multiple slashes to one.

1 files changed, 6 insertions, 0 deletions

diff --git a/lisp/server.el b/lisp/server.el
index 5dc51cb7e39..7649660b72a 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -202,7 +202,13 @@ Prefix arg means just kill any existing server communications subprocess."
                        (substring request (match-beginning 0) (1- (match-end 0)))))
                   (setq request (substring request (match-end 0)))
                   (if (string-match "\\`\\+[0-9]+\\'" arg)
+                      ;; ARG is a line number option.
                       (setq lineno (read (substring arg 1)))
+                    ;; ARG is a file name.
+                    ;; Collapse multiple slashes to single slashes,
+                    ;; since in Emacs a multiple slash is not equiv to one.
+                    (while (string-match "//+" arg)
+                      (setq arg (replace-match "/" t t arg)))
                     (setq files
                           (cons (list arg lineno)
                                 files))