(quoted-insert-character-offset): Initialize more cleanly.

[gnu-emacs] / lisp / server.el

diff --git a/lisp/server.el b/lisp/server.el
index 4348e9a513457839d763e04c1a4e39c9617ae36e..8a548fe0aa92eee38160927dfcbe2fd00c430de3 100644 (file)
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -205,7 +205,8 @@ Prefix arg means just kill any existing server communications subprocess."
              (setq request (substring request (match-end 0)))
              (while (string-match "[^ ]+ " request)
                (let ((arg
-                      (substring request (match-beginning 0) (1- (match-end 0)))))
+                      (substring request (match-beginning 0) (1- (match-end 0))))
+                     (pos 0))
                  (setq request (substring request (match-end 0)))
                  (if (string-match "\\`-nowait" arg)
                      (setq nowait t)
@@ -215,7 +216,6 @@ Prefix arg means just kill any existing server communications subprocess."
                      ;; ARG is a file name.
                      ;; Collapse multiple slashes to single slashes.
                      (setq arg (command-line-normalize-file-name arg))
-                     (setq pos 0)
                      ;; Undo the quoting that emacsclient does
                      ;; for certain special characters.
                      (while (string-match "&." arg pos)
@@ -280,7 +280,7 @@ so don't mark these buffers specially, just visit them normally."
       (set-buffer obuf))
     (nconc client client-record)))
 \f
-(defun server-buffer-done (buffer)
+(defun server-buffer-done (buffer &optional for-killing)
   "Mark BUFFER as \"done\" for its client(s).
 This buries the buffer, then returns a list of the form (NEXT-BUFFER KILLED).
 NEXT-BUFFER is another server buffer, as a suggestion for what to select next,
@@ -322,10 +322,11 @@ or nil.  KILLED is t if we killed BUFFER (because it was a temp file)."
            (set-buffer buffer)
            (setq server-buffer-clients nil)
            (run-hooks 'server-done-hook))
-         (if (server-temp-file-p buffer)
-             (progn (kill-buffer buffer)
-                    (setq killed t))
-           (bury-buffer buffer))))
+         (if for-killing
+             (if (server-temp-file-p buffer)
+                 (progn (kill-buffer buffer)
+                        (setq killed t))
+               (bury-buffer buffer)))))
     (list next-buffer killed)))
 
 (defun server-temp-file-p (buffer)
@@ -353,6 +354,7 @@ or nil.  KILLED is t if we killed the BUFFER (because it was a temp file)."
                    (buffer-backed-up nil))
                (save-buffer))
            (if (and (buffer-modified-p)
+                    buffer-file-name
                     (y-or-n-p (concat "Save file " buffer-file-name "? ")))
                (save-buffer buffer)))
          (server-buffer-done buffer)))))
@@ -381,6 +383,11 @@ or nil.  KILLED is t if we killed the BUFFER (because it was a temp file)."
        (yes-or-no-p "Server buffers still have clients; exit anyway? "))))
 
 (add-hook 'kill-emacs-query-functions 'server-kill-emacs-query-function)
+
+;; When a buffer is killed, inform the clients.
+(add-hook 'kill-buffer-hook 'server-kill-buffer)
+(defun server-kill-buffer ()
+  (server-buffer-done (current-buffer) t))
 \f
 (defun server-edit (&optional arg)
   "Switch to next server editing buffer; say \"Done\" for current buffer.