* [PATCH] erc: check that buffer is alive in sentinel
@ 2010-10-23 12:43 Julien Danjou
2010-10-23 19:34 ` Glenn Morris
0 siblings, 1 reply; 2+ messages in thread
From: Julien Danjou @ 2010-10-23 12:43 UTC (permalink / raw
To: emacs-devel; +Cc: Julien Danjou
Signed-off-by: Julien Danjou <julien@danjou.info>
---
lisp/erc/ChangeLog | 5 ++++
lisp/erc/erc-backend.el | 49 ++++++++++++++++++++++++-----------------------
2 files changed, 30 insertions(+), 24 deletions(-)
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 81bdf54..3443e3b 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-23 Julien Danjou <julien@danjou.info>
+
+ * erc-backend.el (erc-process-sentinel): Check that buffer is
+ alive before setting it as current buffer.
+
2010-10-14 Juanma Barranquero <lekktu@gmail.com>
* erc-xdcc.el (erc-xdcc-help-text): Fix typo in docstring.
diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el
index 9a237d4..65d8ce1 100644
--- a/lisp/erc/erc-backend.el
+++ b/lisp/erc/erc-backend.el
@@ -653,30 +653,31 @@ Conditionally try to reconnect and take appropriate action."
(defun erc-process-sentinel (cproc event)
"Sentinel function for ERC process."
- (with-current-buffer (process-buffer cproc)
- (erc-log (format
- "SENTINEL: proc: %S status: %S event: %S (quitting: %S)"
- cproc (process-status cproc) event erc-server-quitting))
- (if (string-match "^open" event)
- ;; newly opened connection (no wait)
- (erc-login)
- ;; assume event is 'failed
- (let ((buf (process-buffer cproc)))
- (erc-with-all-buffers-of-server cproc nil
- (setq erc-server-connected nil))
- (when erc-server-ping-handler
- (progn (erc-cancel-timer erc-server-ping-handler)
- (setq erc-server-ping-handler nil)))
- (run-hook-with-args 'erc-disconnected-hook
- (erc-current-nick) (system-name) "")
- ;; Remove the prompt
- (goto-char (or (marker-position erc-input-marker) (point-max)))
- (forward-line 0)
- (erc-remove-text-properties-region (point) (point-max))
- (delete-region (point) (point-max))
- ;; Decide what to do with the buffer
- ;; Restart if disconnected
- (erc-process-sentinel-1 event buf)))))
+ (let ((buf (process-buffer cproc)))
+ (when (buffer-live-p buf)
+ (with-current-buffer buf
+ (erc-log (format
+ "SENTINEL: proc: %S status: %S event: %S (quitting: %S)"
+ cproc (process-status cproc) event erc-server-quitting))
+ (if (string-match "^open" event)
+ ;; newly opened connection (no wait)
+ (erc-login)
+ ;; assume event is 'failed
+ (erc-with-all-buffers-of-server cproc nil
+ (setq erc-server-connected nil))
+ (when erc-server-ping-handler
+ (progn (erc-cancel-timer erc-server-ping-handler)
+ (setq erc-server-ping-handler nil)))
+ (run-hook-with-args 'erc-disconnected-hook
+ (erc-current-nick) (system-name) "")
+ ;; Remove the prompt
+ (goto-char (or (marker-position erc-input-marker) (point-max)))
+ (forward-line 0)
+ (erc-remove-text-properties-region (point) (point-max))
+ (delete-region (point) (point-max))
+ ;; Decide what to do with the buffer
+ ;; Restart if disconnected
+ (erc-process-sentinel-1 event buf))))))
;;;; Sending messages
--
1.7.2.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] erc: check that buffer is alive in sentinel
2010-10-23 12:43 [PATCH] erc: check that buffer is alive in sentinel Julien Danjou
@ 2010-10-23 19:34 ` Glenn Morris
0 siblings, 0 replies; 2+ messages in thread
From: Glenn Morris @ 2010-10-23 19:34 UTC (permalink / raw
To: Julien Danjou; +Cc: emacs-devel
Applied to emacs-23.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-10-23 19:34 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-23 12:43 [PATCH] erc: check that buffer is alive in sentinel Julien Danjou
2010-10-23 19:34 ` Glenn Morris
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.