Changeset 4140 for trunk/lisp/erc/erc-backend.el
- Timestamp:
- 08/10/06 11:19:54 (2 years ago)
- Files:
-
- trunk/lisp/erc/erc-backend.el (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/lisp/erc/erc-backend.el
r4111 r4140 494 494 ;; normal quit 495 495 (progn 496 (let ((string "\n\n*** ERC finished ***\n") 497 (inhibit-read-only t)) 498 (erc-put-text-property 0 (length string) 499 'face 'erc-error-face string) 500 (insert string)) 496 (erc-display-message nil 'error (current-buffer) 'finished) 501 497 (when erc-kill-server-buffer-on-quit 502 498 (set-buffer-modified-p nil) … … 520 516 erc-session-user-full-name t erc-session-password) 521 517 ;; terminate, do not reconnect 522 (let ((string (concat "\n\n*** ERC terminated: " event 523 "\n")) 524 (inhibit-read-only t)) 525 (erc-put-text-property 0 (length string) 526 'face 'erc-error-face string) 527 (insert string))))) 518 (erc-display-message nil 'error (current-buffer) 519 'terminated ?e event)))) 528 520 529 521 (defun erc-process-sentinel (cproc event) … … 546 538 (erc-current-nick) (system-name) "") 547 539 ;; Remove the prompt 540 (goto-char (or (marker-position erc-input-marker) (point-max))) 548 541 (forward-line 0) 549 542 (erc-remove-text-properties-region (point) (point-max)) … … 564 557 This is determined via `erc-encoding-coding-alist' or 565 558 `erc-server-coding-system'." 566 (or (let ((case-fold-search t)) 567 (catch 'match 568 (dolist (pat erc-encoding-coding-alist) 569 (when (string-match (car pat) target) 570 (throw 'match (cdr pat)))))) 559 (or (when target 560 (let ((case-fold-search t)) 561 (catch 'match 562 (dolist (pat erc-encoding-coding-alist) 563 (when (string-match (car pat) target) 564 (throw 'match (cdr pat))))))) 571 565 (and (functionp erc-server-coding-system) 572 566 (funcall erc-server-coding-system))
