Mercurial > emacs
comparison lisp/server.el @ 90228:fa0da9b57058
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-82
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 542-553)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 116-121)
- Merge from emacs--cvs-trunk--0
- Update from CVS
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Mon, 19 Sep 2005 10:20:33 +0000 |
| parents | 2d92f5c9d6ae 4d1085b02d64 |
| children | 7beb78bc1f8e |
comparison
equal
deleted
inserted
replaced
| 90227:10fe5fadaf89 | 90228:fa0da9b57058 |
|---|---|
| 369 (or nowait (push client server-clients)) | 369 (or nowait (push client server-clients)) |
| 370 (unless (or isearch-mode (minibufferp)) | 370 (unless (or isearch-mode (minibufferp)) |
| 371 (server-switch-buffer (nth 1 client)) | 371 (server-switch-buffer (nth 1 client)) |
| 372 (run-hooks 'server-switch-hook) | 372 (run-hooks 'server-switch-hook) |
| 373 (unless nowait | 373 (unless nowait |
| 374 (message (substitute-command-keys | 374 (message "%s" (substitute-command-keys |
| 375 "When done with a buffer, type \\[server-edit]"))))) | 375 "When done with a buffer, type \\[server-edit]"))))) |
| 376 ;; Avoid preserving the connection after the last real frame is deleted. | 376 ;; Avoid preserving the connection after the last real frame is deleted. |
| 377 (if tmp-frame (delete-frame tmp-frame)))) | 377 (if tmp-frame (delete-frame tmp-frame)))) |
| 378 ;; Save for later any partial line that remains. | 378 ;; Save for later any partial line that remains. |
| 379 (when (> (length string) 0) | 379 (when (> (length string) 0) |