From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Amin Bandali Newsgroups: gmane.emacs.bugs Subject: bug#36843: 26.2; ERC lurker feature broken Date: Sat, 17 Aug 2019 14:34:52 -0400 Message-ID: <87v9uvmyib.fsf@gnu.org> References: <877e80o5tb.fsf@thb.lt> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="120829"; mail-complaints-to="usenet@blaine.gmane.org" Cc: 36843@debbugs.gnu.org To: Thibault Polge Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Aug 17 20:35:11 2019 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1hz3Xj-000VJF-4Q for geb-bug-gnu-emacs@m.gmane.org; Sat, 17 Aug 2019 20:35:11 +0200 Original-Received: from localhost ([::1]:37660 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hz3Xi-0004im-3R for geb-bug-gnu-emacs@m.gmane.org; Sat, 17 Aug 2019 14:35:10 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:50144) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hz3Xc-0004iK-0t for bug-gnu-emacs@gnu.org; Sat, 17 Aug 2019 14:35:05 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hz3Xa-0002Qo-UJ for bug-gnu-emacs@gnu.org; Sat, 17 Aug 2019 14:35:03 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:48036) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hz3Xa-0002Qi-RH for bug-gnu-emacs@gnu.org; Sat, 17 Aug 2019 14:35:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hz3Xa-0003Yv-Jj for bug-gnu-emacs@gnu.org; Sat, 17 Aug 2019 14:35:02 -0400 X-Loop: help-debbugs@gnu.org In-Reply-To: <877e80o5tb.fsf@thb.lt> Resent-From: Amin Bandali Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 17 Aug 2019 18:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36843 X-GNU-PR-Package: emacs Original-Received: via spool by 36843-submit@debbugs.gnu.org id=B36843.156606690213690 (code B ref 36843); Sat, 17 Aug 2019 18:35:02 +0000 Original-Received: (at 36843) by debbugs.gnu.org; 17 Aug 2019 18:35:02 +0000 Original-Received: from localhost ([127.0.0.1]:56857 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hz3XZ-0003Yd-In for submit@debbugs.gnu.org; Sat, 17 Aug 2019 14:35:01 -0400 Original-Received: from eggs.gnu.org ([209.51.188.92]:37791) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hz3XY-0003YM-6z for 36843@debbugs.gnu.org; Sat, 17 Aug 2019 14:35:00 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:46638) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hz3XS-0002MX-FX; Sat, 17 Aug 2019 14:34:54 -0400 Original-Received: from [2607:fea8:3b80:184:757c:ddb:c40:3329] (port=39682 helo=localhost) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1hz3XS-0005CX-5p; Sat, 17 Aug 2019 14:34:54 -0400 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:165279 Archived-At: --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Below is a patch that seems to fix this. I haven=E2=80=99t tested the actu= al patch but I=E2=80=99ve added its changed to my init file (adding the new de= fvar, and redefining erc-display-message and erc-lurker-update-status) for the last couple of days, and it seems to work as intended. Thanks to Noam for helping me with this over on #emacs. --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-Fix-erc-lurker-update-status.patch >From 389654f5c7a9ad0975bff84a163ed6234cdb3cb8 Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Sat, 17 Aug 2019 14:09:11 -0400 Subject: [PATCH] Fix erc-lurker-update-status Fix erc-lurker-update-status (bug#36843), broken since d0fcaff514d2be16ccf73817f658318cf85221e3. * lisp/erc/erc.el: define `erc-message-parsed', lexically bind it in `erc-display-message', and change `erc-lurker-update-status' to use that instead of using `parsed' directly. This results in `erc-lurker-state' being properly updated to keep track of non-lurkers, and thus `erc-lurker-p' returning correct results rather than return t for everyone. --- lisp/erc/erc.el | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index f5c9decc3a..9ea9e608ac 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -2594,6 +2594,8 @@ erc-lurker-cleanup-interval consumption of lurker state during long Emacs sessions and/or ERC sessions with large numbers of incoming PRIVMSGs.") +(defvar erc-message-parsed) + (defun erc-lurker-update-status (_message) "Update `erc-lurker-state' if necessary. @@ -2603,18 +2605,20 @@ erc-lurker-update-status current time. Otherwise, take no action. This function depends on the fact that `erc-display-message' -dynamically binds `parsed', which is used to check if the current -message is a PRIVMSG and to determine its sender. See also -`erc-lurker-trim-nicks' and `erc-lurker-ignore-chars'. +dynamically binds `erc-message-parsed', which is used to check if +the current message is a PRIVMSG and to determine its sender. +See also `erc-lurker-trim-nicks' and `erc-lurker-ignore-chars'. In order to limit memory consumption, this function also calls `erc-lurker-cleanup' once every `erc-lurker-cleanup-interval' updates of `erc-lurker-state'." - (when (and (boundp 'parsed) (erc-response-p parsed)) - (let* ((command (erc-response.command parsed)) + (when (and (boundp 'erc-message-parsed) + (erc-response-p erc-message-parsed)) + (let* ((command (erc-response.command erc-message-parsed)) (sender (erc-lurker-maybe-trim - (car (erc-parse-user (erc-response.sender parsed))))) + (car (erc-parse-user + (erc-response.sender erc-message-parsed))))) (server (erc-canonicalize-server-name erc-server-announced-name))) (when (equal command "PRIVMSG") @@ -2704,7 +2708,8 @@ erc-display-message See also `erc-format-message' and `erc-display-line'." (let ((string (if (symbolp msg) (apply #'erc-format-message msg args) - msg))) + msg)) + (erc-message-parsed parsed)) (setq string (cond ((null type) -- 2.22.0 --=-=-=--