>> --- server.el   02 Nov 2006 14:00:25 -0500      1.117
>> +++ server.el   02 Nov 2006 14:03:12 -0500
>> @@ -112,6 +112,7 @@
>> :version "22.1")
>> (put 'server-auth-dir 'risky-local-variable t)
>> 
>> +;; FIXME: This should not be a global var, but stored in the process's 
>> plist.
>> (defvar server-auth-key nil
>> "The current server authentication key.")
>> (put 'server-auth-key 'risky-local-variable t)
>> @@ -311,7 +312,7 @@
>> (ignore-errors
>> ;; Delete the socket or authentication files made by previous
>> ;; server invocations.
>> -      (if (eq (process-contact server-process :family) 'local)
>> +      (if (not server-use-tcp)
>> (delete-file (expand-file-name server-name server-socket-dir))
>> (setq server-auth-key nil)
>> (delete-file (expand-file-name server-name server-auth-dir)))))
>> 

> Stefan, do you want to commit this, or do I fix it to put the server
> type in the process plist (which is also trivial)?

You misunderstand the purpose of this code: it is not to clear the data of
`server-process' (this would/should be done in the process's sentinel
instead).  It is to clear the path for the new process.  The file we want to
remove may be leftover from some other Emacs session (mabye even still
running).

I'll commit a patch,


        Stefan


_______________________________________________
emacs-pretest-bug mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/emacs-pretest-bug

Reply via email to