summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorF. Jason Park <jp@neverwas.me>2022-04-05 01:30:07 -0700
committerF. Jason Park <jp@neverwas.me>2022-06-30 15:03:26 -0700
commit54414ec846c9b3615138355fb4f1c4890038e231 (patch)
tree5337d9baacd590a349723b9a3d472b98e2e68c2b
parent0f52e7ac68457ca8beb22cd382b1637fed35fd73 (diff)
downloademacs-54414ec846c9b3615138355fb4f1c4890038e231.tar.gz
Initialize erc-server-filter-data in erc-backend
* lisp/erc/erc-backend.el (erc-server-connect): Set `erc-server-filter-data' to nil upon (re)connecting. * lisp/erc/erc.el (erc-open): For the sake of clarity, don't initialize `erc-server-filter-data' here because non-connect invocations merely set up a target buffer and have no business touching this variable.
-rw-r--r--lisp/erc/erc-backend.el1
-rw-r--r--lisp/erc/erc.el3
2 files changed, 1 insertions, 3 deletions
diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el
index 2f0b523d1b2..5250df31f61 100644
--- a/lisp/erc/erc-backend.el
+++ b/lisp/erc/erc-backend.el
@@ -534,6 +534,7 @@ TLS (see `erc-session-client-certificate' for more details)."
(error "Connection attempt failed"))
;; Misc server variables
(with-current-buffer buffer
+ (setq erc-server-filter-data nil)
(setq erc-server-process process)
(setq erc-server-quitting nil)
(setq erc-server-reconnecting nil
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index c4689a4b78b..9240791b1ea 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -138,7 +138,6 @@
(defvar erc-server-connect-function)
(defvar erc-server-connected)
(defvar erc-server-current-nick)
-(defvar erc-server-filter-data)
(defvar erc-server-lag)
(defvar erc-server-last-sent-time)
(defvar erc-server-parameters)
@@ -2055,8 +2054,6 @@ Returns the buffer for the given server or channel."
(setq erc-server-users nil)
(setq erc-channel-users
(make-hash-table :test 'equal))))
- ;; clear last incomplete line read
- (setq erc-server-filter-data nil)
(setq erc-channel-topic "")
;; limit on the number of users on the channel (mode +l)
(setq erc-channel-user-limit nil)