Mercurial > emacs
changeset 93704:986cecd901e8
Undo part of the multi-tty change, which is only needed if server.el is
preloaded, and broke server-running-p.
(server-socket-dir): Initialize in the defvar, as before.
(server-start): Remove initialization of server-socket-dir.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Sat, 05 Apr 2008 17:55:00 +0000 |
| parents | 2f7273e41b57 |
| children | 442e2ad714cd |
| files | lisp/ChangeLog lisp/server.el |
| diffstat | 2 files changed, 10 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sat Apr 05 15:45:13 2008 +0000 +++ b/lisp/ChangeLog Sat Apr 05 17:55:00 2008 +0000 @@ -1,3 +1,10 @@ +2008-04-05 Stefan Monnier <monnier@iro.umontreal.ca> + + * server.el: Undo part of the multi-tty change, which is only + needed if server.el is preloaded, and broke server-running-p. + (server-socket-dir): Initialize in the defvar, as before. + (server-start): Remove initialization of server-socket-dir. + 2008-04-05 Eli Zaretskii <eliz@gnu.org> * ls-lisp.el (ls-lisp-format): Support inodes that are 2- or @@ -7,8 +14,7 @@ * cus-face.el (custom-face-attributes): Handle roman slant. - * faces.el (default): Ensure the face-defface-spec property is - set. + * faces.el (default): Ensure the face-defface-spec property is set. 2008-04-05 Adrian Robert <Adrian.B.Robert@gmail.com>
--- a/lisp/server.el Sat Apr 05 15:45:13 2008 +0000 +++ b/lisp/server.el Sat Apr 05 17:55:00 2008 +0000 @@ -204,9 +204,8 @@ (defvar server-name "server") -(defvar server-socket-dir nil - "The directory in which to place the server socket. -Initialized by `server-start'.") +(defvar server-socket-dir (format "/tmp/emacs%d" (user-uid)) + "The directory in which to place the server socket.") (defun server-clients-with (property value) "Return a list of clients with PROPERTY set to VALUE." @@ -463,9 +462,6 @@ (not server-clients) (yes-or-no-p "The current server still has clients; delete them? ")) - ;; It is safe to get the user id now. - (setq server-socket-dir (or server-socket-dir - (format "/tmp/emacs%d" (user-uid)))) (when server-process ;; kill it dead! (ignore-errors (delete-process server-process)))