diff options
| author | Lars Ingebrigtsen | 2019-07-29 00:41:56 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2019-07-29 13:30:55 +0200 |
| commit | 72b054c945111f385575cfd4e678adf016b191d4 (patch) | |
| tree | c13c9ada6f434de32902f9c77b6ad60ef8eddebc | |
| parent | 8f4faf7aa1a1b92dbd4d1512592da44e47777e4b (diff) | |
| download | emacs-72b054c945111f385575cfd4e678adf016b191d4.tar.gz emacs-72b054c945111f385575cfd4e678adf016b191d4.zip | |
Avoid error when killing rcirc buffer
* lisp/net/rcirc.el (rcirc-kill-buffer-hook): Delete the process
in the buffer when killing server buffers to avoid triggering
errors from the sentinel (bug#23168).
| -rw-r--r-- | lisp/net/rcirc.el | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el index 24084c828e1..5722582ab6c 100644 --- a/lisp/net/rcirc.el +++ b/lisp/net/rcirc.el | |||
| @@ -44,6 +44,7 @@ | |||
| 44 | (require 'cl-lib) | 44 | (require 'cl-lib) |
| 45 | (require 'ring) | 45 | (require 'ring) |
| 46 | (require 'time-date) | 46 | (require 'time-date) |
| 47 | (eval-when-compile (require 'subr-x)) | ||
| 47 | 48 | ||
| 48 | (defconst rcirc-id-string (concat "rcirc on GNU Emacs " emacs-version)) | 49 | (defconst rcirc-id-string (concat "rcirc on GNU Emacs " emacs-version)) |
| 49 | 50 | ||
| @@ -1181,6 +1182,8 @@ with it." | |||
| 1181 | rcirc-log-directory) | 1182 | rcirc-log-directory) |
| 1182 | (rcirc-log-write)) | 1183 | (rcirc-log-write)) |
| 1183 | (rcirc-clean-up-buffer "Killed buffer") | 1184 | (rcirc-clean-up-buffer "Killed buffer") |
| 1185 | (when-let ((process (get-buffer-process (current-buffer)))) | ||
| 1186 | (delete-process process)) | ||
| 1184 | (when (and rcirc-buffer-alist ;; it's a server buffer | 1187 | (when (and rcirc-buffer-alist ;; it's a server buffer |
| 1185 | rcirc-kill-channel-buffers) | 1188 | rcirc-kill-channel-buffers) |
| 1186 | (dolist (channel rcirc-buffer-alist) | 1189 | (dolist (channel rcirc-buffer-alist) |