aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDeniz Dogan2015-12-27 22:36:55 +0100
committerLars Ingebrigtsen2015-12-27 22:36:55 +0100
commita36c88806dcfc993e6af83b0d0f44b077293bc30 (patch)
tree9de01e380b06f48969fd4a428266125a5668272c
parentff5f37e56a1df53dbc15c8590d904ac37a82a335 (diff)
downloademacs-a36c88806dcfc993e6af83b0d0f44b077293bc30.tar.gz
emacs-a36c88806dcfc993e6af83b0d0f44b077293bc30.zip
Clear erc user list upon disconnection
* lisp/erc/erc-backend.el (erc-process-sentinel): Clear channel user lists upon disconnection. This prevents invalid channel user lists when reconnecting (bug#10947).
-rw-r--r--lisp/erc/erc-backend.el3
1 files changed, 3 insertions, 0 deletions
diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el
index df957d1ce42..06a23e80fdd 100644
--- a/lisp/erc/erc-backend.el
+++ b/lisp/erc/erc-backend.el
@@ -703,6 +703,9 @@ Conditionally try to reconnect and take appropriate action."
703 (setq erc-server-ping-handler nil))) 703 (setq erc-server-ping-handler nil)))
704 (run-hook-with-args 'erc-disconnected-hook 704 (run-hook-with-args 'erc-disconnected-hook
705 (erc-current-nick) (system-name) "") 705 (erc-current-nick) (system-name) "")
706 (dolist (buf (erc-buffer-filter (lambda () (boundp 'erc-channel-users)) cproc))
707 (with-current-buffer buf
708 (setq erc-channel-users (make-hash-table :test 'equal))))
706 ;; Remove the prompt 709 ;; Remove the prompt
707 (goto-char (or (marker-position erc-input-marker) (point-max))) 710 (goto-char (or (marker-position erc-input-marker) (point-max)))
708 (forward-line 0) 711 (forward-line 0)