# HG changeset patch
# Parent 1cc4f193d0c14f255fb79a3a360d364f962d1514

diff -r 1cc4f193d0c1 lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Apr 05 08:48:37 2014 +0200
+++ b/lisp/ChangeLog	Fri Apr 18 21:19:14 2014 +0200
@@ -16,6 +16,12 @@
 	* files.el (lock-buffer, unlock-buffer, file-locked-p):
 	Remove fallback aliases, since they are always defined now.
 
+2014-04-18  Jarek Czekalski  <jarekczek@poczta.onet.pl>
+
+	Remove unneeded prompt when closing a buffer with active emacsclient.
+	* server.el (server-start): Remove the only call to:
+	* server.el (server-kill-buffer-query-function): Remove.
+
 2014-03-24  Daniel Colascione  <dancol@dancol.org>
 
 	* emacs-lisp/cl-macs.el (cl--do-arglist): Use `plist-member'
diff -r 1cc4f193d0c1 lisp/server.el
--- a/lisp/server.el	Sat Apr 05 08:48:37 2014 +0200
+++ b/lisp/server.el	Fri Apr 18 21:19:14 2014 +0200
@@ -642,8 +642,6 @@
 	(cl-letf (((default-file-modes) ?\700))
 	  (add-hook 'suspend-tty-functions 'server-handle-suspend-tty)
 	  (add-hook 'delete-frame-functions 'server-handle-delete-frame)
-	  (add-hook 'kill-buffer-query-functions
-                    'server-kill-buffer-query-function)
 	  (add-hook 'kill-emacs-query-functions
                     'server-kill-emacs-query-function)
 	  (add-hook 'kill-emacs-hook 'server-force-stop) ;Cleanup upon exit.
@@ -1472,22 +1470,6 @@
 	(save-buffer)))
     (server-buffer-done (current-buffer))))
 
-;; Ask before killing a server buffer.
-;; It was suggested to release its client instead,
-;; but I think that is dangerous--the client would proceed
-;; using whatever is on disk in that file. -- rms.
-(defun server-kill-buffer-query-function ()
-  "Ask before killing a server buffer."
-  (or (not server-buffer-clients)
-      (let ((res t))
-	(dolist (proc server-buffer-clients)
-          (when (and (memq proc server-clients)
-                     (eq (process-status proc) 'open))
-            (setq res nil)))
-         res)
-      (yes-or-no-p (format "Buffer `%s' still has clients; kill it? "
-			   (buffer-name (current-buffer))))))
-
 (defun server-kill-emacs-query-function ()
   "Ask before exiting Emacs if it has live clients."
   (or (not server-clients)