From: Sean Whitton <spwhitton@spwhitton.name>
Date: Thu, 8 Dec 2022 23:29:44 +0000 (-0700)
Subject: server-eval-at: Don't call server--file-name
X-Git-Tag: emacs-29.0.90~1302
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6ccdda3df2e8cd4a0f408d2d84c64b69d29f40a5;p=emacs.git

server-eval-at: Don't call server--file-name

* lisp/server.el (server-eval-at): Revert to old code for determining
the server file.  The recent change to call server--file-name meant
that the SERVER argument to server-eval-at was ignored.
---

diff --git a/lisp/server.el b/lisp/server.el
index 7e713eaecde..fd740d126df 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -1911,10 +1911,11 @@ Returns the result of the evaluation, or signals an error if it
 cannot contact the specified server.  For example:
   (server-eval-at \"server\" \\='(emacs-pid))
 returns the process ID of the Emacs instance running \"server\"."
-  (let ((server-file (server--file-name))
-        (coding-system-for-read 'binary)
-        (coding-system-for-write 'binary)
-        address port secret process)
+  (let* ((server-dir (if server-use-tcp server-auth-dir server-socket-dir))
+         (server-file (expand-file-name server server-dir))
+         (coding-system-for-read 'binary)
+         (coding-system-for-write 'binary)
+         address port secret process)
     (unless (file-exists-p server-file)
       (error "No such server: %s" server))
     (with-temp-buffer