From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: "F. Jason Park" Date: Tue, 5 Apr 2022 01:30:07 -0700 Subject: [PATCH 02/35] 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. --- lisp/erc/erc-backend.el | 1 + lisp/erc/erc.el | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el index 1e3af1bedd..d442013cf4 100644 --- a/lisp/erc/erc-backend.el +++ b/lisp/erc/erc-backend.el @@ -535,6 +535,7 @@ erc-server-connect (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 c4689a4b78..9240791b1e 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -138,7 +138,6 @@ erc-server-announced-name (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 @@ erc-open (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) -- 2.36.1