Mercurial > emacs
diff lisp/server.el @ 90743:f83d17e1ace6
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 615-621)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 197-199)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-166
author | Miles Bader <miles@gnu.org> |
---|---|
date | Tue, 30 Jan 2007 22:22:43 +0000 |
parents | 95d0cdf160ea 09eed2796001 |
children | c0409ee15cee |
line wrap: on
line diff
--- a/lisp/server.el Tue Jan 30 07:44:44 2007 +0000 +++ b/lisp/server.el Tue Jan 30 22:22:43 2007 +0000 @@ -311,7 +311,8 @@ To use the server, set up the program `emacsclient' in the Emacs distribution as your standard \"editor\". -Prefix arg means just kill any existing server communications subprocess." +Optional argument LEAVE-DEAD (interactively, a prefix arg) means just +kill any existing server communications subprocess." (interactive "P") (when server-process ;; kill it dead!