# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1150052371 0
# Node ID 59c8b05c2ce4313c0b7975e8f28fe9e00c71cebe
# Parent  286607b09efcfcd5296051dfb28bc70151d2f781
	* server.el (server-edit): No-op if no server buffers exist.

diff -r 286607b09efc -r 59c8b05c2ce4 lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Jun 11 18:18:24 2006 +0000
+++ b/lisp/ChangeLog	Sun Jun 11 18:59:31 2006 +0000
@@ -1,3 +1,7 @@
+2006-06-11  Chong Yidong  <cyd@stupidchicken.com>
+
+	* server.el (server-edit): No-op if no server buffers exist.
+
 2006-06-11  Robert J. Chassell  <bob@rattlesnake.com>
 
 	* textmodes/page-ext.el (pages-directory-for-addresses): 
diff -r 286607b09efc -r 59c8b05c2ce4 lisp/server.el
--- a/lisp/server.el	Sun Jun 11 18:18:24 2006 +0000
+++ b/lisp/server.el	Sun Jun 11 18:59:31 2006 +0000
@@ -576,11 +576,13 @@
 If invoked with a prefix argument, or if there is no server process running,
 starts server process and that is all.  Invoked by \\[server-edit]."
   (interactive "P")
-  (if (or arg
-	  (not server-process)
-	  (memq (process-status server-process) '(signal exit)))
-      (server-mode 1)
-    (apply 'server-switch-buffer (server-done))))
+  (cond
+   ((or arg
+	(not server-process)
+	(memq (process-status server-process) '(signal exit)))
+    (server-mode 1))
+   (server-clients (apply 'server-switch-buffer (server-done)))
+   (t (message "No server editing buffers exist"))))
 
 (defun server-switch-buffer (&optional next-buffer killed-one)
   "Switch to another buffer, preferably one that has a client.