From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.bugs Subject: bug#22700: 25.0.91; `erc-echo-timestamps' no longer echoes timestamp for each line Date: Wed, 14 Aug 2019 18:50:12 -0400 Message-ID: References: <87r3gcmyfc.fsf@riseup.net> <871sfh4o92.fsf@mouse.gnus.org> <87h8ocei9c.fsf@mouse.gnus.org> <87imr0u7dc.fsf@gmail.com> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="64789"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) Cc: "William G. Gardella" , Lars Ingebrigtsen , 22700@debbugs.gnu.org To: Alex Branham Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Aug 15 00:51:10 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 1hy26o-000Gha-FH for geb-bug-gnu-emacs@m.gmane.org; Thu, 15 Aug 2019 00:51:10 +0200 Original-Received: from localhost ([::1]:36500 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hy26n-0000EO-65 for geb-bug-gnu-emacs@m.gmane.org; Wed, 14 Aug 2019 18:51:09 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:53165) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hy26h-0000EH-B9 for bug-gnu-emacs@gnu.org; Wed, 14 Aug 2019 18:51:04 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hy26g-0002Eh-CC for bug-gnu-emacs@gnu.org; Wed, 14 Aug 2019 18:51:03 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:41015) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hy26g-0002EX-6v for bug-gnu-emacs@gnu.org; Wed, 14 Aug 2019 18:51:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hy26g-0003zR-2s for bug-gnu-emacs@gnu.org; Wed, 14 Aug 2019 18:51:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 14 Aug 2019 22:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 22700 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: confirmed patch Original-Received: via spool by 22700-submit@debbugs.gnu.org id=B22700.156582302815284 (code B ref 22700); Wed, 14 Aug 2019 22:51:02 +0000 Original-Received: (at 22700) by debbugs.gnu.org; 14 Aug 2019 22:50:28 +0000 Original-Received: from localhost ([127.0.0.1]:49836 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hy266-0003yP-I1 for submit@debbugs.gnu.org; Wed, 14 Aug 2019 18:50:28 -0400 Original-Received: from mailscanner.iro.umontreal.ca ([132.204.25.50]:2568) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hy263-0003y9-60 for 22700@debbugs.gnu.org; Wed, 14 Aug 2019 18:50:25 -0400 Original-Received: from pmg2.iro.umontreal.ca (localhost.localdomain [127.0.0.1]) by pmg2.iro.umontreal.ca (Proxmox) with ESMTP id 8EFA585AF5; Wed, 14 Aug 2019 18:50:17 -0400 (EDT) Original-Received: from mail01.iro.umontreal.ca (unknown [172.31.2.1]) by pmg2.iro.umontreal.ca (Proxmox) with ESMTP id 3C94D85AD9; Wed, 14 Aug 2019 18:50:16 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=iro.umontreal.ca; s=mail; t=1565823016; bh=N8IX7/z9xx01BMF2fgfiq5f1RauQKZB+ggNn/KzctCo=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From; b=g/nPzygmcIax3OATd8osv2XRfLqdYEN5UFIXs5IZdQavsyY8Y4pbzylofK0X9OAAg 9GDrFnJeQng4egUXVsSSgNfVOCgcLHfCmQANfXJICt73it6wCaA6ZgMV8XHBJlA9l7 b+KzjcpCWbZygSCYL90biBPVJU6hdnLt21BTi2LDS8Y5wZrMqWm95h/Sf6q24BDVvu WdKr8zzzMT3RE9pD5bmTEJfeHmZzJKbB4kq09+1q0sMzlZjywT7v8JM4I0yqJTfYZT wD7R2xlKYAizBiBmVvnODTm0zRvf1N5hn/J1xhrxyyrZ+mnFxlzLf9agmNxYgKDWbQ c4J41esqNtTgw== Original-Received: from alfajor (dyn.83-228-179-131.dsl.vtx.ch [83.228.179.131]) by mail01.iro.umontreal.ca (Postfix) with ESMTPSA id DB805120538; Wed, 14 Aug 2019 18:50:14 -0400 (EDT) In-Reply-To: <87imr0u7dc.fsf@gmail.com> (Alex Branham's message of "Tue, 13 Aug 2019 15:40:15 -0500") 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:164987 Archived-At: > This is because cursor-sensor--detect doesn't call > cursor-sensor-functions if the text property hasn't changed[1]. Since ERC > applies the property to _all_ of the message, the text property remains > `eq' and so it doesn't get called when it should. How 'bout the patch below which makes the function different on each message? Stefan diff --git a/lisp/erc/erc-stamp.el b/lisp/erc/erc-stamp.el index b48803452a..03ea69ed4f 100644 --- a/lisp/erc/erc-stamp.el +++ b/lisp/erc/erc-stamp.el @@ -1,4 +1,4 @@ -;;; erc-stamp.el --- Timestamping for ERC messages +;;; erc-stamp.el --- Timestamping for ERC messages -*- lexical-binding:t -*- ;; Copyright (C) 2002-2004, 2006-2019 Free Software Foundation, Inc. @@ -185,11 +185,10 @@ erc-add-timestamp (not erc-timestamp-format)) (funcall erc-insert-away-timestamp-function (erc-format-timestamp ct erc-away-timestamp-format))) - (add-text-properties (point-min) (point-max) - (list 'timestamp ct)) (add-text-properties (point-min) (point-max) (list 'cursor-sensor-functions - (list #'erc-echo-timestamp)))))) + (list (lambda (_window _before dir) + (erc-echo-timestamp dir ct)))))))) (defvar erc-timestamp-last-inserted nil "Last timestamp inserted into the buffer.") @@ -399,14 +398,12 @@ erc-toggle-timestamps (erc-munge-invisibility-spec))) (erc-buffer-list))) -(defun erc-echo-timestamp (window _before dir) +(defun erc-echo-timestamp (dir stamp) "Print timestamp text-property of an IRC message." (when (and erc-echo-timestamps (eq 'entered dir)) - (let* ((now (window-point window)) - (stamp (get-text-property now 'timestamp))) - (when stamp - (message "%s" (format-time-string erc-echo-timestamp-format - stamp)))))) + (when stamp + (message "%s" (format-time-string erc-echo-timestamp-format + stamp))))) (provide 'erc-stamp)