Mercurial > emacs
comparison lisp/server.el @ 90789:c0409ee15cee
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 670-674)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 209-210)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-185
author | Miles Bader <miles@gnu.org> |
---|---|
date | Wed, 21 Mar 2007 13:33:07 +0000 |
parents | f83d17e1ace6 ab479de41b29 |
children | 3619e7770f2e |
comparison
equal
deleted
inserted
replaced
90788:a12805fdabe8 | 90789:c0409ee15cee |
---|---|
412 ;; Similarly with recursive-edits such as the splash screen. | 412 ;; Similarly with recursive-edits such as the splash screen. |
413 (process-put proc :previous-string string) | 413 (process-put proc :previous-string string) |
414 (run-with-timer 0 nil (lexical-let ((proc proc)) | 414 (run-with-timer 0 nil (lexical-let ((proc proc)) |
415 (lambda () (server-process-filter proc "")))) | 415 (lambda () (server-process-filter proc "")))) |
416 (top-level)) | 416 (top-level)) |
417 (condition-case nil | |
418 ;; If we're running isearch, we must abort it to allow Emacs to | |
419 ;; display the buffer and switch to it. | |
420 (mapc #'(lambda (buffer) | |
421 (with-current-buffer buffer | |
422 (when (bound-and-true-p isearch-mode) | |
423 (isearch-cancel)))) | |
424 (buffer-list)) | |
425 ;; Signaled by isearch-cancel | |
426 (quit (message nil))) | |
417 ;; If the input is multiple lines, | 427 ;; If the input is multiple lines, |
418 ;; process each line individually. | 428 ;; process each line individually. |
419 (while (string-match "\n" string) | 429 (while (string-match "\n" string) |
420 (let ((request (substring string 0 (match-beginning 0))) | 430 (let ((request (substring string 0 (match-beginning 0))) |
421 (coding-system (and default-enable-multibyte-characters | 431 (coding-system (and default-enable-multibyte-characters |