(kill-emacs-query-functions, kill-buffer-query-functions):

(kill-emacs-query-functions, kill-buffer-query-functions):
Add functions to these lists.

(server-program): Add exec-directory to value.  Use expand-file-name.

(server-buffer-done): If buffer is dead, don't bury it.
(server-done): If we kill the old buffer,
and server-buffer-done gives us nil, return the new current buffer.