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.

diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el
index 2f0b523d1b2161d4f4e88ad1cd700edd2b0ed45b..5250df31f61a97021995678adec904cc1af68bb5 100644 (file)
--- 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 c4689a4b78b5f3b73df480b8760aaee7bc27f278..9240791b1eaf3c0ade0482028e75ff600225b241 100644 (file)
--- 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)