From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel,gmane.emacs.bugs Subject: Re: Emacsserver socket file not removed on exit Date: Tue, 16 May 2006 02:54:16 -0400 Message-ID: <87d5eeqx5i.fsf-monnier+emacs@gnu.org> References: NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1147762548 20634 80.91.229.2 (16 May 2006 06:55:48 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Tue, 16 May 2006 06:55:48 +0000 (UTC) Cc: bug-gnu-emacs@gnu.org, emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue May 16 08:55:47 2006 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by ciao.gmane.org with esmtp (Exim 4.43) id 1FftS6-0001ZO-IK for ged-emacs-devel@m.gmane.org; Tue, 16 May 2006 08:54:42 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1FftS5-0004Fc-Ua for ged-emacs-devel@m.gmane.org; Tue, 16 May 2006 02:54:41 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1FftRr-0004FS-MJ for emacs-devel@gnu.org; Tue, 16 May 2006 02:54:27 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1FftRp-0004EV-VI for emacs-devel@gnu.org; Tue, 16 May 2006 02:54:27 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1FftRn-0004CM-Pf; Tue, 16 May 2006 02:54:23 -0400 Original-Received: from [209.226.175.110] (helo=tomts43-srv.bellnexxia.net) by monty-python.gnu.org with esmtp (Exim 4.52) id 1FftUJ-0007Bg-Dm; Tue, 16 May 2006 02:56:59 -0400 Original-Received: from alfajor ([70.53.193.91]) by tomts43-srv.bellnexxia.net (InterMail vM.5.01.06.13 201-253-122-130-113-20050324) with ESMTP id <20060516065418.NSGJ1543.tomts43-srv.bellnexxia.net@alfajor>; Tue, 16 May 2006 02:54:18 -0400 Original-Received: by alfajor (Postfix, from userid 1000) id 03853D91B9; Tue, 16 May 2006 02:54:16 -0400 (EDT) Original-To: rms@gnu.org, "Tacvek" In-Reply-To: (Richard Stallman's message of "Tue, 16 May 2006 00:28:05 -0400") User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.0.50 (gnu/linux) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:54560 gmane.emacs.bugs:15098 Archived-At: > Would someone please study this and DTRT? I've just installed the patch below which should fix it. > The socket file of emacsserver is not removed when Emacs is exited. > As far as I can tell, the only thing that causes the server to delete the > file is (server-start t), which is called by emacsserver's unload hook. Can you confirm that the patch below fixes it for you? Stefan --- server.el 07 mai 2006 10:06:52 -0400 1.110 +++ server.el 16 mai 2006 02:49:31 -0400 @@ -252,8 +252,6 @@ Prefix arg means just kill any existing server communications subprocess." (interactive "P") - ;; Make sure there is a safe directory in which to place the socket. - (server-ensure-safe-dir server-socket-dir) ;; kill it dead! (if server-process (condition-case () (delete-process server-process) (error nil))) @@ -265,7 +263,10 @@ (while server-clients (let ((buffer (nth 1 (car server-clients)))) (server-buffer-done buffer))) + ;; Now any previous server is properly stopped. (unless leave-dead + ;; Make sure there is a safe directory in which to place the socket. + (server-ensure-safe-dir server-socket-dir) (if server-process (server-log (message "Restarting server"))) (letf (((default-file-modes) ?\700)) @@ -578,7 +579,7 @@ (if (or arg (not server-process) (memq (process-status server-process) '(signal exit))) - (server-start nil) + (server-mode 1) (apply 'server-switch-buffer (server-done)))) (defun server-switch-buffer (&optional next-buffer killed-one) @@ -637,14 +638,15 @@ (define-key ctl-x-map "#" 'server-edit) (defun server-unload-hook () - (server-start t) + (server-mode -1) (remove-hook 'kill-buffer-query-functions 'server-kill-buffer-query-function) (remove-hook 'kill-emacs-query-functions 'server-kill-emacs-query-function) (remove-hook 'kill-buffer-hook 'server-kill-buffer)) +(add-hook 'kill-emacs-hook (lambda () (server-mode -1))) ;Cleanup upon exit. (add-hook 'server-unload-hook 'server-unload-hook) (provide 'server) -;;; arch-tag: 1f7ecb42-f00a-49f8-906d-61995d84c8d6 +;; arch-tag: 1f7ecb42-f00a-49f8-906d-61995d84c8d6 ;;; server.el ends here