diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2006-06-11 18:59:31 +0000 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2006-06-11 18:59:31 +0000 |
| commit | 6b519504c3297595101628e823e72c91e562ab45 (patch) | |
| tree | 2e91af81403354b1ffc977d97d227d637500aa16 /lisp | |
| parent | 11f892894536e0cd81a2aae5726bfef9a20d2779 (diff) | |
| download | emacs-6b519504c3297595101628e823e72c91e562ab45.tar.gz | |
* server.el (server-edit): No-op if no server buffers exist.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/server.el | 12 |
2 files changed, 11 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 32f447c7979..2a3aef6eb37 100644 --- 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 d20caf34f79..266d9d7824f 100644 --- 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. |