diff options
| author | Karoly Lorentey | 2007-01-29 22:21:19 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2007-01-29 22:21:19 +0000 |
| commit | 93afd0f1d463bec0fc8d3127c1d34ccaa4dbe99b (patch) | |
| tree | 6e4e3bec20b8c65eb1f78b0ad302fa6c1977d355 /lisp/server.el | |
| parent | 38db5c8d522cc1faa8190e77dbc932a5560e6aad (diff) | |
| parent | 5c4a60523827062803ab9a55b4325358225d66bf (diff) | |
| download | emacs-93afd0f1d463bec0fc8d3127c1d34ccaa4dbe99b.tar.gz emacs-93afd0f1d463bec0fc8d3127c1d34ccaa4dbe99b.zip | |
Merged from emacs@sv.gnu.org
Patches applied:
* emacs@sv.gnu.org/emacs--devo--0--patch-599
Merge from erc--main--0
* emacs@sv.gnu.org/emacs--devo--0--patch-600
Merge from erc--main--0
* emacs@sv.gnu.org/emacs--devo--0--patch-601
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-602
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-603
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-604
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-605
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-606
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-607
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-608
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-609
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-610
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-611
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-612
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-613
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-614
Make byte compiler correctly write circular constants
* emacs@sv.gnu.org/emacs--devo--0--patch-615
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-616
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-617
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-618
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-192
Merge from emacs--devo--0
* emacs@sv.gnu.org/gnus--rel--5.10--patch-193
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-194
Merge from emacs--devo--0
* emacs@sv.gnu.org/gnus--rel--5.10--patch-195
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-196
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-594
Diffstat (limited to 'lisp/server.el')
| -rw-r--r-- | lisp/server.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/server.el b/lisp/server.el index dd64bb6cf89..e0465324e05 100644 --- a/lisp/server.el +++ b/lisp/server.el | |||
| @@ -448,8 +448,8 @@ client \"editors\" can send your editing commands to this Emacs | |||
| 448 | job. To use the server, set up the program `emacsclient' in the | 448 | job. To use the server, set up the program `emacsclient' in the |
| 449 | Emacs distribution as your standard \"editor\". | 449 | Emacs distribution as your standard \"editor\". |
| 450 | 450 | ||
| 451 | Prefix arg LEAVE-DEAD means just kill any existing server | 451 | Optional argument LEAVE-DEAD (interactively, a prefix arg) means just |
| 452 | communications subprocess." | 452 | kill any existing server communications subprocess." |
| 453 | (interactive "P") | 453 | (interactive "P") |
| 454 | (when (or | 454 | (when (or |
| 455 | (not server-clients) | 455 | (not server-clients) |