* server.el (server-edit): No-op if no server buffers exist.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 32f447c79791b91453503ee4374b2fd8bcca3992..2a3aef6eb378c210b467b210379bc067459aa8a0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/server.el b/lisp/server.el
index d20caf34f79da68263ec66b8d71e211a30e91e8a..266d9d7824fa52985984fd1aa311c671ac7e1837 100644 (file)
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -576,11 +576,13 @@ which filenames are considered temporary.
 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.