Mercurial > emacs
changeset 71320:59c8b05c2ce4
* server.el (server-edit): No-op if no server buffers exist.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Sun, 11 Jun 2006 18:59:31 +0000 |
| parents | 286607b09efc |
| children | e2c7eb3cbb0c 46b1096093f5 |
| files | lisp/ChangeLog lisp/server.el |
| diffstat | 2 files changed, 11 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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):
--- 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.