From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Olivier Certner Newsgroups: gmane.emacs.bugs Subject: bug#44140: Updated patch Date: Tue, 06 Jul 2021 14:09:07 +0200 Message-ID: <5185929.AkrkOM9GSo@ravel> References: <1821306.tpkKSVv8f3@ravel> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="nextPart2455234.AHzxk48Zue" Content-Transfer-Encoding: 7Bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="1428"; mail-complaints-to="usenet@ciao.gmane.io" To: 44140@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Jul 06 17:12:19 2021 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1m0mkF-0000C9-1f for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 06 Jul 2021 17:12:19 +0200 Original-Received: from localhost ([::1]:35382 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0mkD-0000Fd-7l for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 06 Jul 2021 11:12:17 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:33386) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mXR-0005CE-Ev for bug-gnu-emacs@gnu.org; Tue, 06 Jul 2021 10:59:05 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:38138) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mXP-0002FJ-Hw for bug-gnu-emacs@gnu.org; Tue, 06 Jul 2021 10:59:04 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m0mXP-0006yr-IL for bug-gnu-emacs@gnu.org; Tue, 06 Jul 2021 10:59:03 -0400 X-Loop: help-debbugs@gnu.org In-Reply-To: <1821306.tpkKSVv8f3@ravel> Resent-From: Olivier Certner Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 06 Jul 2021 14:59:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44140 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 44140-submit@debbugs.gnu.org id=B44140.162558351926744 (code B ref 44140); Tue, 06 Jul 2021 14:59:03 +0000 Original-Received: (at 44140) by debbugs.gnu.org; 6 Jul 2021 14:58:39 +0000 Original-Received: from localhost ([127.0.0.1]:49671 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m0mX1-0006xA-8V for submit@debbugs.gnu.org; Tue, 06 Jul 2021 10:58:39 -0400 Original-Received: from smtp5-g21.free.fr ([212.27.42.5]:6036) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m0jsz-0008Ru-Ec for 44140@debbugs.gnu.org; Tue, 06 Jul 2021 08:09:10 -0400 Original-Received: from ravel.localnet (unknown [2.15.208.149]) (Authenticated sender: ocert.dev@free.fr) by smtp5-g21.free.fr (Postfix) with ESMTPSA id 0558F5FEF7 for <44140@debbugs.gnu.org>; Tue, 6 Jul 2021 14:09:07 +0200 (CEST) X-Mailman-Approved-At: Tue, 06 Jul 2021 10:58:37 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:209526 Archived-At: This is a multi-part message in MIME format. --nextPart2455234.AHzxk48Zue Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="UTF-8" Patch slightly edited (commit message, doc text) and rebased on top of a recent 'master'. Ready to apply. Easy to backport to 27 as well. -- Olivier Certner --nextPart2455234.AHzxk48Zue Content-Disposition: attachment; filename="0001-ERC-right-stamps-Use-also-latest-buffer-s-window-s-w.patch" Content-Transfer-Encoding: 7Bit Content-Type: text/x-patch; charset="UTF-8"; name="0001-ERC-right-stamps-Use-also-latest-buffer-s-window-s-w.patch" >From 3658345e21d65c1c4e72ec7a7d90e0dcf08f1f7f Mon Sep 17 00:00:00 2001 From: Olivier Certner Date: Tue, 6 Jul 2021 12:35:43 +0200 Subject: [PATCH] ERC right stamps: Use also latest buffer's window's width (Bug#44140) * lisp/erc/erc-stamp.el (erc-insert-timestamp-right): Use latest buffer's window's width to position the timestamp, if both `erc-timestamp-right-column' and `erc-fill-column' are not set (or `erc-fill-mode' is off). This is what the documentation says, but was not implemented. Also fix the bug of using selected window's width instead of the (or some) window showing the buffer. The latest window's width is saved in `erc-timestamp-last-window-width' and used when the buffer is no more shown. In case the buffer was never shown, which I'm not sure can happen, either use `fill-column' if set, or give up on aligning and just output the timestamp (modulo the kludge) right after message text. While here, fix the off by one calculation of point start when the reference is the window's width. --- lisp/erc/erc-stamp.el | 44 ++++++++++++++++++++++++++++--------------- 1 file changed, 29 insertions(+), 15 deletions(-) diff --git a/lisp/erc/erc-stamp.el b/lisp/erc/erc-stamp.el index 31de9e8069..4cf744549d 100644 --- a/lisp/erc/erc-stamp.el +++ b/lisp/erc/erc-stamp.el @@ -181,6 +181,11 @@ erc-add-timestamp (list (lambda (_window _before dir) (erc-echo-timestamp dir ct)))))))) +(defvar-local erc-timestamp-last-window-width nil + "Stores the width of the last window that showed the current +buffer. This is used by `erc-insert-timestamp-right' when the +current buffer is not shown in any window.") + (defvar-local erc-timestamp-last-inserted nil "Last timestamp inserted into the buffer.") @@ -250,27 +255,32 @@ erc-fill-column (defun erc-insert-timestamp-right (string) "Insert timestamp on the right side of the screen. -STRING is the timestamp to insert. The function is a possible value -for `erc-insert-timestamp-function'. +STRING is the timestamp to insert. This function is a possible +value for `erc-insert-timestamp-function'. -If `erc-timestamp-only-if-changed-flag' is nil, a timestamp is always -printed. If this variable is non-nil, a timestamp is only printed if -it is different from the last. +If `erc-timestamp-only-if-changed-flag' is nil, a timestamp is +always printed. If this variable is non-nil, a timestamp is only +printed if it is different from the last. -If `erc-timestamp-right-column' is set, its value will be used as the -column at which the timestamp is to be printed. If it is nil, and -`erc-fill-mode' is active, then the timestamp will be printed just -before `erc-fill-column'. Otherwise, if the current buffer is -shown in a window, that window's width is used. If the buffer is -not shown, and `fill-column' is set, then the timestamp will be -printed just `fill-column'. As a last resort, the timestamp will -be printed just before the window-width." +If `erc-timestamp-right-column' is set, its value will be used as +the column at which the timestamp is to be printed. If it is +nil, and `erc-fill-mode' is active, then the timestamp will be +printed just before `erc-fill-column'. Otherwise, if the current +buffer is shown in a window, that window's width is used as the +right boundary. In case multiple windows show the buffer, the +width of the most recently selected one is used. If the buffer +is not shown, the timestamp will be printed just before the +window width of the last window that showed it. If the buffer +was never shown, and `fill-column' is set, it will be printed +just before `fill-column'. As a last resort, timestamp will be +printed just after each line's text (no alignment)." (unless (and erc-timestamp-only-if-changed-flag (string-equal string erc-timestamp-last-inserted)) (setq erc-timestamp-last-inserted string) (goto-char (point-max)) (forward-char -1);; before the last newline (let* ((str-width (string-width string)) + window ; Used in 'pos' computation only (pos (cond (erc-timestamp-right-column erc-timestamp-right-column) ((and (boundp 'erc-fill-mode) @@ -278,10 +288,14 @@ erc-insert-timestamp-right (boundp 'erc-fill-column) erc-fill-column) (1+ (- erc-fill-column str-width))) + ((setq window (get-buffer-window nil t)) + (setq erc-timestamp-last-window-width (window-width window)) + (- erc-timestamp-last-window-width str-width)) + (erc-timestamp-last-window-width + (- erc-timestamp-last-window-width str-width)) (fill-column (1+ (- fill-column str-width))) - (t - (- (window-width) str-width 1)))) + (t (current-column)))) (from (point)) (col (current-column))) ;; The following is a kludge used to calculate whether to move -- 2.30.0 --nextPart2455234.AHzxk48Zue--