Mercurial > emacs
comparison lisp/server.el @ 108851:cb093dac3d58
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Fri, 28 May 2010 00:48:45 +0000 |
| parents | 511da81b16c5 |
| children | 87dad1e1c860 |
comparison
equal
deleted
inserted
replaced
| 108850:7cd8ffa6f7db | 108851:cb093dac3d58 |
|---|---|
| 343 ;; running Emacs instance, server-start uses server-running-p to check | 343 ;; running Emacs instance, server-start uses server-running-p to check |
| 344 ;; for possible servers before doing anything, so it *should* be ours. | 344 ;; for possible servers before doing anything, so it *should* be ours. |
| 345 (and (process-contact proc :server) | 345 (and (process-contact proc :server) |
| 346 (eq (process-status proc) 'closed) | 346 (eq (process-status proc) 'closed) |
| 347 (ignore-errors | 347 (ignore-errors |
| 348 (delete-file (process-get proc :server-file) t))) | 348 (delete-file (process-get proc :server-file)))) |
| 349 (server-log (format "Status changed to %s: %s" (process-status proc) msg) proc) | 349 (server-log (format "Status changed to %s: %s" (process-status proc) msg) proc) |
| 350 (server-delete-client proc)) | 350 (server-delete-client proc)) |
| 351 | 351 |
| 352 (defun server-select-display (display) | 352 (defun server-select-display (display) |
| 353 ;; If the current frame is on `display' we're all set. | 353 ;; If the current frame is on `display' we're all set. |