Changeset 4085 for trunk/lisp/server.el

Timestamp:

05/18/06 16:19:18 (3 years ago)

Author:

miyoshi

Message:

Sync up with Emacs CVS HEAD.

Files:

• trunk/lisp/server.el (modified) (4 diffs)

trunk/lisp/server.el

@@ -253 +253 @@
-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
@@ -266 +264 @@
-    (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")))
@@ -579 +580 @@
-          (not server-process)
-          (memq (process-status server-process) '(signal exit)))
-start nil
+mode 1
-    (apply 'server-switch-buffer (server-done))))
-
@@ -638 +639 @@
-
-(defun server-unload-hook ()
-start t
+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)
-
-;
+
-;;; server.el ends here