emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master 54414ec846 02/25: Initialize erc-server-filter-data in erc-backen


From: F. Jason Park
Subject: master 54414ec846 02/25: Initialize erc-server-filter-data in erc-backend
Date: Thu, 30 Jun 2022 18:29:52 -0400 (EDT)

branch: master
commit 54414ec846c9b3615138355fb4f1c4890038e231
Author: F. Jason Park <jp@neverwas.me>
Commit: F. Jason Park <jp@neverwas.me>

    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 2f0b523d1b..5250df31f6 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 c4689a4b78..9240791b1e 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)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]