From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: "J.P." Newsgroups: gmane.emacs.bugs,gmane.emacs.erc.general Subject: bug#60936: 30.0.50; ERC >5.5: Add erc-fill style based on visual-line-mode Date: Wed, 06 Dec 2023 23:14:33 -0800 Message-ID: <878r667acm.fsf@neverwas.me> References: <87tu0nao77.fsf@neverwas.me> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="11886"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: emacs-erc@gnu.org To: 60936@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu Dec 07 08:15:18 2023 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 1rB8bN-0002kn-6b for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 07 Dec 2023 08:15:17 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rB8b0-0004sp-AV; Thu, 07 Dec 2023 02:14:54 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rB8aw-0004rX-E9 for bug-gnu-emacs@gnu.org; Thu, 07 Dec 2023 02:14:50 -0500 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rB8aw-00021y-2l for bug-gnu-emacs@gnu.org; Thu, 07 Dec 2023 02:14:50 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rB8b8-0006Eb-29 for bug-gnu-emacs@gnu.org; Thu, 07 Dec 2023 02:15:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: "J.P." Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 07 Dec 2023 07:15:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60936 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 60936-submit@debbugs.gnu.org id=B60936.170193329623935 (code B ref 60936); Thu, 07 Dec 2023 07:15:02 +0000 Original-Received: (at 60936) by debbugs.gnu.org; 7 Dec 2023 07:14:56 +0000 Original-Received: from localhost ([127.0.0.1]:40911 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rB8b2-0006Dz-Iu for submit@debbugs.gnu.org; Thu, 07 Dec 2023 02:14:56 -0500 Original-Received: from mail-108-mta235.mxroute.com ([136.175.108.235]:45025) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rB8b0-0006Do-0H for 60936@debbugs.gnu.org; Thu, 07 Dec 2023 02:14:54 -0500 Original-Received: from filter006.mxroute.com ([136.175.111.2] filter006.mxroute.com) (Authenticated sender: mN4UYu2MZsgR) by mail-108-mta235.mxroute.com (ZoneMTA) with ESMTPSA id 18c4320e60a000190b.001 for <60936@debbugs.gnu.org> (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Thu, 07 Dec 2023 07:14:38 +0000 X-Zone-Loop: 7c211717431dbfe7a724ec851c5e3de0d75727deb04d X-Originating-IP: [136.175.111.2] DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=neverwas.me ; s=x; h=Content-Type:MIME-Version:Message-ID:Date:References:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=IDqvN3YB5OpfVhqEsg2hx9joLkqPZlrSkUuN388nYO8=; b=RcNfXZV/R10CRztjKhAJI8BSnX 21Re0/6LCE2d+kI9VseccYt4EEXitTKkSefaHpnBVfUJGG9m8f23g8cCoz5dQdJdZeTf8WNZIm8Nn louJc2Fw3mLNJwWciCaIbwCWUBQwCdbtb9Ye+VYGt3Na+Lh2YRc+0Hg/9pwwWMEl+OGuwycLbnOFT klawFaLFU3SNNTeA8EFmtSRhqWps3aPH5O22Ujqmkq8BAo7aykAkYV5hoqMTrpXDjfYwXLBCzl69H /s6W+a1tUlJfD5da9Ew+unNbP71scvOVqRcYOn59FQ4JINs1v3pTOVjLRjzUyPzRD/P41sq5ENdQw Q1EDBzLA==; In-Reply-To: <87tu0nao77.fsf@neverwas.me> (J. P.'s message of "Wed, 18 Jan 2023 06:53:48 -0800") X-Authenticated-Id: masked@neverwas.me 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-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:275647 gmane.emacs.erc.general:2322 Archived-At: --=-=-= Content-Type: text/plain Changes related to this feature introduced a number of meta-data oriented text properties that I think, in retrospect, should have been double-hyphenated to dissuade users from depending on them. Also, a couple of properties, like `erc-stamp-type', are superfluous, and can be removed. The first of the attached patches should take care of this. There's also (IMO) a rather obvious need for an `erc--spkr' property to aid modules in quickly distinguishing between inserted messages based on their speaker (nick). For example, a module that detects continued messages that should be displayed as a single unit might otherwise have to keep a local backlog or parse inserted messages at runtime. The second of the attached patches tries to address this. Lastly, in "designing" the makeup of these properties, I chose to assign a constant `msg' value for the required `erc--msg' property to all speaker-owned messages, like those originating from PRIVMSG and NOTICE commands. The idea was to allow modules to distinguish between speaker messages and other types. However, making `erc--msg' a union of `msg' and `format-spec' "catalog" keys (and `erc-display-message' TYPE parameters) meant coercing keys for speaker messages to `msg', thereby discarding what now looks to be valuable information (especially in light of bug#67677). Thus, I'm proposing we remove `msg' as an advertised `erc--msg' value and instead rely on `erc--spkr' to convey speaker associations. See bug#67677 for more. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0003-5.6-Double-hyphenate-internal-ERC-5.6-text-props.patch Content-Transfer-Encoding: quoted-printable >From 218a4f1f4b405fe5c7d934948bdc12a9ea0f2baf Mon Sep 17 00:00:00 2001 From: "F. Jason Park" Date: Fri, 1 Dec 2023 22:30:04 -0800 Subject: [PATCH 03/11] [5.6] Double hyphenate internal ERC 5.6 text props * lisp/erc/erc-fill.el (erc-fill, erc-fill-static, erc-fill--wrap-continued-message-p, erc-fill-wrap, erc-fill--wrap-rejigger-region): Add second hyphen to "msg prop" text properties. * lisp/erc/erc-goodies.el (erc--command-indicator-display): Rename `erc-msg' to `erc--msg'. * lisp/erc/erc-stamp.el (erc-stamp--current-time, erc-add-timestamp, erc-stamp-prefix-log-filter, erc-stamp--lr-date-on-pre-modify, erc-munge-invisibility-spec, erc-stamp--add-csf-on-post-modify, erc-stamp--on-clear-message, erc-echo-timestamp, erc--echo-ts-csf): Rename "msg props" with second hyphen. * lisp/erc/erc-track.el (erc-track--skipped-msgs, erc-track-modified-channels): Rename "msg prop" text properties with second hyphen. * lisp/erc/erc.el (erc--msg-props): Update doc with double-hyphenated "msg prop" names. (erc--send-action-display erc--get-inserted-msg-bounds, erc--traverse-inserted, erc-insert-line, erc-display-line, erc--ranked-properties, erc-display-message, erc--get-speaker-bounds, erc-process-ctcp-query, erc-display-msg): Update all "msg prop" names to have two hyphens. * test/lisp/erc/erc-scenarios-display-message.el (erc-scenarios-display-message--multibuf): Double hyphenate "msg prop" text properties. * test/lisp/erc/erc-scenarios-match.el (erc-scenarios-match--hide-fools/stamp-both/fill-wrap, erc-scenarios-match--hide-fools/stamp-both/fill-wrap/speak, erc-scenarios-match--stamp-both-invisible-fill-static): Update "msg prop" names. * test/lisp/erc/erc-scenarios-stamp.el (erc-scenarios-stamp--on-post-modify, erc-scenarios-stamp--left/display-margin-mode, erc-scenarios-stamp--legacy-date-stamps, erc-scenarios-stamp--on-insert-modify, erc-scenarios-stamp--date-mode/left-and-right): Add second hyphen to all "msg props". * test/lisp/erc/erc-stamp-tests.el (erc-echo-timestamp): Rename "msg prop". * test/lisp/erc/erc-tests.el (erc--get-inserted-msg-bounds, erc--delete-inserted-message, erc--order-text-properties-from-hash, erc--route-insertion): Rename "msg props" with second hyphen. (Bug#60936) ; * test/lisp/erc/resources/fill/snapshots/merge-01-start.eld: ; Add second hyphen to msg props. ; * test/lisp/erc/resources/fill/snapshots/merge-02-right.eld: ; Add second hyphen to msg props. ; * test/lisp/erc/resources/fill/snapshots/merge-wrap-01.eld: ; Add second hyphen to msg props. ; * test/lisp/erc/resources/fill/snapshots/merge-wrap-indicator-post-01.eld: ; Add second hyphen to msg props. ; * test/lisp/erc/resources/fill/snapshots/merge-wrap-indicator-pre-01.eld: ; Add second hyphen to msg props. ; * test/lisp/erc/resources/fill/snapshots/monospace-01-start.eld: ; Add second hyphen to msg props. ; * test/lisp/erc/resources/fill/snapshots/monospace-02-right.eld: ; Add second hyphen to msg props. ; * test/lisp/erc/resources/fill/snapshots/monospace-03-left.eld: ; Add second hyphen to msg props. ; * test/lisp/erc/resources/fill/snapshots/monospace-04-reset.eld: ; Add second hyphen to msg props. ; * test/lisp/erc/resources/fill/snapshots/spacing-01-mono.eld: ; Add second hyphen to msg props. ; * test/lisp/erc/resources/fill/snapshots/stamps-left-01.eld: ; Add second hyphen to msg props. --- lisp/erc/erc-fill.el | 22 ++++---- lisp/erc/erc-goodies.el | 2 +- lisp/erc/erc-stamp.el | 24 ++++----- lisp/erc/erc-track.el | 4 +- lisp/erc/erc.el | 50 +++++++++---------- .../lisp/erc/erc-scenarios-display-message.el | 4 +- test/lisp/erc/erc-scenarios-match.el | 14 +++--- test/lisp/erc/erc-scenarios-stamp.el | 18 +++---- test/lisp/erc/erc-stamp-tests.el | 2 +- test/lisp/erc/erc-tests.el | 20 ++++---- .../fill/snapshots/merge-01-start.eld | 2 +- .../fill/snapshots/merge-02-right.eld | 2 +- .../fill/snapshots/merge-wrap-01.eld | 2 +- .../merge-wrap-indicator-post-01.eld | 2 +- .../snapshots/merge-wrap-indicator-pre-01.eld | 2 +- .../fill/snapshots/monospace-01-start.eld | 2 +- .../fill/snapshots/monospace-02-right.eld | 2 +- .../fill/snapshots/monospace-03-left.eld | 2 +- .../fill/snapshots/monospace-04-reset.eld | 2 +- .../fill/snapshots/spacing-01-mono.eld | 2 +- .../fill/snapshots/stamps-left-01.eld | 2 +- 21 files changed, 91 insertions(+), 91 deletions(-) diff --git a/lisp/erc/erc-fill.el b/lisp/erc/erc-fill.el index 9b0c74b518d..5434d9af966 100644 --- a/lisp/erc/erc-fill.el +++ b/lisp/erc/erc-fill.el @@ -177,10 +177,10 @@ erc-fill (when-let ((erc-fill-line-spacing) (p (point-min))) (widen) - (when (or (erc--check-msg-prop 'erc-msg 'msg) + (when (or (erc--check-msg-prop 'erc--msg 'msg) (and-let* ((m (save-excursion (forward-line -1) - (erc--get-inserted-msg-prop 'erc-msg= )))) + (erc--get-inserted-msg-prop 'erc--ms= g)))) (eq 'msg m))) (put-text-property (1- p) p 'line-spacing erc-fill-line-spacing))))))= )) @@ -190,7 +190,7 @@ erc-fill-static (save-restriction (goto-char (point-min)) (when-let (((looking-at "^\\(\\S-+\\)")) - ((not (erc--check-msg-prop 'erc-msg 'datestamp))) + ((not (erc--check-msg-prop 'erc--msg 'datestamp))) (nick (match-string 1))) (progn (let ((fill-column (- erc-fill-column (erc-timestamp-offset))) @@ -557,7 +557,7 @@ erc-fill--wrap-continued-message-p advance `erc-fill--wrap-last-msg' unless the message has been marked as being ephemeral." (and - (not (erc--check-msg-prop 'erc-ephemeral)) + (not (erc--check-msg-prop 'erc--ephemeral)) (progn ; preserve blame for now, unprogn on next major change (prog1 (and-let* @@ -568,12 +568,12 @@ erc-fill--wrap-continued-message-p (props (save-restriction (widen) (and-let* - (((eq 'msg (get-text-property m 'erc-msg))) - ((not (eq (get-text-property m 'erc-ctcp) + (((eq 'msg (get-text-property m 'erc--msg))) + ((not (eq (get-text-property m 'erc--ctcp) 'ACTION))) ((not (invisible-p m))) (spr (next-single-property-change m 'erc-speak= er))) - (cons (get-text-property m 'erc-ts) + (cons (get-text-property m 'erc--ts) (get-text-property spr 'erc-speaker))))) (ts (pop props)) (props) @@ -582,7 +582,7 @@ erc-fill--wrap-continued-message-p erc-fill--wrap-max-lull)) ;; Assume presence of leading angle bracket or hyphen. (speaker (next-single-property-change (point-min) 'erc-speak= er)) - ((not (erc--check-msg-prop 'erc-ctcp 'ACTION))) + ((not (erc--check-msg-prop 'erc--ctcp 'ACTION))) (nick (get-text-property speaker 'erc-speaker)) ((erc-nick-equal-p props nick)))) (set-marker erc-fill--wrap-last-msg (point-min)))))) @@ -668,12 +668,12 @@ erc-fill-wrap (goto-char (point-min)) (let ((len (or (and erc-fill--wrap-length-function (funcall erc-fill--wrap-length-function)) - (and-let* ((msg-prop (erc--check-msg-prop 'erc-msg)) + (and-let* ((msg-prop (erc--check-msg-prop 'erc--msg)) ((not (eq msg-prop 'unknown)))) (when-let ((e (erc--get-speaker-bounds)) (b (pop e)) ((or erc-fill--wrap-action-dedent-p - (not (erc--check-msg-prop 'erc-ctcp + (not (erc--check-msg-prop 'erc--ctcp 'ACTION))))) (goto-char e)) (skip-syntax-forward "^-") @@ -755,7 +755,7 @@ erc-fill--wrap-rejigger-region (field-beginning beg) beg)) (erc--msg-props (map-into (text-properties-at pos) 'hash-tabl= e)) - (erc-stamp--current-time (gethash 'erc-ts erc--msg-props))) + (erc-stamp--current-time (gethash 'erc--ts erc--msg-props))) (save-restriction (narrow-to-region beg (1+ end)) (let ((erc-fill--wrap-last-msg erc-fill--wrap-rejigger-last-mess= age)) diff --git a/lisp/erc/erc-goodies.el b/lisp/erc/erc-goodies.el index 6c8ec567bd9..e10f047b187 100644 --- a/lisp/erc/erc-goodies.el +++ b/lisp/erc/erc-goodies.el @@ -578,7 +578,7 @@ erc--command-indicator-display (let ((insert-position (marker-position (goto-char erc-insert-marker= ))) (erc--msg-props (or erc--msg-props (let ((ovs erc--msg-prop-overrides)) - (map-into `((erc-msg . slash-cmd) + (map-into `((erc--msg . slash-cmd) ,@(reverse ovs)) 'hash-table))))) (when-let ((string (erc-command-indicator)) diff --git a/lisp/erc/erc-stamp.el b/lisp/erc/erc-stamp.el index e6a8f36c332..a6efa3b5151 100644 --- a/lisp/erc/erc-stamp.el +++ b/lisp/erc/erc-stamp.el @@ -212,7 +212,7 @@ erc-stamp--current-time =20 (cl-defgeneric erc-stamp--current-time () "Return a lisp time object to associate with an IRC message. -This becomes the message's `erc-ts' text property." +This becomes the message's `erc--ts' text property." (erc-compat--current-lisp-time)) =20 (cl-defmethod erc-stamp--current-time :around () @@ -249,10 +249,10 @@ erc-add-timestamp ;; FIXME on major version bump, make this `erc-' prefixed. (if invisible `(timestamp ,@(ensure-list invisible)) 'timestam= p)) (skipp (or (and erc-stamp--skip-when-invisible invisible) - (erc--check-msg-prop 'erc-ephemeral))) + (erc--check-msg-prop 'erc--ephemeral))) (erc-stamp--current-time ct)) (when erc--msg-props - (puthash 'erc-ts ct erc--msg-props)) + (puthash 'erc--ts ct erc--msg-props)) (unless skipp (funcall erc-insert-timestamp-function (erc-format-timestamp ct erc-timestamp-format))) @@ -270,7 +270,7 @@ erc-add-timestamp ;; be different on different entries (bug#22700). (list 'cursor-sensor-functions ;; Regions are no longer contiguous ^ - '(erc--echo-ts-csf) 'erc-ts ct)))))) + '(erc--echo-ts-csf) 'erc--ts ct)))))) =20 (defvar-local erc-timestamp-last-window-width nil "The width of the last window that showed the current buffer. @@ -403,7 +403,7 @@ erc-stamp-prefix-log-filter ;; Skip a line that's just a timestamp. ((> beg (point)))) (delete-region beg (1+ end))) - (when-let (time (erc--get-inserted-msg-prop 'erc-ts)) + (when-let (time (erc--get-inserted-msg-prop 'erc--ts)) (insert (format-time-string "[%H:%M:%S] " time))) (zerop (forward-line)))) "") @@ -711,8 +711,8 @@ erc-stamp--lr-date-on-pre-modify (setq erc-timestamp-last-inserted-left nil) (let* ((aligned (erc-stamp--time-as-day ct)) (erc-stamp--current-time aligned) - ;; Forget current `erc-cmd', etc. - (erc--msg-props (map-into `((erc-msg . datestamp)) + ;; Forget current `erc--cmd', etc. + (erc--msg-props (map-into `((erc--msg . datestamp)) 'hash-table)) (erc-timestamp-last-inserted-left rendered) erc-timestamp-format erc-away-timestamp-format) @@ -867,7 +867,7 @@ erc-munge-invisibility-spec erc-stamp--csf-props-updated-p nil) (unless erc-stamp--csf-props-updated-p (setq erc-stamp--csf-props-updated-p t) - (let ((erc--msg-props (map-into '((erc-ts . t)) 'hash-table))) + (let ((erc--msg-props (map-into '((erc--ts . t)) 'hash-table))) (with-silent-modifications (erc--traverse-inserted (point-min) erc-insert-marker @@ -889,7 +889,7 @@ erc-munge-invisibility-spec =20 (defun erc-stamp--add-csf-on-post-modify () "Add `cursor-sensor-functions' to narrowed buffer." - (when (erc--check-msg-prop 'erc-ts) + (when (erc--check-msg-prop 'erc--ts) (put-text-property (point-min) (1- (point-max)) 'cursor-sensor-functions '(erc--echo-ts-csf)))) =20 @@ -940,7 +940,7 @@ erc-stamp--last-stamp (defun erc-stamp--on-clear-message (&rest _) "Return `dont-clear-message' when operating inside the same stamp." (and erc-stamp--last-stamp erc-echo-timestamps - (eq (erc--get-inserted-msg-prop 'erc-ts) erc-stamp--last-stamp) + (eq (erc--get-inserted-msg-prop 'erc--ts) erc-stamp--last-stamp) 'dont-clear-message)) =20 (defun erc-echo-timestamp (dir stamp &optional zone) @@ -950,7 +950,7 @@ erc-echo-timestamp interpret a \"raw\" prefix as UTC. To specify a zone for use with the option `erc-echo-timestamps', see the companion option `erc-echo-timestamp-zone'." - (interactive (list nil (erc--get-inserted-msg-prop 'erc-ts) + (interactive (list nil (erc--get-inserted-msg-prop 'erc--ts) (pcase current-prefix-arg ((and (pred numberp) v) (if (<=3D (abs v) 14) (* v 3600) v)) @@ -964,7 +964,7 @@ erc-echo-timestamp (setq erc-stamp--last-stamp nil)))) =20 (defun erc--echo-ts-csf (_window _before dir) - (erc-echo-timestamp dir (erc--get-inserted-msg-prop 'erc-ts))) + (erc-echo-timestamp dir (erc--get-inserted-msg-prop 'erc--ts))) =20 (defun erc-stamp--update-saved-position (&rest _) (remove-hook 'erc-stamp--insert-date-hook diff --git a/lisp/erc/erc-track.el b/lisp/erc/erc-track.el index a36b781e04d..7dc4fe754cd 100644 --- a/lisp/erc/erc-track.el +++ b/lisp/erc/erc-track.el @@ -786,7 +786,7 @@ erc-track-select-mode-line-face choice)))) =20 (defvar erc-track--skipped-msgs '(datestamp) - "Values of `erc-msg' text prop to ignore.") + "Values of `erc--msg' text prop to ignore.") =20 (defun erc-track-modified-channels () "Hook function for `erc-insert-post-hook'. @@ -806,7 +806,7 @@ erc-track-modified-channels erc-track-exclude-types) ;; Skip certain non-server-sent messages. (and (not parsed) - (erc--check-msg-prop 'erc-msg + (erc--check-msg-prop 'erc--msg erc-track--skipped-msgs)= ))))) ;; If the active buffer is not visible (not shown in a ;; window), and not to be excluded, determine the kinds of diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index a42c50d91ff..c68c74467b8 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -154,26 +154,26 @@ erc--msg-props their markers accordingly. The following properties have meaning as of ERC 5.6: =20 - - `erc-msg': a symbol, guaranteed present; values include: + - `erc--msg': a symbol, guaranteed present; values include: `msg', signifying a `PRIVMSG' or an incoming `NOTICE'; `unknown', a fallback for `erc-display-message'; a catalog key, such as `s401' or `finished'; an `erc-display-message' TYPE parameter, like `notice' =20 - - `erc-cmd': a message's associated IRC command, as read by + - `erc--cmd': a message's associated IRC command, as read by `erc--get-eq-comparable-cmd'; currently either a symbol, like `PRIVMSG', or a number, like 5, which represents the numeric \"005\"; absent on \"local\" messages, such as simple warnings and help text, and on outgoing messages unless echoed back by the server (assuming future support) =20 - - `erc-ctcp': a CTCP command, like `ACTION' + - `erc--ctcp': a CTCP command, like `ACTION' =20 - - `erc-ts': a timestamp, possibly provided by the server; as of + - `erc--ts': a timestamp, possibly provided by the server; as of 5.6, a ticks/hertz pair on Emacs 29 and above, and a \"list\" type otherwise; managed by the `stamp' module =20 - - `erc-ephemeral': a symbol prefixed by or matching a module + - `erc--ephemeral': a symbol prefixed by or matching a module name; indicates to other modules and members of modification hooks that the current message should not affect stateful operations, such as recording a channel's most recent speaker @@ -3004,7 +3004,7 @@ erc-send-action ;; Sending and displaying are provided separately to afford modules ;; more flexibility, e.g., to forgo displaying on the way out when ;; expecting the server to echo messages back and/or to associate -;; outgoing messages with IDs generated for `erc-ephemeral' +;; outgoing messages with IDs generated for `erc--ephemeral' ;; placeholders. (defun erc--send-action-perform-ctcp (target string force) "Send STRING to TARGET, possibly immediately, with FORCE." @@ -3013,8 +3013,8 @@ erc--send-action-perform-ctcp (defun erc--send-action-display (string) "Display STRING as an outgoing \"CTCP ACTION\" message." ;; Allow hooks acting on inserted PRIVMSG and NOTICES to process us. - (let ((erc--msg-prop-overrides `((erc-msg . msg) - (erc-ctcp . ACTION) + (let ((erc--msg-prop-overrides `((erc--msg . msg) + (erc--ctcp . ACTION) ,@erc--msg-prop-overrides)) (nick (erc-current-nick))) (setq nick (propertize nick 'erc-speaker nick @@ -3142,20 +3142,20 @@ erc--get-inserted-msg-bounds POINT, search from POINT instead of `point'." ;; TODO add edebug spec. `(let* ((point ,(or point '(point))) - (at-start-p (get-text-property point 'erc-msg))) + (at-start-p (get-text-property point 'erc--msg))) (and-let* (,@(and (member only '(nil beg 'beg)) '((b (or (and at-start-p point) (and-let* ((p (previous-single-property-change point - 'erc-ms= g))) + 'erc--m= sg))) (if (=3D p (1- point)) - (if (get-text-property p 'erc-msg) p (1- p= )) + (if (get-text-property p 'erc--msg) p (1- = p)) (1- p))))))) ,@(and (member only '(nil end 'end)) '((e (1- (next-single-property-change (if at-start-p (1+ point) point) - 'erc-msg nil erc-insert-marker)))))) + 'erc--msg nil erc-insert-marker)))))) ,(pcase only ('(quote beg) 'b) ('(quote end) 'e) @@ -3184,12 +3184,12 @@ erc--traverse-inserted (set-marker end (min erc-insert-marker end))) (save-excursion (goto-char beg) - (let ((b (if (get-text-property (point) 'erc-msg) + (let ((b (if (get-text-property (point) 'erc--msg) (point) - (next-single-property-change (point) 'erc-msg nil end)))) + (next-single-property-change (point) 'erc--msg nil end)))) (while-let ((b) ((< b end)) - (e (next-single-property-change (1+ b) 'erc-msg nil end)= )) + (e (next-single-property-change (1+ b) 'erc--msg nil end= ))) (save-restriction (narrow-to-region b e) (funcall fn)) @@ -3267,7 +3267,7 @@ erc-insert-line (let ((props (if erc--msg-props (erc--order-text-properties-from-hash erc--msg-props) - '(erc-msg unknown)))) + '(erc--msg unknown)))) (add-text-properties (point-min) (1+ (point-min)) prop= s))) (erc--refresh-prompt))))) (run-hooks 'erc-insert-done-hook) @@ -3340,8 +3340,8 @@ erc-display-line being equivalent to a `erc-display-message' TYPE of `notice'." (let ((erc--msg-prop-overrides erc--msg-prop-overrides)) (when (eq 'erc-notice-face (get-text-property 0 'font-lock-face string= )) - (unless (assq 'erc-msg erc--msg-prop-overrides) - (push '(erc-msg . notice) erc--msg-prop-overrides))) + (unless (assq 'erc--msg erc--msg-prop-overrides) + (push '(erc--msg . notice) erc--msg-prop-overrides))) (erc-display-message nil nil buffer string))) =20 (defvar erc--merge-text-properties-p nil @@ -3458,7 +3458,7 @@ erc--delete-inserted-message (substring (delete-and-extract-region (1- (point)) (1+ end)) -1)))))))) =20 -(defvar erc--ranked-properties '(erc-msg erc-ts erc-cmd)) +(defvar erc--ranked-properties '(erc--msg erc--ts erc--cmd)) =20 (defun erc--order-text-properties-from-hash (table) "Return a plist of text props from items in TABLE. @@ -3732,7 +3732,7 @@ erc-display-message (let ((table (make-hash-table :size 5)) (cmd (and parsed (erc--get-eq-comparable-cmd (erc-response.command parsed))))) - (puthash 'erc-msg + (puthash 'erc--msg (cond ((and msg (symbolp msg)) msg) ((and cmd (memq cmd '(PRIVMSG NOTICE)) 'msg)) (type (pcase type @@ -3744,7 +3744,7 @@ erc-display-message (t 'unknown)) table) (when cmd - (puthash 'erc-cmd cmd table)) + (puthash 'erc--cmd cmd table)) (and-let* ((ovs erc--msg-prop-overrides)) (pcase-dolist (`(,k . ,v) (reverse ovs)) (puthash k v table))) @@ -5744,7 +5744,7 @@ erc-is-message-ctcp-and-not-action-p (defun erc--get-speaker-bounds () "Return the bounds of `erc-speaker' text property when present. Assume buffer is narrowed to the confines of an inserted message." - (and-let* (((erc--check-msg-prop 'erc-msg 'msg)) + (and-let* (((erc--check-msg-prop 'erc--msg 'msg)) (beg (text-property-not-all (point-min) (point-max) 'erc-speaker nil))) (cons beg (next-single-property-change beg 'erc-speaker)))) @@ -6074,8 +6074,8 @@ erc-process-ctcp-query (while queries (let* ((type (upcase (car (split-string (car queries))))) (hook (intern-soft (concat "erc-ctcp-query-" type "-hook"= ))) - (erc--msg-prop-overrides `((erc-msg . msg) - (erc-ctcp . ,(intern type)) + (erc--msg-prop-overrides `((erc--msg . msg) + (erc--ctcp . ,(intern type)) ,@erc--msg-prop-overrides))) (if (and hook (boundp hook)) (if (string-equal type "ACTION") @@ -7521,7 +7521,7 @@ erc-display-msg (let ((insert-position (marker-position (goto-char erc-insert-marker= ))) (erc--msg-props (or erc--msg-props (let ((ovs erc--msg-prop-overrides)) - (map-into `((erc-msg . msg) ,@(reverse o= vs)) + (map-into `((erc--msg . msg) ,@(reverse = ovs)) 'hash-table)))) beg) (insert (erc-format-my-nick)) diff --git a/test/lisp/erc/erc-scenarios-display-message.el b/test/lisp/erc= /erc-scenarios-display-message.el index c7e0c2fc17a..91b82889f3e 100644 --- a/test/lisp/erc/erc-scenarios-display-message.el +++ b/test/lisp/erc/erc-scenarios-display-message.el @@ -50,12 +50,12 @@ erc-scenarios-display-message--multibuf (with-current-buffer (erc-d-t-wait-for 5 (get-buffer "dummy")) (funcall expect 10 " hi") (funcall expect 10 "*** dummy (~u@rdjcgiwfuwqmc.irc) has quit") - (should (eq 'QUIT (get-text-property (match-beginning 0) 'erc-msg)= )))) + (should (eq 'QUIT (get-text-property (match-beginning 0) 'erc--msg= ))))) =20 (ert-info ("Dummy's QUIT notice in #chan contains metadata props") (with-current-buffer (erc-d-t-wait-for 5 (get-buffer "#chan")) (funcall expect 10 "*** dummy (~u@rdjcgiwfuwqmc.irc) has quit") - (should (eq 'QUIT (get-text-property (match-beginning 0) 'erc-msg)= )))) + (should (eq 'QUIT (get-text-property (match-beginning 0) 'erc--msg= ))))) =20 (with-current-buffer "foonet" (erc-cmd-QUIT "")))) diff --git a/test/lisp/erc/erc-scenarios-match.el b/test/lisp/erc/erc-scena= rios-match.el index 17f7649566e..0eed1853879 100644 --- a/test/lisp/erc/erc-scenarios-match.el +++ b/test/lisp/erc/erc-scenarios-match.el @@ -304,9 +304,9 @@ erc-scenarios-match--hide-fools/stamp-both/fill-wrap (should (=3D mend (field-end right-stamp))) (should (eq (field-at-pos (1- mend)) 'erc-timestamp)))) =20 - ;; The `erc-ts' property is present in prop stack. - (should (get-text-property (pos-bol) 'erc-ts)) - (should-not (next-single-property-change (1+ (pos-bol)) 'erc-ts= )) + ;; The `erc--ts' property is present in prop stack. + (should (get-text-property (pos-bol) 'erc--ts)) + (should-not (next-single-property-change (1+ (pos-bol)) 'erc--t= s)) =20 ;; Line ending has the `invisible' property `match-fools'. (should (eq (get-text-property mbeg 'invisible) 'match-fools)) @@ -413,7 +413,7 @@ erc-scenarios-match--hide-fools/stamp-both/fill-wrap/sp= eak (should-not (equal "" (get-text-property (pos-bol) 'display))) =20 ;; No remaining meta-data positions, no more timestamps. - (should-not (next-single-property-change (1+ (pos-bol)) 'erc-ts)) + (should-not (next-single-property-change (1+ (pos-bol)) 'erc--ts)) ;; No remaining invisible messages. (should-not (text-property-not-all (pos-bol) erc-insert-marker 'invisible nil)) @@ -456,10 +456,10 @@ erc-scenarios-match--stamp-both-invisible-fill-static (should (eq (field-at-pos (field-end mbeg)) 'erc-timestamp)) (should (eq (field-at-pos (1- mend)) 'erc-timestamp))) =20 - ;; The `erc-ts' property is present in the message's + ;; The `erc--ts' property is present in the message's ;; width 1 prop collection at its first char. - (should (get-text-property (pos-bol) 'erc-ts)) - (should-not (next-single-property-change (1+ (pos-bol)) 'erc-ts= )) + (should (get-text-property (pos-bol) 'erc--ts)) + (should-not (next-single-property-change (1+ (pos-bol)) 'erc--t= s)) =20 ;; Line ending has the `invisible' property `match-fools'. (should (=3D (char-after mend) ?\n)) diff --git a/test/lisp/erc/erc-scenarios-stamp.el b/test/lisp/erc/erc-scena= rios-stamp.el index 49307dd228a..68769e203ff 100644 --- a/test/lisp/erc/erc-scenarios-stamp.el +++ b/test/lisp/erc/erc-scenarios-stamp.el @@ -29,7 +29,7 @@ (defvar erc-scenarios-stamp--user-marker nil) =20 (defun erc-scenarios-stamp--on-post-modify () - (when-let (((erc--check-msg-prop 'erc-cmd 4))) + (when-let (((erc--check-msg-prop 'erc--cmd 4))) (set-marker erc-scenarios-stamp--user-marker (point-max)) (ert-info ("User marker correctly placed at `erc-insert-marker'") (should (=3D ?\n (char-before erc-scenarios-stamp--user-marker))) @@ -68,8 +68,8 @@ erc-scenarios-stamp--left/display-margin-mode (ert-info ("Stamps appear in left margin and are invisible") (should (eq 'erc-timestamp (field-at-pos (pos-bol)))) (should (=3D (pos-bol) (field-beginning (pos-bol)))) - (should (eq 'msg (get-text-property (pos-bol) 'erc-msg))) - (should (eq 'NOTICE (get-text-property (pos-bol) 'erc-cmd))) + (should (eq 'msg (get-text-property (pos-bol) 'erc--msg))) + (should (eq 'NOTICE (get-text-property (pos-bol) 'erc--cmd))) (should (=3D ?- (char-after (field-end (pos-bol))))) (should (equal (get-text-property (1+ (field-end (pos-bol))) 'erc-speaker) @@ -104,14 +104,14 @@ erc-scenarios-stamp--legacy-date-stamps (funcall expect 5 "Opening connection") (goto-char (1- (match-beginning 0))) (should (eq 'erc-timestamp (field-at-pos (point)))) - (should (eq 'unknown (erc--get-inserted-msg-prop 'erc-msg))) + (should (eq 'unknown (erc--get-inserted-msg-prop 'erc--msg))) ;; Force redraw of date stamp. (setq erc-timestamp-last-inserted-left nil) =20 (funcall expect 5 "This server is in debug mode") (while (and (zerop (forward-line -1)) (not (eq 'erc-timestamp (field-at-pos (point)))))) - (should (erc--get-inserted-msg-prop 'erc-cmd))))))) + (should (erc--get-inserted-msg-prop 'erc--cmd))))))) =20 ;; This user-owned hook member places a marker on the first message in ;; a buffer. Inserting a date stamp in front of it shouldn't move the @@ -125,18 +125,18 @@ erc-scenarios-stamp--on-insert-modify =20 ;; Sometime after the first message ("Opening connection.."), assert ;; that the marker we just placed hasn't moved. - (when (erc--check-msg-prop 'erc-cmd 2) + (when (erc--check-msg-prop 'erc--cmd 2) (save-restriction (widen) (ert-info ("Date stamp preserves opening user marker") (goto-char erc-scenarios-stamp--user-marker) (should-not (eq 'erc-timestamp (field-at-pos (point)))) (should (looking-at "Opening")) - (should (eq 'unknown (get-text-property (point) 'erc-msg)))))) + (should (eq 'unknown (get-text-property (point) 'erc--msg)))))) =20 ;; On 003 ("*** This server was created on"), clear state to force a ;; new date stamp on the next message. - (when (erc--check-msg-prop 'erc-cmd 3) + (when (erc--check-msg-prop 'erc--cmd 3) (setq erc-timestamp-last-inserted-left nil) (set-marker erc-scenarios-stamp--user-marker erc-insert-marker))) =20 @@ -174,7 +174,7 @@ erc-scenarios-stamp--date-mode/left-and-right (goto-char erc-scenarios-stamp--user-marker) (should-not (eq 'erc-timestamp (field-at-pos (point)))) (should (looking-at (rx "*** irc.foonet.org oragono"))) - (should (eq 's004 (get-text-property (point) 'erc-msg)))) + (should (eq 's004 (get-text-property (point) 'erc--msg)))) =20 (funcall expect 5 "This server is in debug mode"))))) =20 diff --git a/test/lisp/erc/erc-stamp-tests.el b/test/lisp/erc/erc-stamp-tes= ts.el index cc61d599387..fd2e7000c0e 100644 --- a/test/lisp/erc/erc-stamp-tests.el +++ b/test/lisp/erc/erc-stamp-tests.el @@ -279,7 +279,7 @@ erc-echo-timestamp =20 (should-not erc-echo-timestamps) (should-not erc-stamp--last-stamp) - (insert (propertize "a" 'erc-ts 433483200 'erc-msg 'msg) "bc") + (insert (propertize "a" 'erc--ts 433483200 'erc--msg 'msg) "bc") (goto-char (point-min)) (let ((inhibit-message t) (erc-echo-timestamp-format "%Y-%m-%d %H:%M:%S %Z") diff --git a/test/lisp/erc/erc-tests.el b/test/lisp/erc/erc-tests.el index 49d500fadea..b8ebc23e686 100644 --- a/test/lisp/erc/erc-tests.el +++ b/test/lisp/erc/erc-tests.el @@ -1738,7 +1738,7 @@ erc--get-inserted-msg-bounds :command "PRIVMSG" :command-args (list "#chan" "hi") :contents "hi")) - (erc--msg-prop-overrides '((erc-ts . 0)))) + (erc--msg-prop-overrides '((erc--ts . 0)))) (erc-display-message parsed nil (current-buffer) (erc-format-privmessage "bob" "hi" nil t))) (goto-char 3) @@ -1785,7 +1785,7 @@ erc--delete-inserted-message ;; Put unique invisible properties on the line endings. (erc-display-message nil 'notice nil "one") (put-text-property (1- erc-insert-marker) erc-insert-marker 'invisible '= a) - (let ((erc--msg-prop-overrides '((erc-msg . datestamp) (erc-ts . 0)))) + (let ((erc--msg-prop-overrides '((erc--msg . datestamp) (erc--ts . 0)))) (erc-display-message nil nil nil (propertize "\n[date]" 'field 'erc-timestamp))) (put-text-property (1- erc-insert-marker) erc-insert-marker 'invisible '= b) @@ -1794,7 +1794,7 @@ erc--delete-inserted-message (ert-info ("Date stamp deleted cleanly") (goto-char 11) (should (looking-at (rx "\n[date]"))) - (should (eq 'datestamp (get-text-property (point) 'erc-msg))) + (should (eq 'datestamp (get-text-property (point) 'erc--msg))) (should (eq (point) (field-beginning (1+ (point))))) =20 (erc--delete-inserted-message (point)) @@ -1855,19 +1855,19 @@ erc--delete-inserted-message =20 (ert-deftest erc--order-text-properties-from-hash () (let ((table (map-into '((a . 1) - (erc-ts . 0) - (erc-msg . s005) + (erc--ts . 0) + (erc--msg . s005) (b . 2) - (erc-cmd . 5) + (erc--cmd . 5) (c . 3)) 'hash-table))) (with-temp-buffer (erc-mode) (insert "abc\n") (add-text-properties 1 2 (erc--order-text-properties-from-hash table= )) - (should (equal '( erc-msg s005 - erc-ts 0 - erc-cmd 5 + (should (equal '( erc--msg s005 + erc--ts 0 + erc--cmd 5 a 1 b 2 c 3) @@ -2392,7 +2392,7 @@ erc--route-insertion =20 (ert-info ("Cons `buffer' routes to live members") ;; Copies a let-bound `erc--msg-props' before mutating. - (let* ((table (map-into '(erc-msg msg) 'hash-table)) + (let* ((table (map-into '(erc--msg msg) 'hash-table)) (erc--msg-props table)) (erc--route-insertion "cons" (list server-buffer spam-buffer)) (should-not (eq table erc--msg-props))) diff --git a/test/lisp/erc/resources/fill/snapshots/merge-01-start.eld b/te= st/lisp/erc/resources/fill/snapshots/merge-01-start.eld index c07eee3517f..f4a43a9384f 100644 --- a/test/lisp/erc/resources/fill/snapshots/merge-01-start.eld +++ b/test/lisp/erc/resources/fill/snapshots/merge-01-start.eld @@ -1 +1 @@ -#("\n\n\n[Thu Jan 1 1970]\n*** This server is in debug mode and is loggin= g all user I/O. If you do not wish for everything you send to be readable b= y the server owner(s), please disconnect.[00:00]\n bob: come, you ar= e a tedious fool: to the purpose. What was done to Elbow's wife, that he ha= th cause to complain of? Come me to what was done to her.\n alice: Eit= her your unparagoned mistress is dead, or she's outprized by a trifle.\n\n[= Sat Apr 1 2023]\n zero.[07:00]\n one.\n two.\n thr= ee.\n four.\n five.\n six.\n" 2 3 (erc-msg datestamp erc= -ts 0 field erc-timestamp) 3 20 (field erc-timestamp wrap-prefix #1=3D(spac= e :width 27) line-prefix (space :width (- 27 (18)))) 21 22 (erc-msg notice = erc-ts 0 wrap-prefix #1# line-prefix #2=3D(space :width (- 27 (4)))) 22 183= (wrap-prefix #1# line-prefix #2#) 183 190 (field erc-timestamp wrap-prefix= #1# line-prefix #2# display (#6=3D(margin right-margin) #("[00:00]" 0 7 (i= nvisible timestamp)))) 191 192 (erc-msg msg erc-ts 0 erc-cmd PRIVMSG wrap-p= refix #1# line-prefix #3=3D(space :width (- 27 (8)))) 192 197 (wrap-prefix = #1# line-prefix #3#) 197 199 (wrap-prefix #1# line-prefix #3#) 199 202 (wra= p-prefix #1# line-prefix #3#) 202 315 (wrap-prefix #1# line-prefix #3#) 316= 348 (wrap-prefix #1# line-prefix #3#) 349 350 (erc-msg msg erc-ts 0 erc-cm= d PRIVMSG wrap-prefix #1# line-prefix #4=3D(space :width (- 27 (6)))) 350 3= 53 (wrap-prefix #1# line-prefix #4#) 353 355 (wrap-prefix #1# line-prefix #= 4#) 355 360 (wrap-prefix #1# line-prefix #4#) 360 435 (wrap-prefix #1# line= -prefix #4#) 436 437 (erc-msg datestamp erc-ts 1680307200 field erc-timesta= mp) 437 454 (field erc-timestamp wrap-prefix #1# line-prefix (space :width = (- 27 (18)))) 455 456 (erc-msg msg erc-ts 1680332400 erc-cmd PRIVMSG wrap-p= refix #1# line-prefix #5=3D(space :width (- 27 (6)))) 456 459 (wrap-prefix = #1# line-prefix #5#) 459 466 (wrap-prefix #1# line-prefix #5#) 466 473 (fie= ld erc-timestamp wrap-prefix #1# line-prefix #5# display (#6# #("[07:00]" 0= 7 (invisible timestamp)))) 474 475 (erc-msg msg erc-ts 1680332400 erc-cmd = PRIVMSG wrap-prefix #1# line-prefix #7=3D(space :width (- 27 (8)))) 475 480= (wrap-prefix #1# line-prefix #7#) 480 486 (wrap-prefix #1# line-prefix #7#= ) 487 488 (erc-msg msg erc-ts 1680332400 erc-cmd PRIVMSG wrap-prefix #1# li= ne-prefix #8=3D(space :width (- 27 0)) display #9=3D"") 488 493 (wrap-prefi= x #1# line-prefix #8# display #9#) 493 495 (wrap-prefix #1# line-prefix #8#= display #9#) 495 499 (wrap-prefix #1# line-prefix #8#) 500 501 (erc-msg ms= g erc-ts 1680332400 erc-cmd PRIVMSG wrap-prefix #1# line-prefix #10=3D(spac= e :width (- 27 (6)))) 501 504 (wrap-prefix #1# line-prefix #10#) 504 512 (w= rap-prefix #1# line-prefix #10#) 513 514 (erc-msg msg erc-ts 1680332400 erc= -cmd PRIVMSG wrap-prefix #1# line-prefix #11=3D(space :width (- 27 0)) disp= lay #9#) 514 517 (wrap-prefix #1# line-prefix #11# display #9#) 517 519 (wr= ap-prefix #1# line-prefix #11# display #9#) 519 524 (wrap-prefix #1# line-p= refix #11#) 525 526 (erc-msg msg erc-ts 1680332400 erc-cmd PRIVMSG wrap-pre= fix #1# line-prefix #12=3D(space :width (- 27 (8)))) 526 531 (wrap-prefix #= 1# line-prefix #12#) 531 538 (wrap-prefix #1# line-prefix #12#) 539 540 (er= c-msg msg erc-ts 1680332400 erc-cmd PRIVMSG wrap-prefix #1# line-prefix #13= =3D(space :width (- 27 0)) display #9#) 540 545 (wrap-prefix #1# line-prefi= x #13# display #9#) 545 547 (wrap-prefix #1# line-prefix #13# display #9#) = 547 551 (wrap-prefix #1# line-prefix #13#)) +#("\n\n\n[Thu Jan 1 1970]\n*** This server is in debug mode and is loggin= g all user I/O. If you do not wish for everything you send to be readable b= y the server owner(s), please disconnect.[00:00]\n bob: come, you ar= e a tedious fool: to the purpose. What was done to Elbow's wife, that he ha= th cause to complain of? Come me to what was done to her.\n alice: Eit= her your unparagoned mistress is dead, or she's outprized by a trifle.\n\n[= Sat Apr 1 2023]\n zero.[07:00]\n one.\n two.\n thr= ee.\n four.\n five.\n six.\n" 2 3 (erc--msg datestamp er= c--ts 0 field erc-timestamp) 3 20 (field erc-timestamp wrap-prefix #1=3D(sp= ace :width 27) line-prefix (space :width (- 27 (18)))) 21 22 (erc--msg noti= ce erc--ts 0 wrap-prefix #1# line-prefix #2=3D(space :width (- 27 (4)))) 22= 183 (wrap-prefix #1# line-prefix #2#) 183 190 (field erc-timestamp wrap-pr= efix #1# line-prefix #2# display (#6=3D(margin right-margin) #("[00:00]" 0 = 7 (invisible timestamp)))) 191 192 (erc--msg msg erc--ts 0 erc--cmd PRIVMSG= wrap-prefix #1# line-prefix #3=3D(space :width (- 27 (8)))) 192 197 (wrap-= prefix #1# line-prefix #3#) 197 199 (wrap-prefix #1# line-prefix #3#) 199 2= 02 (wrap-prefix #1# line-prefix #3#) 202 315 (wrap-prefix #1# line-prefix #= 3#) 316 348 (wrap-prefix #1# line-prefix #3#) 349 350 (erc--msg msg erc--ts= 0 erc--cmd PRIVMSG wrap-prefix #1# line-prefix #4=3D(space :width (- 27 (6= )))) 350 353 (wrap-prefix #1# line-prefix #4#) 353 355 (wrap-prefix #1# lin= e-prefix #4#) 355 360 (wrap-prefix #1# line-prefix #4#) 360 435 (wrap-prefi= x #1# line-prefix #4#) 436 437 (erc--msg datestamp erc--ts 1680307200 field= erc-timestamp) 437 454 (field erc-timestamp wrap-prefix #1# line-prefix (s= pace :width (- 27 (18)))) 455 456 (erc--msg msg erc--ts 1680332400 erc--cmd= PRIVMSG wrap-prefix #1# line-prefix #5=3D(space :width (- 27 (6)))) 456 45= 9 (wrap-prefix #1# line-prefix #5#) 459 466 (wrap-prefix #1# line-prefix #5= #) 466 473 (field erc-timestamp wrap-prefix #1# line-prefix #5# display (#6= # #("[07:00]" 0 7 (invisible timestamp)))) 474 475 (erc--msg msg erc--ts 16= 80332400 erc--cmd PRIVMSG wrap-prefix #1# line-prefix #7=3D(space :width (-= 27 (8)))) 475 480 (wrap-prefix #1# line-prefix #7#) 480 486 (wrap-prefix #= 1# line-prefix #7#) 487 488 (erc--msg msg erc--ts 1680332400 erc--cmd PRIVM= SG wrap-prefix #1# line-prefix #8=3D(space :width (- 27 0)) display #9=3D""= ) 488 493 (wrap-prefix #1# line-prefix #8# display #9#) 493 495 (wrap-prefi= x #1# line-prefix #8# display #9#) 495 499 (wrap-prefix #1# line-prefix #8#= ) 500 501 (erc--msg msg erc--ts 1680332400 erc--cmd PRIVMSG wrap-prefix #1#= line-prefix #10=3D(space :width (- 27 (6)))) 501 504 (wrap-prefix #1# line= -prefix #10#) 504 512 (wrap-prefix #1# line-prefix #10#) 513 514 (erc--msg = msg erc--ts 1680332400 erc--cmd PRIVMSG wrap-prefix #1# line-prefix #11=3D(= space :width (- 27 0)) display #9#) 514 517 (wrap-prefix #1# line-prefix #1= 1# display #9#) 517 519 (wrap-prefix #1# line-prefix #11# display #9#) 519 = 524 (wrap-prefix #1# line-prefix #11#) 525 526 (erc--msg msg erc--ts 168033= 2400 erc--cmd PRIVMSG wrap-prefix #1# line-prefix #12=3D(space :width (- 27= (8)))) 526 531 (wrap-prefix #1# line-prefix #12#) 531 538 (wrap-prefix #1#= line-prefix #12#) 539 540 (erc--msg msg erc--ts 1680332400 erc--cmd PRIVMS= G wrap-prefix #1# line-prefix #13=3D(space :width (- 27 0)) display #9#) 54= 0 545 (wrap-prefix #1# line-prefix #13# display #9#) 545 547 (wrap-prefix #= 1# line-prefix #13# display #9#) 547 551 (wrap-prefix #1# line-prefix #13#)) diff --git a/test/lisp/erc/resources/fill/snapshots/merge-02-right.eld b/te= st/lisp/erc/resources/fill/snapshots/merge-02-right.eld index cf5cdb4f825..78450ec08e2 100644 --- a/test/lisp/erc/resources/fill/snapshots/merge-02-right.eld +++ b/test/lisp/erc/resources/fill/snapshots/merge-02-right.eld @@ -1 +1 @@ -#("\n\n\n[Thu Jan 1 1970]\n*** This server is in debug mode and is loggin= g all user I/O. If you do not wish for everything you send to be readable b= y the server owner(s), please disconnect.[00:00]\n bob: come, you ar= e a tedious fool: to the purpose. What was done to Elbow's wife, that he ha= th cause to complain of? Come me to what was done to her.\n alice: Eit= her your unparagoned mistress is dead, or she's outprized by a trifle.\n\n[= Sat Apr 1 2023]\n zero.[07:00]\n one.\n two.\n thr= ee.\n four.\n five.\n six.\n" 2 3 (erc-msg datestamp erc= -ts 0 field erc-timestamp) 3 20 (field erc-timestamp wrap-prefix #1=3D(spac= e :width 29) line-prefix (space :width (- 29 (18)))) 21 22 (erc-msg notice = erc-ts 0 wrap-prefix #1# line-prefix #2=3D(space :width (- 29 (4)))) 22 183= (wrap-prefix #1# line-prefix #2#) 183 190 (field erc-timestamp wrap-prefix= #1# line-prefix #2# display (#6=3D(margin right-margin) #("[00:00]" 0 7 (i= nvisible timestamp)))) 191 192 (erc-msg msg erc-ts 0 erc-cmd PRIVMSG wrap-p= refix #1# line-prefix #3=3D(space :width (- 29 (8)))) 192 197 (wrap-prefix = #1# line-prefix #3#) 197 199 (wrap-prefix #1# line-prefix #3#) 199 202 (wra= p-prefix #1# line-prefix #3#) 202 315 (wrap-prefix #1# line-prefix #3#) 316= 348 (wrap-prefix #1# line-prefix #3#) 349 350 (erc-msg msg erc-ts 0 erc-cm= d PRIVMSG wrap-prefix #1# line-prefix #4=3D(space :width (- 29 (6)))) 350 3= 53 (wrap-prefix #1# line-prefix #4#) 353 355 (wrap-prefix #1# line-prefix #= 4#) 355 360 (wrap-prefix #1# line-prefix #4#) 360 435 (wrap-prefix #1# line= -prefix #4#) 436 437 (erc-msg datestamp erc-ts 1680307200 field erc-timesta= mp) 437 454 (field erc-timestamp wrap-prefix #1# line-prefix (space :width = (- 29 (18)))) 455 456 (erc-msg msg erc-ts 1680332400 erc-cmd PRIVMSG wrap-p= refix #1# line-prefix #5=3D(space :width (- 29 (6)))) 456 459 (wrap-prefix = #1# line-prefix #5#) 459 466 (wrap-prefix #1# line-prefix #5#) 466 473 (fie= ld erc-timestamp wrap-prefix #1# line-prefix #5# display (#6# #("[07:00]" 0= 7 (invisible timestamp)))) 474 475 (erc-msg msg erc-ts 1680332400 erc-cmd = PRIVMSG wrap-prefix #1# line-prefix #7=3D(space :width (- 29 (8)))) 475 480= (wrap-prefix #1# line-prefix #7#) 480 486 (wrap-prefix #1# line-prefix #7#= ) 487 488 (erc-msg msg erc-ts 1680332400 erc-cmd PRIVMSG wrap-prefix #1# li= ne-prefix #8=3D(space :width (- 29 0)) display #9=3D"") 488 493 (wrap-prefi= x #1# line-prefix #8# display #9#) 493 495 (wrap-prefix #1# line-prefix #8#= display #9#) 495 499 (wrap-prefix #1# line-prefix #8#) 500 501 (erc-msg ms= g erc-ts 1680332400 erc-cmd PRIVMSG wrap-prefix #1# line-prefix #10=3D(spac= e :width (- 29 (6)))) 501 504 (wrap-prefix #1# line-prefix #10#) 504 512 (w= rap-prefix #1# line-prefix #10#) 513 514 (erc-msg msg erc-ts 1680332400 erc= -cmd PRIVMSG wrap-prefix #1# line-prefix #11=3D(space :width (- 29 0)) disp= lay #9#) 514 517 (wrap-prefix #1# line-prefix #11# display #9#) 517 519 (wr= ap-prefix #1# line-prefix #11# display #9#) 519 524 (wrap-prefix #1# line-p= refix #11#) 525 526 (erc-msg msg erc-ts 1680332400 erc-cmd PRIVMSG wrap-pre= fix #1# line-prefix #12=3D(space :width (- 29 (8)))) 526 531 (wrap-prefix #= 1# line-prefix #12#) 531 538 (wrap-prefix #1# line-prefix #12#) 539 540 (er= c-msg msg erc-ts 1680332400 erc-cmd PRIVMSG wrap-prefix #1# line-prefix #13= =3D(space :width (- 29 0)) display #9#) 540 545 (wrap-prefix #1# line-prefi= x #13# display #9#) 545 547 (wrap-prefix #1# line-prefix #13# display #9#) = 547 551 (wrap-prefix #1# line-prefix #13#)) +#("\n\n\n[Thu Jan 1 1970]\n*** This server is in debug mode and is loggin= g all user I/O. If you do not wish for everything you send to be readable b= y the server owner(s), please disconnect.[00:00]\n bob: come, you ar= e a tedious fool: to the purpose. What was done to Elbow's wife, that he ha= th cause to complain of? Come me to what was done to her.\n alice: Eit= her your unparagoned mistress is dead, or she's outprized by a trifle.\n\n[= Sat Apr 1 2023]\n zero.[07:00]\n one.\n two.\n thr= ee.\n four.\n five.\n six.\n" 2 3 (erc--msg datestamp er= c--ts 0 field erc-timestamp) 3 20 (field erc-timestamp wrap-prefix #1=3D(sp= ace :width 29) line-prefix (space :width (- 29 (18)))) 21 22 (erc--msg noti= ce erc--ts 0 wrap-prefix #1# line-prefix #2=3D(space :width (- 29 (4)))) 22= 183 (wrap-prefix #1# line-prefix #2#) 183 190 (field erc-timestamp wrap-pr= efix #1# line-prefix #2# display (#6=3D(margin right-margin) #("[00:00]" 0 = 7 (invisible timestamp)))) 191 192 (erc--msg msg erc--ts 0 erc--cmd PRIVMSG= wrap-prefix #1# line-prefix #3=3D(space :width (- 29 (8)))) 192 197 (wrap-= prefix #1# line-prefix #3#) 197 199 (wrap-prefix #1# line-prefix #3#) 199 2= 02 (wrap-prefix #1# line-prefix #3#) 202 315 (wrap-prefix #1# line-prefix #= 3#) 316 348 (wrap-prefix #1# line-prefix #3#) 349 350 (erc--msg msg erc--ts= 0 erc--cmd PRIVMSG wrap-prefix #1# line-prefix #4=3D(space :width (- 29 (6= )))) 350 353 (wrap-prefix #1# line-prefix #4#) 353 355 (wrap-prefix #1# lin= e-prefix #4#) 355 360 (wrap-prefix #1# line-prefix #4#) 360 435 (wrap-prefi= x #1# line-prefix #4#) 436 437 (erc--msg datestamp erc--ts 1680307200 field= erc-timestamp) 437 454 (field erc-timestamp wrap-prefix #1# line-prefix (s= pace :width (- 29 (18)))) 455 456 (erc--msg msg erc--ts 1680332400 erc--cmd= PRIVMSG wrap-prefix #1# line-prefix #5=3D(space :width (- 29 (6)))) 456 45= 9 (wrap-prefix #1# line-prefix #5#) 459 466 (wrap-prefix #1# line-prefix #5= #) 466 473 (field erc-timestamp wrap-prefix #1# line-prefix #5# display (#6= # #("[07:00]" 0 7 (invisible timestamp)))) 474 475 (erc--msg msg erc--ts 16= 80332400 erc--cmd PRIVMSG wrap-prefix #1# line-prefix #7=3D(space :width (-= 29 (8)))) 475 480 (wrap-prefix #1# line-prefix #7#) 480 486 (wrap-prefix #= 1# line-prefix #7#) 487 488 (erc--msg msg erc--ts 1680332400 erc--cmd PRIVM= SG wrap-prefix #1# line-prefix #8=3D(space :width (- 29 0)) display #9=3D""= ) 488 493 (wrap-prefix #1# line-prefix #8# display #9#) 493 495 (wrap-prefi= x #1# line-prefix #8# display #9#) 495 499 (wrap-prefix #1# line-prefix #8#= ) 500 501 (erc--msg msg erc--ts 1680332400 erc--cmd PRIVMSG wrap-prefix #1#= line-prefix #10=3D(space :width (- 29 (6)))) 501 504 (wrap-prefix #1# line= -prefix #10#) 504 512 (wrap-prefix #1# line-prefix #10#) 513 514 (erc--msg = msg erc--ts 1680332400 erc--cmd PRIVMSG wrap-prefix #1# line-prefix #11=3D(= space :width (- 29 0)) display #9#) 514 517 (wrap-prefix #1# line-prefix #1= 1# display #9#) 517 519 (wrap-prefix #1# line-prefix #11# display #9#) 519 = 524 (wrap-prefix #1# line-prefix #11#) 525 526 (erc--msg msg erc--ts 168033= 2400 erc--cmd PRIVMSG wrap-prefix #1# line-prefix #12=3D(space :width (- 29= (8)))) 526 531 (wrap-prefix #1# line-prefix #12#) 531 538 (wrap-prefix #1#= line-prefix #12#) 539 540 (erc--msg msg erc--ts 1680332400 erc--cmd PRIVMS= G wrap-prefix #1# line-prefix #13=3D(space :width (- 29 0)) display #9#) 54= 0 545 (wrap-prefix #1# line-prefix #13# display #9#) 545 547 (wrap-prefix #= 1# line-prefix #13# display #9#) 547 551 (wrap-prefix #1# line-prefix #13#)) diff --git a/test/lisp/erc/resources/fill/snapshots/merge-wrap-01.eld b/tes= t/lisp/erc/resources/fill/snapshots/merge-wrap-01.eld index ad4e6483f01..8e5535093e1 100644 --- a/test/lisp/erc/resources/fill/snapshots/merge-wrap-01.eld +++ b/test/lisp/erc/resources/fill/snapshots/merge-wrap-01.eld @@ -1 +1 @@ -#("\n\n\n[Thu Jan 1 1970]\n*** This server is in debug mode and is loggin= g all user I/O. If you do not wish for everything you send to be readable b= y the server owner(s), please disconnect.[00:00]\n bob: come, you ar= e a tedious fool: to the purpose. What was done to Elbow's wife, that he ha= th cause to complain of? Come me to what was done to her.\n alice: Eit= her your unparagoned mistress is dead, or she's outprized by a trifle.\n\n[= Sat Apr 1 2023]\n zero.[07:00]\n 0.5\n* bob one.\n two.\n 2.5\n* bob three\n four.\n" 2 3 (erc-msg datestamp erc-ts 0 field = erc-timestamp) 3 20 (field erc-timestamp wrap-prefix #1=3D(space :width 27)= line-prefix (space :width (- 27 (18)))) 21 22 (erc-msg notice erc-ts 0 wra= p-prefix #1# line-prefix #2=3D(space :width (- 27 (4)))) 22 183 (wrap-prefi= x #1# line-prefix #2#) 183 190 (field erc-timestamp wrap-prefix #1# line-pr= efix #2# display (#5=3D(margin right-margin) #("[00:00]" 0 7 (invisible tim= estamp)))) 191 192 (erc-msg msg erc-ts 0 erc-cmd PRIVMSG wrap-prefix #1# li= ne-prefix #3=3D(space :width (- 27 (8)))) 192 197 (wrap-prefix #1# line-pre= fix #3#) 197 199 (wrap-prefix #1# line-prefix #3#) 199 202 (wrap-prefix #1#= line-prefix #3#) 202 315 (wrap-prefix #1# line-prefix #3#) 316 348 (wrap-p= refix #1# line-prefix #3#) 349 350 (erc-msg msg erc-ts 0 erc-cmd PRIVMSG wr= ap-prefix #1# line-prefix #4=3D(space :width (- 27 (6)))) 350 353 (wrap-pre= fix #1# line-prefix #4#) 353 355 (wrap-prefix #1# line-prefix #4#) 355 360 = (wrap-prefix #1# line-prefix #4#) 360 435 (wrap-prefix #1# line-prefix #4#)= 436 437 (erc-msg datestamp erc-ts 1680307200 field erc-timestamp) 437 454 = (field erc-timestamp wrap-prefix #1# line-prefix (space :width (- 27 (18)))= ) 455 456 (erc-msg msg erc-ts 1680332400 erc-cmd PRIVMSG wrap-prefix #1# li= ne-prefix #6=3D(space :width (- 27 (6)))) 456 459 (wrap-prefix #1# line-pre= fix #6#) 459 466 (wrap-prefix #1# line-prefix #6#) 466 473 (field erc-times= tamp wrap-prefix #1# line-prefix #6# display (#5# #("[07:00]" 0 7 (invisibl= e timestamp)))) 474 475 (erc-msg msg erc-ts 1680332400 erc-cmd PRIVMSG wrap= -prefix #1# line-prefix #7=3D(space :width (- 27 0)) display #8=3D"") 475 4= 78 (wrap-prefix #1# line-prefix #7# display #8#) 478 480 (wrap-prefix #1# l= ine-prefix #7# display #8#) 480 483 (wrap-prefix #1# line-prefix #7#) 484 4= 85 (erc-msg msg erc-ts 1680332400 erc-cmd PRIVMSG erc-ctcp ACTION wrap-pref= ix #1# line-prefix #9=3D(space :width (- 27 (6)))) 485 486 (wrap-prefix #1#= line-prefix #9#) 486 489 (wrap-prefix #1# line-prefix #9#) 489 494 (wrap-p= refix #1# line-prefix #9#) 495 496 (erc-msg msg erc-ts 1680332400 erc-cmd P= RIVMSG wrap-prefix #1# line-prefix #10=3D(space :width (- 27 (6)))) 496 499= (wrap-prefix #1# line-prefix #10#) 499 505 (wrap-prefix #1# line-prefix #1= 0#) 506 507 (erc-msg msg erc-ts 1680332400 erc-cmd PRIVMSG wrap-prefix #1# = line-prefix #11=3D(space :width (- 27 0)) display #8#) 507 510 (wrap-prefix= #1# line-prefix #11# display #8#) 510 512 (wrap-prefix #1# line-prefix #11= # display #8#) 512 515 (wrap-prefix #1# line-prefix #11#) 516 517 (erc-msg = msg erc-ts 1680332400 erc-cmd PRIVMSG erc-ctcp ACTION wrap-prefix #1# line-= prefix #12=3D(space :width (- 27 (2)))) 517 518 (wrap-prefix #1# line-prefi= x #12#) 518 521 (wrap-prefix #1# line-prefix #12#) 521 527 (wrap-prefix #1#= line-prefix #12#) 528 529 (erc-msg msg erc-ts 1680332400 erc-cmd PRIVMSG w= rap-prefix #1# line-prefix #13=3D(space :width (- 27 (6)))) 529 532 (wrap-p= refix #1# line-prefix #13#) 532 539 (wrap-prefix #1# line-prefix #13#)) +#("\n\n\n[Thu Jan 1 1970]\n*** This server is in debug mode and is loggin= g all user I/O. If you do not wish for everything you send to be readable b= y the server owner(s), please disconnect.[00:00]\n bob: come, you ar= e a tedious fool: to the purpose. What was done to Elbow's wife, that he ha= th cause to complain of? Come me to what was done to her.\n alice: Eit= her your unparagoned mistress is dead, or she's outprized by a trifle.\n\n[= Sat Apr 1 2023]\n zero.[07:00]\n 0.5\n* bob one.\n two.\n 2.5\n* bob three\n four.\n" 2 3 (erc--msg datestamp erc--ts 0 fiel= d erc-timestamp) 3 20 (field erc-timestamp wrap-prefix #1=3D(space :width 2= 7) line-prefix (space :width (- 27 (18)))) 21 22 (erc--msg notice erc--ts 0= wrap-prefix #1# line-prefix #2=3D(space :width (- 27 (4)))) 22 183 (wrap-p= refix #1# line-prefix #2#) 183 190 (field erc-timestamp wrap-prefix #1# lin= e-prefix #2# display (#5=3D(margin right-margin) #("[00:00]" 0 7 (invisible= timestamp)))) 191 192 (erc--msg msg erc--ts 0 erc--cmd PRIVMSG wrap-prefix= #1# line-prefix #3=3D(space :width (- 27 (8)))) 192 197 (wrap-prefix #1# l= ine-prefix #3#) 197 199 (wrap-prefix #1# line-prefix #3#) 199 202 (wrap-pre= fix #1# line-prefix #3#) 202 315 (wrap-prefix #1# line-prefix #3#) 316 348 = (wrap-prefix #1# line-prefix #3#) 349 350 (erc--msg msg erc--ts 0 erc--cmd = PRIVMSG wrap-prefix #1# line-prefix #4=3D(space :width (- 27 (6)))) 350 353= (wrap-prefix #1# line-prefix #4#) 353 355 (wrap-prefix #1# line-prefix #4#= ) 355 360 (wrap-prefix #1# line-prefix #4#) 360 435 (wrap-prefix #1# line-p= refix #4#) 436 437 (erc--msg datestamp erc--ts 1680307200 field erc-timesta= mp) 437 454 (field erc-timestamp wrap-prefix #1# line-prefix (space :width = (- 27 (18)))) 455 456 (erc--msg msg erc--ts 1680332400 erc--cmd PRIVMSG wra= p-prefix #1# line-prefix #6=3D(space :width (- 27 (6)))) 456 459 (wrap-pref= ix #1# line-prefix #6#) 459 466 (wrap-prefix #1# line-prefix #6#) 466 473 (= field erc-timestamp wrap-prefix #1# line-prefix #6# display (#5# #("[07:00]= " 0 7 (invisible timestamp)))) 474 475 (erc--msg msg erc--ts 1680332400 erc= --cmd PRIVMSG wrap-prefix #1# line-prefix #7=3D(space :width (- 27 0)) disp= lay #8=3D"") 475 478 (wrap-prefix #1# line-prefix #7# display #8#) 478 480 = (wrap-prefix #1# line-prefix #7# display #8#) 480 483 (wrap-prefix #1# line= -prefix #7#) 484 485 (erc--msg msg erc--ts 1680332400 erc--cmd PRIVMSG erc-= -ctcp ACTION wrap-prefix #1# line-prefix #9=3D(space :width (- 27 (6)))) 48= 5 486 (wrap-prefix #1# line-prefix #9#) 486 489 (wrap-prefix #1# line-prefi= x #9#) 489 494 (wrap-prefix #1# line-prefix #9#) 495 496 (erc--msg msg erc-= -ts 1680332400 erc--cmd PRIVMSG wrap-prefix #1# line-prefix #10=3D(space :w= idth (- 27 (6)))) 496 499 (wrap-prefix #1# line-prefix #10#) 499 505 (wrap-= prefix #1# line-prefix #10#) 506 507 (erc--msg msg erc--ts 1680332400 erc--= cmd PRIVMSG wrap-prefix #1# line-prefix #11=3D(space :width (- 27 0)) displ= ay #8#) 507 510 (wrap-prefix #1# line-prefix #11# display #8#) 510 512 (wra= p-prefix #1# line-prefix #11# display #8#) 512 515 (wrap-prefix #1# line-pr= efix #11#) 516 517 (erc--msg msg erc--ts 1680332400 erc--cmd PRIVMSG erc--c= tcp ACTION wrap-prefix #1# line-prefix #12=3D(space :width (- 27 (2)))) 517= 518 (wrap-prefix #1# line-prefix #12#) 518 521 (wrap-prefix #1# line-prefi= x #12#) 521 527 (wrap-prefix #1# line-prefix #12#) 528 529 (erc--msg msg er= c--ts 1680332400 erc--cmd PRIVMSG wrap-prefix #1# line-prefix #13=3D(space = :width (- 27 (6)))) 529 532 (wrap-prefix #1# line-prefix #13#) 532 539 (wra= p-prefix #1# line-prefix #13#)) diff --git a/test/lisp/erc/resources/fill/snapshots/merge-wrap-indicator-po= st-01.eld b/test/lisp/erc/resources/fill/snapshots/merge-wrap-indicator-pos= t-01.eld index 893588c028f..a0c03244afe 100644 --- a/test/lisp/erc/resources/fill/snapshots/merge-wrap-indicator-post-01.e= ld +++ b/test/lisp/erc/resources/fill/snapshots/merge-wrap-indicator-post-01.e= ld @@ -1 +1 @@ -#("\n\n\n[Thu Jan 1 1970]\n*** This server is in debug mode and is loggin= g all user I/O. If you do not wish for everything you send to be readable b= y the server owner(s), please disconnect.[00:00]\n bob: come, you ar= e a tedious fool: to the purpose. What was done to Elbow's wife, that he ha= th cause to complain of? Come me to what was done to her.\n alice: Eit= her your unparagoned mistress is dead, or she's outprized by a trifle.\n\n[= Sat Apr 1 2023]\n zero.[07:00]\n 0.5\n* bob one.\n two.\n 2.5\n* bob three\n four.\n" 2 3 (erc-msg datestamp erc-ts 0 field = erc-timestamp) 3 20 (field erc-timestamp wrap-prefix #1=3D(space :width 27)= line-prefix (space :width (- 27 (18)))) 21 22 (erc-msg notice erc-ts 0 wra= p-prefix #1# line-prefix #2=3D(space :width (- 27 (4)))) 22 183 (wrap-prefi= x #1# line-prefix #2#) 183 190 (field erc-timestamp wrap-prefix #1# line-pr= efix #2# display (#5=3D(margin right-margin) #("[00:00]" 0 7 (invisible tim= estamp)))) 191 192 (erc-msg msg erc-ts 0 erc-cmd PRIVMSG wrap-prefix #1# li= ne-prefix #3=3D(space :width (- 27 (8)))) 192 197 (wrap-prefix #1# line-pre= fix #3#) 197 199 (wrap-prefix #1# line-prefix #3#) 199 202 (wrap-prefix #1#= line-prefix #3#) 202 315 (wrap-prefix #1# line-prefix #3#) 316 348 (wrap-p= refix #1# line-prefix #3#) 349 350 (erc-msg msg erc-ts 0 erc-cmd PRIVMSG wr= ap-prefix #1# line-prefix #4=3D(space :width (- 27 (6)))) 350 353 (wrap-pre= fix #1# line-prefix #4#) 353 355 (wrap-prefix #1# line-prefix #4#) 355 360 = (wrap-prefix #1# line-prefix #4#) 360 435 (wrap-prefix #1# line-prefix #4#)= 436 437 (erc-msg datestamp erc-ts 1680307200 field erc-timestamp) 437 454 = (field erc-timestamp wrap-prefix #1# line-prefix (space :width (- 27 (18)))= ) 455 456 (erc-msg msg erc-ts 1680332400 erc-cmd PRIVMSG wrap-prefix #1# li= ne-prefix #6=3D(space :width (- 27 (6)))) 456 459 (wrap-prefix #1# line-pre= fix #6#) 459 466 (wrap-prefix #1# line-prefix #6#) 466 473 (field erc-times= tamp wrap-prefix #1# line-prefix #6# display (#5# #("[07:00]" 0 7 (invisibl= e timestamp)))) 474 475 (erc-msg msg erc-ts 1680332400 erc-cmd PRIVMSG wrap= -prefix #1# line-prefix #7=3D(space :width (- 27 0)) display #8=3D"") 475 4= 78 (wrap-prefix #1# line-prefix #7# display #8#) 478 480 (wrap-prefix #1# l= ine-prefix #7# display #8#) 480 483 (wrap-prefix #1# line-prefix #7#) 484 4= 85 (erc-msg msg erc-ts 1680332400 erc-cmd PRIVMSG erc-ctcp ACTION wrap-pref= ix #1# line-prefix #9=3D(space :width (- 27 (6)))) 485 486 (wrap-prefix #1#= line-prefix #9#) 486 489 (wrap-prefix #1# line-prefix #9#) 489 494 (wrap-p= refix #1# line-prefix #9#) 495 496 (erc-msg msg erc-ts 1680332400 erc-cmd P= RIVMSG wrap-prefix #1# line-prefix #10=3D(space :width (- 27 (6)))) 496 499= (wrap-prefix #1# line-prefix #10#) 499 505 (wrap-prefix #1# line-prefix #1= 0#) 505 506 (display #("~\n" 0 2 (font-lock-face shadow))) 506 507 (erc-msg= msg erc-ts 1680332400 erc-cmd PRIVMSG wrap-prefix #1# line-prefix #11=3D(s= pace :width (- 27 0)) display #8#) 507 510 (wrap-prefix #1# line-prefix #11= # display #8#) 510 512 (wrap-prefix #1# line-prefix #11# display #8#) 512 5= 15 (wrap-prefix #1# line-prefix #11#) 516 517 (erc-msg msg erc-ts 168033240= 0 erc-cmd PRIVMSG erc-ctcp ACTION wrap-prefix #1# line-prefix #12=3D(space = :width (- 27 (2)))) 517 518 (wrap-prefix #1# line-prefix #12#) 518 521 (wra= p-prefix #1# line-prefix #12#) 521 527 (wrap-prefix #1# line-prefix #12#) 5= 28 529 (erc-msg msg erc-ts 1680332400 erc-cmd PRIVMSG wrap-prefix #1# line-= prefix #13=3D(space :width (- 27 (6)))) 529 532 (wrap-prefix #1# line-prefi= x #13#) 532 539 (wrap-prefix #1# line-prefix #13#)) \ No newline at end of file +#("\n\n\n[Thu Jan 1 1970]\n*** This server is in debug mode and is loggin= g all user I/O. If you do not wish for everything you send to be readable b= y the server owner(s), please disconnect.[00:00]\n bob: come, you ar= e a tedious fool: to the purpose. What was done to Elbow's wife, that he ha= th cause to complain of? Come me to what was done to her.\n alice: Eit= her your unparagoned mistress is dead, or she's outprized by a trifle.\n\n[= Sat Apr 1 2023]\n zero.[07:00]\n 0.5\n* bob one.\n two.\n 2.5\n* bob three\n four.\n" 2 3 (erc--msg datestamp erc--ts 0 fiel= d erc-timestamp) 3 20 (field erc-timestamp wrap-prefix #1=3D(space :width 2= 7) line-prefix (space :width (- 27 (18)))) 21 22 (erc--msg notice erc--ts 0= wrap-prefix #1# line-prefix #2=3D(space :width (- 27 (4)))) 22 183 (wrap-p= refix #1# line-prefix #2#) 183 190 (field erc-timestamp wrap-prefix #1# lin= e-prefix #2# display (#5=3D(margin right-margin) #("[00:00]" 0 7 (invisible= timestamp)))) 191 192 (erc--msg msg erc--ts 0 erc--cmd PRIVMSG wrap-prefix= #1# line-prefix #3=3D(space :width (- 27 (8)))) 192 197 (wrap-prefix #1# l= ine-prefix #3#) 197 199 (wrap-prefix #1# line-prefix #3#) 199 202 (wrap-pre= fix #1# line-prefix #3#) 202 315 (wrap-prefix #1# line-prefix #3#) 316 348 = (wrap-prefix #1# line-prefix #3#) 349 350 (erc--msg msg erc--ts 0 erc--cmd = PRIVMSG wrap-prefix #1# line-prefix #4=3D(space :width (- 27 (6)))) 350 353= (wrap-prefix #1# line-prefix #4#) 353 355 (wrap-prefix #1# line-prefix #4#= ) 355 360 (wrap-prefix #1# line-prefix #4#) 360 435 (wrap-prefix #1# line-p= refix #4#) 436 437 (erc--msg datestamp erc--ts 1680307200 field erc-timesta= mp) 437 454 (field erc-timestamp wrap-prefix #1# line-prefix (space :width = (- 27 (18)))) 455 456 (erc--msg msg erc--ts 1680332400 erc--cmd PRIVMSG wra= p-prefix #1# line-prefix #6=3D(space :width (- 27 (6)))) 456 459 (wrap-pref= ix #1# line-prefix #6#) 459 466 (wrap-prefix #1# line-prefix #6#) 466 473 (= field erc-timestamp wrap-prefix #1# line-prefix #6# display (#5# #("[07:00]= " 0 7 (invisible timestamp)))) 474 475 (erc--msg msg erc--ts 1680332400 erc= --cmd PRIVMSG wrap-prefix #1# line-prefix #7=3D(space :width (- 27 0)) disp= lay #8=3D"") 475 478 (wrap-prefix #1# line-prefix #7# display #8#) 478 480 = (wrap-prefix #1# line-prefix #7# display #8#) 480 483 (wrap-prefix #1# line= -prefix #7#) 484 485 (erc--msg msg erc--ts 1680332400 erc--cmd PRIVMSG erc-= -ctcp ACTION wrap-prefix #1# line-prefix #9=3D(space :width (- 27 (6)))) 48= 5 486 (wrap-prefix #1# line-prefix #9#) 486 489 (wrap-prefix #1# line-prefi= x #9#) 489 494 (wrap-prefix #1# line-prefix #9#) 495 496 (erc--msg msg erc-= -ts 1680332400 erc--cmd PRIVMSG wrap-prefix #1# line-prefix #10=3D(space :w= idth (- 27 (6)))) 496 499 (wrap-prefix #1# line-prefix #10#) 499 505 (wrap-= prefix #1# line-prefix #10#) 505 506 (display #("~\n" 0 2 (font-lock-face s= hadow))) 506 507 (erc--msg msg erc--ts 1680332400 erc--cmd PRIVMSG wrap-pre= fix #1# line-prefix #11=3D(space :width (- 27 0)) display #8#) 507 510 (wra= p-prefix #1# line-prefix #11# display #8#) 510 512 (wrap-prefix #1# line-pr= efix #11# display #8#) 512 515 (wrap-prefix #1# line-prefix #11#) 516 517 (= erc--msg msg erc--ts 1680332400 erc--cmd PRIVMSG erc--ctcp ACTION wrap-pref= ix #1# line-prefix #12=3D(space :width (- 27 (2)))) 517 518 (wrap-prefix #1= # line-prefix #12#) 518 521 (wrap-prefix #1# line-prefix #12#) 521 527 (wra= p-prefix #1# line-prefix #12#) 528 529 (erc--msg msg erc--ts 1680332400 erc= --cmd PRIVMSG wrap-prefix #1# line-prefix #13=3D(space :width (- 27 (6)))) = 529 532 (wrap-prefix #1# line-prefix #13#) 532 539 (wrap-prefix #1# line-pr= efix #13#)) \ No newline at end of file diff --git a/test/lisp/erc/resources/fill/snapshots/merge-wrap-indicator-pr= e-01.eld b/test/lisp/erc/resources/fill/snapshots/merge-wrap-indicator-pre-= 01.eld index 2b67cbbf90e..c4a51e06354 100644 --- a/test/lisp/erc/resources/fill/snapshots/merge-wrap-indicator-pre-01.eld +++ b/test/lisp/erc/resources/fill/snapshots/merge-wrap-indicator-pre-01.eld @@ -1 +1 @@ -#("\n\n\n[Thu Jan 1 1970]\n*** This server is in debug mode and is loggin= g all user I/O. If you do not wish for everything you send to be readable b= y the server owner(s), please disconnect.[00:00]\n bob: come, you ar= e a tedious fool: to the purpose. What was done to Elbow's wife, that he ha= th cause to complain of? Come me to what was done to her.\n alice: Eit= her your unparagoned mistress is dead, or she's outprized by a trifle.\n\n[= Sat Apr 1 2023]\n zero.[07:00]\n 0.5\n* bob one.\n two.\n 2.5\n* bob three\n four.\n" 2 3 (erc-msg datestamp erc-ts 0 field = erc-timestamp) 3 20 (field erc-timestamp wrap-prefix #1=3D(space :width 27)= line-prefix (space :width (- 27 (18)))) 21 22 (erc-msg notice erc-ts 0 wra= p-prefix #1# line-prefix #2=3D(space :width (- 27 (4)))) 22 183 (wrap-prefi= x #1# line-prefix #2#) 183 190 (field erc-timestamp wrap-prefix #1# line-pr= efix #2# display (#5=3D(margin right-margin) #("[00:00]" 0 7 (invisible tim= estamp)))) 191 192 (erc-msg msg erc-ts 0 erc-cmd PRIVMSG wrap-prefix #1# li= ne-prefix #3=3D(space :width (- 27 (8)))) 192 197 (wrap-prefix #1# line-pre= fix #3#) 197 199 (wrap-prefix #1# line-prefix #3#) 199 202 (wrap-prefix #1#= line-prefix #3#) 202 315 (wrap-prefix #1# line-prefix #3#) 316 348 (wrap-p= refix #1# line-prefix #3#) 349 350 (erc-msg msg erc-ts 0 erc-cmd PRIVMSG wr= ap-prefix #1# line-prefix #4=3D(space :width (- 27 (6)))) 350 353 (wrap-pre= fix #1# line-prefix #4#) 353 355 (wrap-prefix #1# line-prefix #4#) 355 360 = (wrap-prefix #1# line-prefix #4#) 360 435 (wrap-prefix #1# line-prefix #4#)= 436 437 (erc-msg datestamp erc-ts 1680307200 field erc-timestamp) 437 454 = (field erc-timestamp wrap-prefix #1# line-prefix (space :width (- 27 (18)))= ) 455 456 (erc-msg msg erc-ts 1680332400 erc-cmd PRIVMSG wrap-prefix #1# li= ne-prefix #6=3D(space :width (- 27 (6)))) 456 459 (wrap-prefix #1# line-pre= fix #6#) 459 466 (wrap-prefix #1# line-prefix #6#) 466 473 (field erc-times= tamp wrap-prefix #1# line-prefix #6# display (#5# #("[07:00]" 0 7 (invisibl= e timestamp)))) 474 475 (erc-msg msg erc-ts 1680332400 erc-cmd PRIVMSG wrap= -prefix #1# line-prefix #7=3D(space :width (- 27 #10=3D(2))) display #8=3D#= ("> " 0 1 (font-lock-face shadow))) 475 478 (wrap-prefix #1# line-prefix #7= # display #8#) 478 480 (wrap-prefix #1# line-prefix #7# display #8#) 480 48= 3 (wrap-prefix #1# line-prefix #7#) 484 485 (erc-msg msg erc-ts 1680332400 = erc-cmd PRIVMSG erc-ctcp ACTION wrap-prefix #1# line-prefix #9=3D(space :wi= dth (- 27 (6)))) 485 486 (wrap-prefix #1# line-prefix #9#) 486 489 (wrap-pr= efix #1# line-prefix #9#) 489 494 (wrap-prefix #1# line-prefix #9#) 495 496= (erc-msg msg erc-ts 1680332400 erc-cmd PRIVMSG wrap-prefix #1# line-prefix= #11=3D(space :width (- 27 (6)))) 496 499 (wrap-prefix #1# line-prefix #11#= ) 499 505 (wrap-prefix #1# line-prefix #11#) 506 507 (erc-msg msg erc-ts 16= 80332400 erc-cmd PRIVMSG wrap-prefix #1# line-prefix #12=3D(space :width (-= 27 #10#)) display #8#) 507 510 (wrap-prefix #1# line-prefix #12# display #= 8#) 510 512 (wrap-prefix #1# line-prefix #12# display #8#) 512 515 (wrap-pr= efix #1# line-prefix #12#) 516 517 (erc-msg msg erc-ts 1680332400 erc-cmd P= RIVMSG erc-ctcp ACTION wrap-prefix #1# line-prefix #13=3D(space :width (- 2= 7 (2)))) 517 518 (wrap-prefix #1# line-prefix #13#) 518 521 (wrap-prefix #1= # line-prefix #13#) 521 527 (wrap-prefix #1# line-prefix #13#) 528 529 (erc= -msg msg erc-ts 1680332400 erc-cmd PRIVMSG wrap-prefix #1# line-prefix #14= =3D(space :width (- 27 (6)))) 529 532 (wrap-prefix #1# line-prefix #14#) 53= 2 539 (wrap-prefix #1# line-prefix #14#)) \ No newline at end of file +#("\n\n\n[Thu Jan 1 1970]\n*** This server is in debug mode and is loggin= g all user I/O. If you do not wish for everything you send to be readable b= y the server owner(s), please disconnect.[00:00]\n bob: come, you ar= e a tedious fool: to the purpose. What was done to Elbow's wife, that he ha= th cause to complain of? Come me to what was done to her.\n alice: Eit= her your unparagoned mistress is dead, or she's outprized by a trifle.\n\n[= Sat Apr 1 2023]\n zero.[07:00]\n 0.5\n* bob one.\n two.\n 2.5\n* bob three\n four.\n" 2 3 (erc--msg datestamp erc--ts 0 fiel= d erc-timestamp) 3 20 (field erc-timestamp wrap-prefix #1=3D(space :width 2= 7) line-prefix (space :width (- 27 (18)))) 21 22 (erc--msg notice erc--ts 0= wrap-prefix #1# line-prefix #2=3D(space :width (- 27 (4)))) 22 183 (wrap-p= refix #1# line-prefix #2#) 183 190 (field erc-timestamp wrap-prefix #1# lin= e-prefix #2# display (#5=3D(margin right-margin) #("[00:00]" 0 7 (invisible= timestamp)))) 191 192 (erc--msg msg erc--ts 0 erc--cmd PRIVMSG wrap-prefix= #1# line-prefix #3=3D(space :width (- 27 (8)))) 192 197 (wrap-prefix #1# l= ine-prefix #3#) 197 199 (wrap-prefix #1# line-prefix #3#) 199 202 (wrap-pre= fix #1# line-prefix #3#) 202 315 (wrap-prefix #1# line-prefix #3#) 316 348 = (wrap-prefix #1# line-prefix #3#) 349 350 (erc--msg msg erc--ts 0 erc--cmd = PRIVMSG wrap-prefix #1# line-prefix #4=3D(space :width (- 27 (6)))) 350 353= (wrap-prefix #1# line-prefix #4#) 353 355 (wrap-prefix #1# line-prefix #4#= ) 355 360 (wrap-prefix #1# line-prefix #4#) 360 435 (wrap-prefix #1# line-p= refix #4#) 436 437 (erc--msg datestamp erc--ts 1680307200 field erc-timesta= mp) 437 454 (field erc-timestamp wrap-prefix #1# line-prefix (space :width = (- 27 (18)))) 455 456 (erc--msg msg erc--ts 1680332400 erc--cmd PRIVMSG wra= p-prefix #1# line-prefix #6=3D(space :width (- 27 (6)))) 456 459 (wrap-pref= ix #1# line-prefix #6#) 459 466 (wrap-prefix #1# line-prefix #6#) 466 473 (= field erc-timestamp wrap-prefix #1# line-prefix #6# display (#5# #("[07:00]= " 0 7 (invisible timestamp)))) 474 475 (erc--msg msg erc--ts 1680332400 erc= --cmd PRIVMSG wrap-prefix #1# line-prefix #7=3D(space :width (- 27 #10=3D(2= ))) display #8=3D#("> " 0 1 (font-lock-face shadow))) 475 478 (wrap-prefix = #1# line-prefix #7# display #8#) 478 480 (wrap-prefix #1# line-prefix #7# d= isplay #8#) 480 483 (wrap-prefix #1# line-prefix #7#) 484 485 (erc--msg msg= erc--ts 1680332400 erc--cmd PRIVMSG erc--ctcp ACTION wrap-prefix #1# line-= prefix #9=3D(space :width (- 27 (6)))) 485 486 (wrap-prefix #1# line-prefix= #9#) 486 489 (wrap-prefix #1# line-prefix #9#) 489 494 (wrap-prefix #1# li= ne-prefix #9#) 495 496 (erc--msg msg erc--ts 1680332400 erc--cmd PRIVMSG wr= ap-prefix #1# line-prefix #11=3D(space :width (- 27 (6)))) 496 499 (wrap-pr= efix #1# line-prefix #11#) 499 505 (wrap-prefix #1# line-prefix #11#) 506 5= 07 (erc--msg msg erc--ts 1680332400 erc--cmd PRIVMSG wrap-prefix #1# line-p= refix #12=3D(space :width (- 27 #10#)) display #8#) 507 510 (wrap-prefix #1= # line-prefix #12# display #8#) 510 512 (wrap-prefix #1# line-prefix #12# d= isplay #8#) 512 515 (wrap-prefix #1# line-prefix #12#) 516 517 (erc--msg ms= g erc--ts 1680332400 erc--cmd PRIVMSG erc--ctcp ACTION wrap-prefix #1# line= -prefix #13=3D(space :width (- 27 (2)))) 517 518 (wrap-prefix #1# line-pref= ix #13#) 518 521 (wrap-prefix #1# line-prefix #13#) 521 527 (wrap-prefix #1= # line-prefix #13#) 528 529 (erc--msg msg erc--ts 1680332400 erc--cmd PRIVM= SG wrap-prefix #1# line-prefix #14=3D(space :width (- 27 (6)))) 529 532 (wr= ap-prefix #1# line-prefix #14#) 532 539 (wrap-prefix #1# line-prefix #14#)) \ No newline at end of file diff --git a/test/lisp/erc/resources/fill/snapshots/monospace-01-start.eld = b/test/lisp/erc/resources/fill/snapshots/monospace-01-start.eld index 84a1e34670c..5eea73b4f16 100644 --- a/test/lisp/erc/resources/fill/snapshots/monospace-01-start.eld +++ b/test/lisp/erc/resources/fill/snapshots/monospace-01-start.eld @@ -1 +1 @@ -#("\n\n\n[Thu Jan 1 1970]\n*** This server is in debug mode and is loggin= g all user I/O. If you do not wish for everything you send to be readable b= y the server owner(s), please disconnect.[00:00]\n bob: come, you ar= e a tedious fool: to the purpose. What was done to Elbow's wife, that he ha= th cause to complain of? Come me to what was done to her.\n alice: Eit= her your unparagoned mistress is dead, or she's outprized by a trifle.\n" 2= 3 (erc-msg datestamp erc-ts 0 field erc-timestamp) 3 20 (field erc-timesta= mp wrap-prefix #1=3D(space :width 27) line-prefix (space :width (- 27 (18))= )) 21 22 (erc-msg notice erc-ts 0 wrap-prefix #1# line-prefix #2=3D(space := width (- 27 (4)))) 22 183 (wrap-prefix #1# line-prefix #2#) 183 190 (field = erc-timestamp wrap-prefix #1# line-prefix #2# display ((margin right-margin= ) #("[00:00]" 0 7 (invisible timestamp)))) 191 192 (erc-msg msg erc-ts 0 er= c-cmd PRIVMSG wrap-prefix #1# line-prefix #3=3D(space :width (- 27 (8)))) 1= 92 197 (wrap-prefix #1# line-prefix #3#) 197 199 (wrap-prefix #1# line-pref= ix #3#) 199 202 (wrap-prefix #1# line-prefix #3#) 202 315 (wrap-prefix #1# = line-prefix #3#) 316 348 (wrap-prefix #1# line-prefix #3#) 349 350 (erc-msg= msg erc-ts 0 erc-cmd PRIVMSG wrap-prefix #1# line-prefix #4=3D(space :widt= h (- 27 (6)))) 350 353 (wrap-prefix #1# line-prefix #4#) 353 355 (wrap-pref= ix #1# line-prefix #4#) 355 360 (wrap-prefix #1# line-prefix #4#) 360 435 (= wrap-prefix #1# line-prefix #4#)) +#("\n\n\n[Thu Jan 1 1970]\n*** This server is in debug mode and is loggin= g all user I/O. If you do not wish for everything you send to be readable b= y the server owner(s), please disconnect.[00:00]\n bob: come, you ar= e a tedious fool: to the purpose. What was done to Elbow's wife, that he ha= th cause to complain of? Come me to what was done to her.\n alice: Eit= her your unparagoned mistress is dead, or she's outprized by a trifle.\n" 2= 3 (erc--msg datestamp erc--ts 0 field erc-timestamp) 3 20 (field erc-times= tamp wrap-prefix #1=3D(space :width 27) line-prefix (space :width (- 27 (18= )))) 21 22 (erc--msg notice erc--ts 0 wrap-prefix #1# line-prefix #2=3D(spa= ce :width (- 27 (4)))) 22 183 (wrap-prefix #1# line-prefix #2#) 183 190 (fi= eld erc-timestamp wrap-prefix #1# line-prefix #2# display ((margin right-ma= rgin) #("[00:00]" 0 7 (invisible timestamp)))) 191 192 (erc--msg msg erc--t= s 0 erc--cmd PRIVMSG wrap-prefix #1# line-prefix #3=3D(space :width (- 27 (= 8)))) 192 197 (wrap-prefix #1# line-prefix #3#) 197 199 (wrap-prefix #1# li= ne-prefix #3#) 199 202 (wrap-prefix #1# line-prefix #3#) 202 315 (wrap-pref= ix #1# line-prefix #3#) 316 348 (wrap-prefix #1# line-prefix #3#) 349 350 (= erc--msg msg erc--ts 0 erc--cmd PRIVMSG wrap-prefix #1# line-prefix #4=3D(s= pace :width (- 27 (6)))) 350 353 (wrap-prefix #1# line-prefix #4#) 353 355 = (wrap-prefix #1# line-prefix #4#) 355 360 (wrap-prefix #1# line-prefix #4#)= 360 435 (wrap-prefix #1# line-prefix #4#)) diff --git a/test/lisp/erc/resources/fill/snapshots/monospace-02-right.eld = b/test/lisp/erc/resources/fill/snapshots/monospace-02-right.eld index 83394f2f639..bc59c0bef22 100644 --- a/test/lisp/erc/resources/fill/snapshots/monospace-02-right.eld +++ b/test/lisp/erc/resources/fill/snapshots/monospace-02-right.eld @@ -1 +1 @@ -#("\n\n\n[Thu Jan 1 1970]\n*** This server is in debug mode and is loggin= g all user I/O. If you do not wish for everything you send to be readable b= y the server owner(s), please disconnect.[00:00]\n bob: come, you ar= e a tedious fool: to the purpose. What was done to Elbow's wife, that he ha= th cause to complain of? Come me to what was done to her.\n alice: Eit= her your unparagoned mistress is dead, or she's outprized by a trifle.\n" 2= 3 (erc-msg datestamp erc-ts 0 field erc-timestamp) 3 20 (field erc-timesta= mp wrap-prefix #1=3D(space :width 29) line-prefix (space :width (- 29 (18))= )) 21 22 (erc-msg notice erc-ts 0 wrap-prefix #1# line-prefix #2=3D(space := width (- 29 (4)))) 22 183 (wrap-prefix #1# line-prefix #2#) 183 190 (field = erc-timestamp wrap-prefix #1# line-prefix #2# display ((margin right-margin= ) #("[00:00]" 0 7 (invisible timestamp)))) 191 192 (erc-msg msg erc-ts 0 er= c-cmd PRIVMSG wrap-prefix #1# line-prefix #3=3D(space :width (- 29 (8)))) 1= 92 197 (wrap-prefix #1# line-prefix #3#) 197 199 (wrap-prefix #1# line-pref= ix #3#) 199 202 (wrap-prefix #1# line-prefix #3#) 202 315 (wrap-prefix #1# = line-prefix #3#) 316 348 (wrap-prefix #1# line-prefix #3#) 349 350 (erc-msg= msg erc-ts 0 erc-cmd PRIVMSG wrap-prefix #1# line-prefix #4=3D(space :widt= h (- 29 (6)))) 350 353 (wrap-prefix #1# line-prefix #4#) 353 355 (wrap-pref= ix #1# line-prefix #4#) 355 360 (wrap-prefix #1# line-prefix #4#) 360 435 (= wrap-prefix #1# line-prefix #4#)) +#("\n\n\n[Thu Jan 1 1970]\n*** This server is in debug mode and is loggin= g all user I/O. If you do not wish for everything you send to be readable b= y the server owner(s), please disconnect.[00:00]\n bob: come, you ar= e a tedious fool: to the purpose. What was done to Elbow's wife, that he ha= th cause to complain of? Come me to what was done to her.\n alice: Eit= her your unparagoned mistress is dead, or she's outprized by a trifle.\n" 2= 3 (erc--msg datestamp erc--ts 0 field erc-timestamp) 3 20 (field erc-times= tamp wrap-prefix #1=3D(space :width 29) line-prefix (space :width (- 29 (18= )))) 21 22 (erc--msg notice erc--ts 0 wrap-prefix #1# line-prefix #2=3D(spa= ce :width (- 29 (4)))) 22 183 (wrap-prefix #1# line-prefix #2#) 183 190 (fi= eld erc-timestamp wrap-prefix #1# line-prefix #2# display ((margin right-ma= rgin) #("[00:00]" 0 7 (invisible timestamp)))) 191 192 (erc--msg msg erc--t= s 0 erc--cmd PRIVMSG wrap-prefix #1# line-prefix #3=3D(space :width (- 29 (= 8)))) 192 197 (wrap-prefix #1# line-prefix #3#) 197 199 (wrap-prefix #1# li= ne-prefix #3#) 199 202 (wrap-prefix #1# line-prefix #3#) 202 315 (wrap-pref= ix #1# line-prefix #3#) 316 348 (wrap-prefix #1# line-prefix #3#) 349 350 (= erc--msg msg erc--ts 0 erc--cmd PRIVMSG wrap-prefix #1# line-prefix #4=3D(s= pace :width (- 29 (6)))) 350 353 (wrap-prefix #1# line-prefix #4#) 353 355 = (wrap-prefix #1# line-prefix #4#) 355 360 (wrap-prefix #1# line-prefix #4#)= 360 435 (wrap-prefix #1# line-prefix #4#)) diff --git a/test/lisp/erc/resources/fill/snapshots/monospace-03-left.eld b= /test/lisp/erc/resources/fill/snapshots/monospace-03-left.eld index 1605628b29f..bfb75c0838e 100644 --- a/test/lisp/erc/resources/fill/snapshots/monospace-03-left.eld +++ b/test/lisp/erc/resources/fill/snapshots/monospace-03-left.eld @@ -1 +1 @@ -#("\n\n\n[Thu Jan 1 1970]\n*** This server is in debug mode and is loggin= g all user I/O. If you do not wish for everything you send to be readable b= y the server owner(s), please disconnect.[00:00]\n bob: come, you ar= e a tedious fool: to the purpose. What was done to Elbow's wife, that he ha= th cause to complain of? Come me to what was done to her.\n alice: Eit= her your unparagoned mistress is dead, or she's outprized by a trifle.\n" 2= 3 (erc-msg datestamp erc-ts 0 field erc-timestamp) 3 20 (field erc-timesta= mp wrap-prefix #1=3D(space :width 25) line-prefix (space :width (- 25 (18))= )) 21 22 (erc-msg notice erc-ts 0 wrap-prefix #1# line-prefix #2=3D(space := width (- 25 (4)))) 22 183 (wrap-prefix #1# line-prefix #2#) 183 190 (field = erc-timestamp wrap-prefix #1# line-prefix #2# display ((margin right-margin= ) #("[00:00]" 0 7 (invisible timestamp)))) 191 192 (erc-msg msg erc-ts 0 er= c-cmd PRIVMSG wrap-prefix #1# line-prefix #3=3D(space :width (- 25 (8)))) 1= 92 197 (wrap-prefix #1# line-prefix #3#) 197 199 (wrap-prefix #1# line-pref= ix #3#) 199 202 (wrap-prefix #1# line-prefix #3#) 202 315 (wrap-prefix #1# = line-prefix #3#) 316 348 (wrap-prefix #1# line-prefix #3#) 349 350 (erc-msg= msg erc-ts 0 erc-cmd PRIVMSG wrap-prefix #1# line-prefix #4=3D(space :widt= h (- 25 (6)))) 350 353 (wrap-prefix #1# line-prefix #4#) 353 355 (wrap-pref= ix #1# line-prefix #4#) 355 360 (wrap-prefix #1# line-prefix #4#) 360 435 (= wrap-prefix #1# line-prefix #4#)) +#("\n\n\n[Thu Jan 1 1970]\n*** This server is in debug mode and is loggin= g all user I/O. If you do not wish for everything you send to be readable b= y the server owner(s), please disconnect.[00:00]\n bob: come, you ar= e a tedious fool: to the purpose. What was done to Elbow's wife, that he ha= th cause to complain of? Come me to what was done to her.\n alice: Eit= her your unparagoned mistress is dead, or she's outprized by a trifle.\n" 2= 3 (erc--msg datestamp erc--ts 0 field erc-timestamp) 3 20 (field erc-times= tamp wrap-prefix #1=3D(space :width 25) line-prefix (space :width (- 25 (18= )))) 21 22 (erc--msg notice erc--ts 0 wrap-prefix #1# line-prefix #2=3D(spa= ce :width (- 25 (4)))) 22 183 (wrap-prefix #1# line-prefix #2#) 183 190 (fi= eld erc-timestamp wrap-prefix #1# line-prefix #2# display ((margin right-ma= rgin) #("[00:00]" 0 7 (invisible timestamp)))) 191 192 (erc--msg msg erc--t= s 0 erc--cmd PRIVMSG wrap-prefix #1# line-prefix #3=3D(space :width (- 25 (= 8)))) 192 197 (wrap-prefix #1# line-prefix #3#) 197 199 (wrap-prefix #1# li= ne-prefix #3#) 199 202 (wrap-prefix #1# line-prefix #3#) 202 315 (wrap-pref= ix #1# line-prefix #3#) 316 348 (wrap-prefix #1# line-prefix #3#) 349 350 (= erc--msg msg erc--ts 0 erc--cmd PRIVMSG wrap-prefix #1# line-prefix #4=3D(s= pace :width (- 25 (6)))) 350 353 (wrap-prefix #1# line-prefix #4#) 353 355 = (wrap-prefix #1# line-prefix #4#) 355 360 (wrap-prefix #1# line-prefix #4#)= 360 435 (wrap-prefix #1# line-prefix #4#)) diff --git a/test/lisp/erc/resources/fill/snapshots/monospace-04-reset.eld = b/test/lisp/erc/resources/fill/snapshots/monospace-04-reset.eld index 84a1e34670c..5eea73b4f16 100644 --- a/test/lisp/erc/resources/fill/snapshots/monospace-04-reset.eld +++ b/test/lisp/erc/resources/fill/snapshots/monospace-04-reset.eld @@ -1 +1 @@ -#("\n\n\n[Thu Jan 1 1970]\n*** This server is in debug mode and is loggin= g all user I/O. If you do not wish for everything you send to be readable b= y the server owner(s), please disconnect.[00:00]\n bob: come, you ar= e a tedious fool: to the purpose. What was done to Elbow's wife, that he ha= th cause to complain of? Come me to what was done to her.\n alice: Eit= her your unparagoned mistress is dead, or she's outprized by a trifle.\n" 2= 3 (erc-msg datestamp erc-ts 0 field erc-timestamp) 3 20 (field erc-timesta= mp wrap-prefix #1=3D(space :width 27) line-prefix (space :width (- 27 (18))= )) 21 22 (erc-msg notice erc-ts 0 wrap-prefix #1# line-prefix #2=3D(space := width (- 27 (4)))) 22 183 (wrap-prefix #1# line-prefix #2#) 183 190 (field = erc-timestamp wrap-prefix #1# line-prefix #2# display ((margin right-margin= ) #("[00:00]" 0 7 (invisible timestamp)))) 191 192 (erc-msg msg erc-ts 0 er= c-cmd PRIVMSG wrap-prefix #1# line-prefix #3=3D(space :width (- 27 (8)))) 1= 92 197 (wrap-prefix #1# line-prefix #3#) 197 199 (wrap-prefix #1# line-pref= ix #3#) 199 202 (wrap-prefix #1# line-prefix #3#) 202 315 (wrap-prefix #1# = line-prefix #3#) 316 348 (wrap-prefix #1# line-prefix #3#) 349 350 (erc-msg= msg erc-ts 0 erc-cmd PRIVMSG wrap-prefix #1# line-prefix #4=3D(space :widt= h (- 27 (6)))) 350 353 (wrap-prefix #1# line-prefix #4#) 353 355 (wrap-pref= ix #1# line-prefix #4#) 355 360 (wrap-prefix #1# line-prefix #4#) 360 435 (= wrap-prefix #1# line-prefix #4#)) +#("\n\n\n[Thu Jan 1 1970]\n*** This server is in debug mode and is loggin= g all user I/O. If you do not wish for everything you send to be readable b= y the server owner(s), please disconnect.[00:00]\n bob: come, you ar= e a tedious fool: to the purpose. What was done to Elbow's wife, that he ha= th cause to complain of? Come me to what was done to her.\n alice: Eit= her your unparagoned mistress is dead, or she's outprized by a trifle.\n" 2= 3 (erc--msg datestamp erc--ts 0 field erc-timestamp) 3 20 (field erc-times= tamp wrap-prefix #1=3D(space :width 27) line-prefix (space :width (- 27 (18= )))) 21 22 (erc--msg notice erc--ts 0 wrap-prefix #1# line-prefix #2=3D(spa= ce :width (- 27 (4)))) 22 183 (wrap-prefix #1# line-prefix #2#) 183 190 (fi= eld erc-timestamp wrap-prefix #1# line-prefix #2# display ((margin right-ma= rgin) #("[00:00]" 0 7 (invisible timestamp)))) 191 192 (erc--msg msg erc--t= s 0 erc--cmd PRIVMSG wrap-prefix #1# line-prefix #3=3D(space :width (- 27 (= 8)))) 192 197 (wrap-prefix #1# line-prefix #3#) 197 199 (wrap-prefix #1# li= ne-prefix #3#) 199 202 (wrap-prefix #1# line-prefix #3#) 202 315 (wrap-pref= ix #1# line-prefix #3#) 316 348 (wrap-prefix #1# line-prefix #3#) 349 350 (= erc--msg msg erc--ts 0 erc--cmd PRIVMSG wrap-prefix #1# line-prefix #4=3D(s= pace :width (- 27 (6)))) 350 353 (wrap-prefix #1# line-prefix #4#) 353 355 = (wrap-prefix #1# line-prefix #4#) 355 360 (wrap-prefix #1# line-prefix #4#)= 360 435 (wrap-prefix #1# line-prefix #4#)) diff --git a/test/lisp/erc/resources/fill/snapshots/spacing-01-mono.eld b/t= est/lisp/erc/resources/fill/snapshots/spacing-01-mono.eld index 7a7e01de49d..1362c57ef10 100644 --- a/test/lisp/erc/resources/fill/snapshots/spacing-01-mono.eld +++ b/test/lisp/erc/resources/fill/snapshots/spacing-01-mono.eld @@ -1 +1 @@ -#("\n\n\n[Thu Jan 1 1970]\n*** This server is in debug mode and is loggin= g all user I/O. If you do not wish for everything you send to be readable b= y the server owner(s), please disconnect.[00:00]\n bob: come, you ar= e a tedious fool: to the purpose. What was done to Elbow's wife, that he ha= th cause to complain of? Come me to what was done to her.\n alice: Eit= her your unparagoned mistress is dead, or she's outprized by a trifle.\n This buffer is for text.\n*** one two three\n*** four five six\n So= mebody stop me\n" 2 3 (erc-msg datestamp erc-ts 0 field erc-timestamp) 3 20= (field erc-timestamp wrap-prefix #1=3D(space :width 27) line-prefix (space= :width (- 27 (18)))) 21 22 (erc-msg notice erc-ts 0 wrap-prefix #1# line-p= refix #2=3D(space :width (- 27 (4)))) 22 183 (wrap-prefix #1# line-prefix #= 2#) 183 190 (field erc-timestamp wrap-prefix #1# line-prefix #2# display ((= margin right-margin) #("[00:00]" 0 7 (invisible timestamp)))) 190 191 (line= -spacing 0.5) 191 192 (erc-msg msg erc-cmd PRIVMSG erc-ts 0 wrap-prefix #1#= line-prefix #3=3D(space :width (- 27 (8)))) 192 197 (wrap-prefix #1# line-= prefix #3#) 197 199 (wrap-prefix #1# line-prefix #3#) 199 202 (wrap-prefix = #1# line-prefix #3#) 202 315 (wrap-prefix #1# line-prefix #3#) 316 348 (wra= p-prefix #1# line-prefix #3#) 348 349 (line-spacing 0.5) 349 350 (erc-msg m= sg erc-cmd PRIVMSG erc-ts 0 wrap-prefix #1# line-prefix #4=3D(space :width = (- 27 (6)))) 350 353 (wrap-prefix #1# line-prefix #4#) 353 355 (wrap-prefix= #1# line-prefix #4#) 355 360 (wrap-prefix #1# line-prefix #4#) 360 435 (wr= ap-prefix #1# line-prefix #4#) 435 436 (line-spacing 0.5) 436 437 (erc-msg = msg erc-cmd PRIVMSG erc-ts 0 wrap-prefix #1# line-prefix #5=3D(space :width= (- 27 0)) display #6=3D"") 437 440 (wrap-prefix #1# line-prefix #5# displa= y #6#) 440 442 (wrap-prefix #1# line-prefix #5# display #6#) 442 466 (wrap-= prefix #1# line-prefix #5#) 466 467 (line-spacing 0.5) 467 468 (erc-msg not= ice erc-ts 0 wrap-prefix #1# line-prefix #7=3D(space :width (- 27 (4)))) 46= 8 484 (wrap-prefix #1# line-prefix #7#) 485 486 (erc-msg notice erc-ts 0 wr= ap-prefix #1# line-prefix #8=3D(space :width (- 27 (4)))) 486 502 (wrap-pre= fix #1# line-prefix #8#) 502 503 (line-spacing 0.5) 503 504 (erc-msg msg er= c-cmd PRIVMSG erc-ts 0 wrap-prefix #1# line-prefix #9=3D(space :width (- 27= (6)))) 504 507 (wrap-prefix #1# line-prefix #9#) 507 525 (wrap-prefix #1# = line-prefix #9#)) +#("\n\n\n[Thu Jan 1 1970]\n*** This server is in debug mode and is loggin= g all user I/O. If you do not wish for everything you send to be readable b= y the server owner(s), please disconnect.[00:00]\n bob: come, you ar= e a tedious fool: to the purpose. What was done to Elbow's wife, that he ha= th cause to complain of? Come me to what was done to her.\n alice: Eit= her your unparagoned mistress is dead, or she's outprized by a trifle.\n This buffer is for text.\n*** one two three\n*** four five six\n So= mebody stop me\n" 2 3 (erc--msg datestamp erc--ts 0 field erc-timestamp) 3 = 20 (field erc-timestamp wrap-prefix #1=3D(space :width 27) line-prefix (spa= ce :width (- 27 (18)))) 21 22 (erc--msg notice erc--ts 0 wrap-prefix #1# li= ne-prefix #2=3D(space :width (- 27 (4)))) 22 183 (wrap-prefix #1# line-pref= ix #2#) 183 190 (field erc-timestamp wrap-prefix #1# line-prefix #2# displa= y ((margin right-margin) #("[00:00]" 0 7 (invisible timestamp)))) 190 191 (= line-spacing 0.5) 191 192 (erc--msg msg erc--cmd PRIVMSG erc--ts 0 wrap-pre= fix #1# line-prefix #3=3D(space :width (- 27 (8)))) 192 197 (wrap-prefix #1= # line-prefix #3#) 197 199 (wrap-prefix #1# line-prefix #3#) 199 202 (wrap-= prefix #1# line-prefix #3#) 202 315 (wrap-prefix #1# line-prefix #3#) 316 3= 48 (wrap-prefix #1# line-prefix #3#) 348 349 (line-spacing 0.5) 349 350 (er= c--msg msg erc--cmd PRIVMSG erc--ts 0 wrap-prefix #1# line-prefix #4=3D(spa= ce :width (- 27 (6)))) 350 353 (wrap-prefix #1# line-prefix #4#) 353 355 (w= rap-prefix #1# line-prefix #4#) 355 360 (wrap-prefix #1# line-prefix #4#) 3= 60 435 (wrap-prefix #1# line-prefix #4#) 435 436 (line-spacing 0.5) 436 437= (erc--msg msg erc--cmd PRIVMSG erc--ts 0 wrap-prefix #1# line-prefix #5=3D= (space :width (- 27 0)) display #6=3D"") 437 440 (wrap-prefix #1# line-pref= ix #5# display #6#) 440 442 (wrap-prefix #1# line-prefix #5# display #6#) 4= 42 466 (wrap-prefix #1# line-prefix #5#) 466 467 (line-spacing 0.5) 467 468= (erc--msg notice erc--ts 0 wrap-prefix #1# line-prefix #7=3D(space :width = (- 27 (4)))) 468 484 (wrap-prefix #1# line-prefix #7#) 485 486 (erc--msg no= tice erc--ts 0 wrap-prefix #1# line-prefix #8=3D(space :width (- 27 (4)))) = 486 502 (wrap-prefix #1# line-prefix #8#) 502 503 (line-spacing 0.5) 503 50= 4 (erc--msg msg erc--cmd PRIVMSG erc--ts 0 wrap-prefix #1# line-prefix #9= =3D(space :width (- 27 (6)))) 504 507 (wrap-prefix #1# line-prefix #9#) 507= 525 (wrap-prefix #1# line-prefix #9#)) diff --git a/test/lisp/erc/resources/fill/snapshots/stamps-left-01.eld b/te= st/lisp/erc/resources/fill/snapshots/stamps-left-01.eld index bb248ffb28e..4f87c7d2547 100644 --- a/test/lisp/erc/resources/fill/snapshots/stamps-left-01.eld +++ b/test/lisp/erc/resources/fill/snapshots/stamps-left-01.eld @@ -1 +1 @@ -#("\n\n[00:00]*** This server is in debug mode and is logging all user I/O= . If you do not wish for everything you send to be readable by the server o= wner(s), please disconnect.\n[00:00] bob: come, you are a tedious fo= ol: to the purpose. What was done to Elbow's wife, that he hath cause to co= mplain of? Come me to what was done to her.\n[00:00] alice: Either you= r unparagoned mistress is dead, or she's outprized by a trifle.\n" 2 3 (erc= -msg notice erc-ts 0 display #3=3D(#5=3D(margin left-margin) #("[00:00]" 0 = 7 (invisible timestamp font-lock-face erc-timestamp-face))) field erc-times= tamp wrap-prefix #1=3D(space :width 27) line-prefix #2=3D(space :width (- 2= 7 (4)))) 3 9 (display #3# field erc-timestamp wrap-prefix #1# line-prefix #= 2#) 9 171 (wrap-prefix #1# line-prefix #2#) 172 173 (erc-msg msg erc-ts 0 e= rc-cmd PRIVMSG display #6=3D(#5# #("[00:00]" 0 7 (invisible timestamp font-= lock-face erc-timestamp-face))) field erc-timestamp wrap-prefix #1# line-pr= efix #4=3D(space :width (- 27 (8)))) 173 179 (display #6# field erc-timesta= mp wrap-prefix #1# line-prefix #4#) 179 180 (wrap-prefix #1# line-prefix #4= #) 180 185 (wrap-prefix #1# line-prefix #4#) 185 187 (wrap-prefix #1# line-= prefix #4#) 187 190 (wrap-prefix #1# line-prefix #4#) 190 303 (wrap-prefix = #1# line-prefix #4#) 304 336 (wrap-prefix #1# line-prefix #4#) 337 338 (erc= -msg msg erc-ts 0 erc-cmd PRIVMSG display #8=3D(#5# #("[00:00]" 0 7 (invisi= ble timestamp font-lock-face erc-timestamp-face))) field erc-timestamp wrap= -prefix #1# line-prefix #7=3D(space :width (- 27 (6)))) 338 344 (display #8= # field erc-timestamp wrap-prefix #1# line-prefix #7#) 344 345 (wrap-prefix= #1# line-prefix #7#) 345 348 (wrap-prefix #1# line-prefix #7#) 348 350 (wr= ap-prefix #1# line-prefix #7#) 350 355 (wrap-prefix #1# line-prefix #7#) 35= 5 430 (wrap-prefix #1# line-prefix #7#)) +#("\n\n[00:00]*** This server is in debug mode and is logging all user I/O= . If you do not wish for everything you send to be readable by the server o= wner(s), please disconnect.\n[00:00] bob: come, you are a tedious fo= ol: to the purpose. What was done to Elbow's wife, that he hath cause to co= mplain of? Come me to what was done to her.\n[00:00] alice: Either you= r unparagoned mistress is dead, or she's outprized by a trifle.\n" 2 3 (erc= --msg notice erc--ts 0 display #3=3D(#5=3D(margin left-margin) #("[00:00]" = 0 7 (invisible timestamp font-lock-face erc-timestamp-face))) field erc-tim= estamp wrap-prefix #1=3D(space :width 27) line-prefix #2=3D(space :width (-= 27 (4)))) 3 9 (display #3# field erc-timestamp wrap-prefix #1# line-prefix= #2#) 9 171 (wrap-prefix #1# line-prefix #2#) 172 173 (erc--msg msg erc--ts= 0 erc--cmd PRIVMSG display #6=3D(#5# #("[00:00]" 0 7 (invisible timestamp = font-lock-face erc-timestamp-face))) field erc-timestamp wrap-prefix #1# li= ne-prefix #4=3D(space :width (- 27 (8)))) 173 179 (display #6# field erc-ti= mestamp wrap-prefix #1# line-prefix #4#) 179 180 (wrap-prefix #1# line-pref= ix #4#) 180 185 (wrap-prefix #1# line-prefix #4#) 185 187 (wrap-prefix #1# = line-prefix #4#) 187 190 (wrap-prefix #1# line-prefix #4#) 190 303 (wrap-pr= efix #1# line-prefix #4#) 304 336 (wrap-prefix #1# line-prefix #4#) 337 338= (erc--msg msg erc--ts 0 erc--cmd PRIVMSG display #8=3D(#5# #("[00:00]" 0 7= (invisible timestamp font-lock-face erc-timestamp-face))) field erc-timest= amp wrap-prefix #1# line-prefix #7=3D(space :width (- 27 (6)))) 338 344 (di= splay #8# field erc-timestamp wrap-prefix #1# line-prefix #7#) 344 345 (wra= p-prefix #1# line-prefix #7#) 345 348 (wrap-prefix #1# line-prefix #7#) 348= 350 (wrap-prefix #1# line-prefix #7#) 350 355 (wrap-prefix #1# line-prefix= #7#) 355 430 (wrap-prefix #1# line-prefix #7#)) --=20 2.42.0 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0004-5.6-Add-erc-spkr-text-property-to-chat-messages.patch Content-Transfer-Encoding: quoted-printable >From 1dd470f193d1a7bb0baa34798317d5eac83a93ce Mon Sep 17 00:00:00 2001 From: "F. Jason Park" Date: Mon, 4 Dec 2023 22:13:02 -0800 Subject: [PATCH 04/11] [5.6] Add erc--spkr text property to chat messages * etc/ERC-NEWS: Mention combined face ordering for "/me" messages. * lisp/erc/erc-backend.el: Bind `erc--msg-prop-overrides'. * lisp/erc/erc-fill.el (erc-fill): Switch to `erc--spkr' as sentinel property. (erc-fill--wrap-continued-message-p): Look for `erc--spkr' property instead of `erc-speaker'. * lisp/erc/erc.el (erc--msg-props): Mention `erc--spkr' in doc. (erc--msg-props): Mention `erc--spkr'. (erc--send-action-perform-ctcp): Add `erc--spkr' property and ensure `erc-my-nick-face' appears above `erc-input-face' in the speaker portion. (erc--insure-spkr-prop): New function. (erc--ranked-properties): Add `erc--spkr', `erc--ctcp', and `erc--ephemeral'. (erc-display-message): Use default hash table size when initializing. Remove unnecessary assignment of `msg' to `erc--msg' for PRIVMSG and NOTICE commands. (erc--own-property-names): Add all `erc--msg-props' props. (erc--get-speaker-bounds): Use `erc--spkr' instead of `erc--msg'. (erc-format-privmessage, erc-format-my-nick, erc-ctcp-query-ACTION): Add `erc--spkr' to `erc--msg-prop-overrides' when available. * test/lisp/erc/erc-fill-tests.el: (erc--order-text-properties-from-hash): Include `erc--spkr'. (erc-fill-tests--insert-privmsg): bind `erc--msg-prop-overrides'. (erc-fill-tests--compare): Require environment variable value to match current test name for saving to work. Add `erc--msg-props' individually to white list. (Bug#60936) ; * test/lisp/erc/resources/fill/snapshots/merge-01-start.eld: Update. ; * test/lisp/erc/resources/fill/snapshots/merge-02-right.eld: Update. ; * test/lisp/erc/resources/fill/snapshots/merge-wrap-01.eld: Update. ; * test/lisp/erc/resources/fill/snapshots/merge-wrap-indicator-post-01.eld: ; Update. ; * test/lisp/erc/resources/fill/snapshots/merge-wrap-indicator-pre-01.eld: ; Update. ; * test/lisp/erc/resources/fill/snapshots/monospace-01-start.eld: Update. ; * test/lisp/erc/resources/fill/snapshots/monospace-02-right.eld: Update. ; * test/lisp/erc/resources/fill/snapshots/monospace-03-left.eld: Update. ; * test/lisp/erc/resources/fill/snapshots/monospace-04-reset.eld: Update. ; * test/lisp/erc/resources/fill/snapshots/spacing-01-mono.eld: Update. ; * test/lisp/erc/resources/fill/snapshots/stamps-left-01.eld: Update. --- etc/ERC-NEWS | 5 ++- lisp/erc/erc-backend.el | 3 ++ lisp/erc/erc-fill.el | 20 ++++----- lisp/erc/erc.el | 43 +++++++++++++------ test/lisp/erc/erc-fill-tests.el | 11 +++-- test/lisp/erc/erc-tests.el | 2 + .../fill/snapshots/merge-01-start.eld | 2 +- .../fill/snapshots/merge-02-right.eld | 2 +- .../fill/snapshots/merge-wrap-01.eld | 2 +- .../merge-wrap-indicator-post-01.eld | 2 +- .../snapshots/merge-wrap-indicator-pre-01.eld | 2 +- .../fill/snapshots/monospace-01-start.eld | 2 +- .../fill/snapshots/monospace-02-right.eld | 2 +- .../fill/snapshots/monospace-03-left.eld | 2 +- .../fill/snapshots/monospace-04-reset.eld | 2 +- .../fill/snapshots/spacing-01-mono.eld | 2 +- .../fill/snapshots/stamps-left-01.eld | 2 +- 17 files changed, 66 insertions(+), 40 deletions(-) diff --git a/etc/ERC-NEWS b/etc/ERC-NEWS index 238c40feefb..f6a9d934e80 100644 --- a/etc/ERC-NEWS +++ b/etc/ERC-NEWS @@ -214,7 +214,10 @@ Users of the default theme may notice that 'erc-action= -face' and 'erc-notice-face' now appear slightly less bold on systems supporting a weight of 'semi-bold'. This was done to make buttons detectable and to spare users from resorting to tweaking these faces, or options like -'erc-notice-highlight-type', just to achieve this effect. +'erc-notice-highlight-type', just to achieve this effect. It's +currently most prominent in "/ME" messages, where 'erc-action-face' +sits beneath 'erc-input-face', as well as 'erc-my-nick-face' in the +speaker portion. =20 ** Improved interplay between buffer truncation and message logging. While most of these improvements are subtle, some affect everyday use. diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el index 500e025e5a1..b1ceeea4f44 100644 --- a/lisp/erc/erc-backend.el +++ b/lisp/erc/erc-backend.el @@ -1916,6 +1916,7 @@ erc--server-determine-join-display-context (erc-ignored-reply-p msg tgt proc)) (when erc-minibuffer-ignored (message "Ignored %s from %s to %s" cmd sender-spec tgt)) + (defvar erc--msg-prop-overrides) (let* ((sndr (erc-parse-user sender-spec)) (nick (nth 0 sndr)) (login (nth 1 sndr)) @@ -1926,6 +1927,8 @@ erc--server-determine-join-display-context (privp (erc-current-nick-p tgt)) (erc--display-context `((erc-buffer-display . ,(intern cmd)) ,@erc--display-context)) + (erc--msg-prop-overrides `((erc--msg . msg) + ,@erc--msg-prop-overrides)) s buffer fnick) (setf (erc-response.contents parsed) msg) diff --git a/lisp/erc/erc-fill.el b/lisp/erc/erc-fill.el index 5434d9af966..de6cd581fec 100644 --- a/lisp/erc/erc-fill.el +++ b/lisp/erc/erc-fill.el @@ -177,11 +177,10 @@ erc-fill (when-let ((erc-fill-line-spacing) (p (point-min))) (widen) - (when (or (erc--check-msg-prop 'erc--msg 'msg) - (and-let* ((m (save-excursion - (forward-line -1) - (erc--get-inserted-msg-prop 'erc--ms= g)))) - (eq 'msg m))) + (when (or (erc--check-msg-prop 'erc--spkr) + (save-excursion + (forward-line -1) + (erc--get-inserted-msg-prop 'erc--spkr))) (put-text-property (1- p) p 'line-spacing erc-fill-line-spacing))))))= )) =20 @@ -568,22 +567,19 @@ erc-fill--wrap-continued-message-p (props (save-restriction (widen) (and-let* - (((eq 'msg (get-text-property m 'erc--msg))) + ((speaker (get-text-property m 'erc--spkr)) ((not (eq (get-text-property m 'erc--ctcp) 'ACTION))) - ((not (invisible-p m))) - (spr (next-single-property-change m 'erc-speak= er))) - (cons (get-text-property m 'erc--ts) - (get-text-property spr 'erc-speaker))))) + ((not (invisible-p m)))) + (cons (get-text-property m 'erc--ts) speaker)))) (ts (pop props)) (props) ((not (time-less-p (erc-stamp--current-time) ts))) ((time-less-p (time-subtract (erc-stamp--current-time) ts) erc-fill--wrap-max-lull)) ;; Assume presence of leading angle bracket or hyphen. - (speaker (next-single-property-change (point-min) 'erc-speak= er)) + (nick (erc--check-msg-prop 'erc--spkr)) ((not (erc--check-msg-prop 'erc--ctcp 'ACTION))) - (nick (get-text-property speaker 'erc-speaker)) ((erc-nick-equal-p props nick)))) (set-marker erc-fill--wrap-last-msg (point-min)))))) =20 diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index c68c74467b8..7397add1e98 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -167,6 +167,8 @@ erc--msg-props and help text, and on outgoing messages unless echoed back by the server (assuming future support) =20 + - `erc--spkr': a string, the nick of the person speaking + - `erc--ctcp': a CTCP command, like `ACTION' =20 - `erc--ts': a timestamp, possibly provided by the server; as of @@ -3013,13 +3015,16 @@ erc--send-action-perform-ctcp (defun erc--send-action-display (string) "Display STRING as an outgoing \"CTCP ACTION\" message." ;; Allow hooks acting on inserted PRIVMSG and NOTICES to process us. - (let ((erc--msg-prop-overrides `((erc--msg . msg) - (erc--ctcp . ACTION) - ,@erc--msg-prop-overrides)) - (nick (erc-current-nick))) + (defvar erc--merge-prop-behind-p) + (let* ((nick (erc-current-nick)) + (erc--msg-prop-overrides `((erc--msg . msg) + (erc--ctcp . ACTION) + (erc--spkr . ,nick) + ,@erc--msg-prop-overrides)) + (erc--merge-prop-behind-p t)) (setq nick (propertize nick 'erc-speaker nick 'font-lock-face 'erc-my-nick-face)) - (erc-display-message nil '(t action input) (current-buffer) + (erc-display-message nil '(t input action) (current-buffer) 'ACTION ?n nick ?a string ?u "" ?h ""))) =20 (defun erc--send-action (target string force) @@ -3029,6 +3034,12 @@ erc--send-action =20 ;; Display interface =20 +(defun erc--ensure-spkr-prop (nick) + "Maybe add NICK to `erc--msg-props' or `erc--msg-prop-overrides'." + (cond (erc--msg-props (puthash 'erc--spkr nick erc--msg-props)) + (erc--msg-prop-overrides + (push (cons 'erc--spkr nick) erc--msg-prop-overrides)))) + (defun erc-string-invisible-p (string) "Check whether STRING is invisible or not. I.e. any char in it has the `invisible' property set." @@ -3458,7 +3469,8 @@ erc--delete-inserted-message (substring (delete-and-extract-region (1- (point)) (1+ end)) -1)))))))) =20 -(defvar erc--ranked-properties '(erc--msg erc--ts erc--cmd)) +(defvar erc--ranked-properties + '(erc--msg erc--spkr erc--ts erc--cmd erc--ctcp erc--ephemeral)) =20 (defun erc--order-text-properties-from-hash (table) "Return a plist of text props from items in TABLE. @@ -3729,12 +3741,11 @@ erc-display-message msg)) (erc--msg-props (or erc--msg-props - (let ((table (make-hash-table :size 5)) + (let ((table (make-hash-table)) (cmd (and parsed (erc--get-eq-comparable-cmd (erc-response.command parsed))))) (puthash 'erc--msg (cond ((and msg (symbolp msg)) msg) - ((and cmd (memq cmd '(PRIVMSG NOTICE)) 'msg)) (type (pcase type ((pred symbolp) type) ((pred listp) @@ -3745,8 +3756,8 @@ erc-display-message table) (when cmd (puthash 'erc--cmd cmd table)) - (and-let* ((ovs erc--msg-prop-overrides)) - (pcase-dolist (`(,k . ,v) (reverse ovs)) + (when erc--msg-prop-overrides + (pcase-dolist (`(,k . ,v) (reverse erc--msg-prop-override= s)) (puthash k v table))) table))) (erc-message-parsed parsed)) @@ -4645,6 +4656,9 @@ erc-send-message (funcall erc--send-message-nested-function line force) (erc--send-message-external line force))) =20 +;; FIXME fully simulate `erc-display-msg'. This doesn't currently add +;; the correct text properties. For example, the LINE should have +;; `erc-default-face'. (defun erc--send-message-external (line force) (erc-message "PRIVMSG" (concat (erc-default-target) " " line) force) (erc-display-line @@ -5258,7 +5272,9 @@ erc-ensure-channel-name (concat "#" channel))) =20 (defvar erc--own-property-names - '( tags erc-speaker erc-parsed display ; core + `( tags erc-speaker erc-parsed display ; core + ;; `erc--msg-props' + ,@erc--ranked-properties ;; `erc-display-prompt' rear-nonsticky erc-prompt field front-sticky read-only ;; stamp @@ -5744,7 +5760,7 @@ erc-is-message-ctcp-and-not-action-p (defun erc--get-speaker-bounds () "Return the bounds of `erc-speaker' text property when present. Assume buffer is narrowed to the confines of an inserted message." - (and-let* (((erc--check-msg-prop 'erc--msg 'msg)) + (and-let* (((erc--check-msg-prop 'erc--spkr)) (beg (text-property-not-all (point-min) (point-max) 'erc-speaker nil))) (cons beg (next-single-property-change beg 'erc-speaker)))) @@ -5772,6 +5788,7 @@ erc-format-privmessage nick-prefix-face nick)) 0)) (msg-face (if privp 'erc-direct-msg-face 'erc-default-face))) + (erc--ensure-spkr-prop nick) ;; add text properties to text before the nick, the nick and after the= nick (erc-put-text-property 0 (length mark-s) 'font-lock-face msg-face str) (erc-put-text-properties (+ (length mark-s) prefix-len) @@ -5827,6 +5844,7 @@ erc-format-my-nick (close "> ") (nick (erc-current-nick)) (mode (erc-get-user-mode-prefix nick))) + (erc--ensure-spkr-prop nick) (concat (propertize open 'font-lock-face 'erc-default-face) (propertize mode 'font-lock-face 'erc-my-nick-prefix-face) @@ -6111,6 +6129,7 @@ erc-ctcp-query-ACTION (buf (or (erc-get-buffer to proc) (erc-get-buffer nick proc) (process-buffer proc)))) + (erc--ensure-spkr-prop nick) (setq nick (propertize nick 'erc-speaker nick)) (erc-display-message parsed 'action buf diff --git a/test/lisp/erc/erc-fill-tests.el b/test/lisp/erc/erc-fill-tests= .el index bfdf8cd7320..8560d421cc2 100644 --- a/test/lisp/erc/erc-fill-tests.el +++ b/test/lisp/erc/erc-fill-tests.el @@ -35,7 +35,8 @@ erc-stamp--current-time =20 (defun erc-fill-tests--insert-privmsg (speaker &rest msg-parts) (declare (indent 1)) - (let* ((msg (erc-format-privmessage speaker + (let* ((erc--msg-prop-overrides `((erc--msg . msg))) + (msg (erc-format-privmessage speaker (apply #'concat msg-parts) nil t)) (parsed (make-erc-response :unparsed (format ":%s PRIVMSG #chan := %s" speaker msg) @@ -150,7 +151,9 @@ erc-fill-tests--compare "eld")) (erc--own-property-names (seq-difference `(font-lock-face ,@erc--own-property-names) - '(field display wrap-prefix line-prefix) + `(field display wrap-prefix line-prefix + erc--msg erc--cmd erc--spkr erc--ts erc-= -ctcp + erc--ephemeral) #'eq)) (print-circle t) (print-escape-newlines t) @@ -165,12 +168,12 @@ erc-fill-tests--compare (with-silent-modifications (insert (setq got (read repr)))) (erc-mode)) - (if erc-fill-tests--save-p + ;; LHS is a string, RHS is a symbol. + (if (string=3D erc-fill-tests--save-p (ert-test-name (ert-running-test= ))) (let (inhibit-message) (with-temp-file expect-file (insert repr)) ;; Limit writing snapshots to one test at a time. - (setq erc-fill-tests--save-p nil) (message "erc-fill-tests--compare: wrote %S" expect-file)) (if (file-exists-p expect-file) ;; Ensure string-valued properties, like timestamps, aren't diff --git a/test/lisp/erc/erc-tests.el b/test/lisp/erc/erc-tests.el index b8ebc23e686..ed1dcccd59c 100644 --- a/test/lisp/erc/erc-tests.el +++ b/test/lisp/erc/erc-tests.el @@ -1859,6 +1859,7 @@ erc--order-text-properties-from-hash (erc--msg . s005) (b . 2) (erc--cmd . 5) + (erc--spkr . "X") (c . 3)) 'hash-table))) (with-temp-buffer @@ -1866,6 +1867,7 @@ erc--order-text-properties-from-hash (insert "abc\n") (add-text-properties 1 2 (erc--order-text-properties-from-hash table= )) (should (equal '( erc--msg s005 + erc--spkr "X" erc--ts 0 erc--cmd 5 a 1 diff --git a/test/lisp/erc/resources/fill/snapshots/merge-01-start.eld b/te= st/lisp/erc/resources/fill/snapshots/merge-01-start.eld index f4a43a9384f..3c32719a052 100644 --- a/test/lisp/erc/resources/fill/snapshots/merge-01-start.eld +++ b/test/lisp/erc/resources/fill/snapshots/merge-01-start.eld @@ -1 +1 @@ -#("\n\n\n[Thu Jan 1 1970]\n*** This server is in debug mode and is loggin= g all user I/O. If you do not wish for everything you send to be readable b= y the server owner(s), please disconnect.[00:00]\n bob: come, you ar= e a tedious fool: to the purpose. What was done to Elbow's wife, that he ha= th cause to complain of? Come me to what was done to her.\n alice: Eit= her your unparagoned mistress is dead, or she's outprized by a trifle.\n\n[= Sat Apr 1 2023]\n zero.[07:00]\n one.\n two.\n thr= ee.\n four.\n five.\n six.\n" 2 3 (erc--msg datestamp er= c--ts 0 field erc-timestamp) 3 20 (field erc-timestamp wrap-prefix #1=3D(sp= ace :width 27) line-prefix (space :width (- 27 (18)))) 21 22 (erc--msg noti= ce erc--ts 0 wrap-prefix #1# line-prefix #2=3D(space :width (- 27 (4)))) 22= 183 (wrap-prefix #1# line-prefix #2#) 183 190 (field erc-timestamp wrap-pr= efix #1# line-prefix #2# display (#6=3D(margin right-margin) #("[00:00]" 0 = 7 (invisible timestamp)))) 191 192 (erc--msg msg erc--ts 0 erc--cmd PRIVMSG= wrap-prefix #1# line-prefix #3=3D(space :width (- 27 (8)))) 192 197 (wrap-= prefix #1# line-prefix #3#) 197 199 (wrap-prefix #1# line-prefix #3#) 199 2= 02 (wrap-prefix #1# line-prefix #3#) 202 315 (wrap-prefix #1# line-prefix #= 3#) 316 348 (wrap-prefix #1# line-prefix #3#) 349 350 (erc--msg msg erc--ts= 0 erc--cmd PRIVMSG wrap-prefix #1# line-prefix #4=3D(space :width (- 27 (6= )))) 350 353 (wrap-prefix #1# line-prefix #4#) 353 355 (wrap-prefix #1# lin= e-prefix #4#) 355 360 (wrap-prefix #1# line-prefix #4#) 360 435 (wrap-prefi= x #1# line-prefix #4#) 436 437 (erc--msg datestamp erc--ts 1680307200 field= erc-timestamp) 437 454 (field erc-timestamp wrap-prefix #1# line-prefix (s= pace :width (- 27 (18)))) 455 456 (erc--msg msg erc--ts 1680332400 erc--cmd= PRIVMSG wrap-prefix #1# line-prefix #5=3D(space :width (- 27 (6)))) 456 45= 9 (wrap-prefix #1# line-prefix #5#) 459 466 (wrap-prefix #1# line-prefix #5= #) 466 473 (field erc-timestamp wrap-prefix #1# line-prefix #5# display (#6= # #("[07:00]" 0 7 (invisible timestamp)))) 474 475 (erc--msg msg erc--ts 16= 80332400 erc--cmd PRIVMSG wrap-prefix #1# line-prefix #7=3D(space :width (-= 27 (8)))) 475 480 (wrap-prefix #1# line-prefix #7#) 480 486 (wrap-prefix #= 1# line-prefix #7#) 487 488 (erc--msg msg erc--ts 1680332400 erc--cmd PRIVM= SG wrap-prefix #1# line-prefix #8=3D(space :width (- 27 0)) display #9=3D""= ) 488 493 (wrap-prefix #1# line-prefix #8# display #9#) 493 495 (wrap-prefi= x #1# line-prefix #8# display #9#) 495 499 (wrap-prefix #1# line-prefix #8#= ) 500 501 (erc--msg msg erc--ts 1680332400 erc--cmd PRIVMSG wrap-prefix #1#= line-prefix #10=3D(space :width (- 27 (6)))) 501 504 (wrap-prefix #1# line= -prefix #10#) 504 512 (wrap-prefix #1# line-prefix #10#) 513 514 (erc--msg = msg erc--ts 1680332400 erc--cmd PRIVMSG wrap-prefix #1# line-prefix #11=3D(= space :width (- 27 0)) display #9#) 514 517 (wrap-prefix #1# line-prefix #1= 1# display #9#) 517 519 (wrap-prefix #1# line-prefix #11# display #9#) 519 = 524 (wrap-prefix #1# line-prefix #11#) 525 526 (erc--msg msg erc--ts 168033= 2400 erc--cmd PRIVMSG wrap-prefix #1# line-prefix #12=3D(space :width (- 27= (8)))) 526 531 (wrap-prefix #1# line-prefix #12#) 531 538 (wrap-prefix #1#= line-prefix #12#) 539 540 (erc--msg msg erc--ts 1680332400 erc--cmd PRIVMS= G wrap-prefix #1# line-prefix #13=3D(space :width (- 27 0)) display #9#) 54= 0 545 (wrap-prefix #1# line-prefix #13# display #9#) 545 547 (wrap-prefix #= 1# line-prefix #13# display #9#) 547 551 (wrap-prefix #1# line-prefix #13#)) +#("\n\n\n[Thu Jan 1 1970]\n*** This server is in debug mode and is loggin= g all user I/O. If you do not wish for everything you send to be readable b= y the server owner(s), please disconnect.[00:00]\n bob: come, you ar= e a tedious fool: to the purpose. What was done to Elbow's wife, that he ha= th cause to complain of? Come me to what was done to her.\n alice: Eit= her your unparagoned mistress is dead, or she's outprized by a trifle.\n\n[= Sat Apr 1 2023]\n zero.[07:00]\n one.\n two.\n thr= ee.\n four.\n five.\n six.\n" 2 3 (erc--msg datestamp er= c--ts 0 field erc-timestamp) 3 20 (field erc-timestamp wrap-prefix #1=3D(sp= ace :width 27) line-prefix (space :width (- 27 (18)))) 21 22 (erc--msg noti= ce erc--ts 0 wrap-prefix #1# line-prefix #2=3D(space :width (- 27 (4)))) 22= 183 (wrap-prefix #1# line-prefix #2#) 183 190 (field erc-timestamp wrap-pr= efix #1# line-prefix #2# display (#6=3D(margin right-margin) #("[00:00]" 0 = 7 (invisible timestamp)))) 191 192 (erc--msg msg erc--ts 0 erc--spkr "alice= " erc--cmd PRIVMSG wrap-prefix #1# line-prefix #3=3D(space :width (- 27 (8)= ))) 192 197 (wrap-prefix #1# line-prefix #3#) 197 199 (wrap-prefix #1# line= -prefix #3#) 199 202 (wrap-prefix #1# line-prefix #3#) 202 315 (wrap-prefix= #1# line-prefix #3#) 316 348 (wrap-prefix #1# line-prefix #3#) 349 350 (er= c--msg msg erc--ts 0 erc--spkr "bob" erc--cmd PRIVMSG wrap-prefix #1# line-= prefix #4=3D(space :width (- 27 (6)))) 350 353 (wrap-prefix #1# line-prefix= #4#) 353 355 (wrap-prefix #1# line-prefix #4#) 355 360 (wrap-prefix #1# li= ne-prefix #4#) 360 435 (wrap-prefix #1# line-prefix #4#) 436 437 (erc--msg = datestamp erc--ts 1680307200 field erc-timestamp) 437 454 (field erc-timest= amp wrap-prefix #1# line-prefix (space :width (- 27 (18)))) 455 456 (erc--m= sg msg erc--ts 1680332400 erc--spkr "bob" erc--cmd PRIVMSG wrap-prefix #1# = line-prefix #5=3D(space :width (- 27 (6)))) 456 459 (wrap-prefix #1# line-p= refix #5#) 459 466 (wrap-prefix #1# line-prefix #5#) 466 473 (field erc-tim= estamp wrap-prefix #1# line-prefix #5# display (#6# #("[07:00]" 0 7 (invisi= ble timestamp)))) 474 475 (erc--msg msg erc--ts 1680332400 erc--spkr "alice= " erc--cmd PRIVMSG wrap-prefix #1# line-prefix #7=3D(space :width (- 27 (8)= ))) 475 480 (wrap-prefix #1# line-prefix #7#) 480 486 (wrap-prefix #1# line= -prefix #7#) 487 488 (erc--msg msg erc--ts 1680332400 erc--spkr "alice" erc= --cmd PRIVMSG wrap-prefix #1# line-prefix #8=3D(space :width (- 27 0)) disp= lay #9=3D"") 488 493 (wrap-prefix #1# line-prefix #8# display #9#) 493 495 = (wrap-prefix #1# line-prefix #8# display #9#) 495 499 (wrap-prefix #1# line= -prefix #8#) 500 501 (erc--msg msg erc--ts 1680332400 erc--spkr "bob" erc--= cmd PRIVMSG wrap-prefix #1# line-prefix #10=3D(space :width (- 27 (6)))) 50= 1 504 (wrap-prefix #1# line-prefix #10#) 504 512 (wrap-prefix #1# line-pref= ix #10#) 513 514 (erc--msg msg erc--ts 1680332400 erc--spkr "bob" erc--cmd = PRIVMSG wrap-prefix #1# line-prefix #11=3D(space :width (- 27 0)) display #= 9#) 514 517 (wrap-prefix #1# line-prefix #11# display #9#) 517 519 (wrap-pr= efix #1# line-prefix #11# display #9#) 519 524 (wrap-prefix #1# line-prefix= #11#) 525 526 (erc--msg msg erc--ts 1680332400 erc--spkr "Dummy" erc--cmd = PRIVMSG wrap-prefix #1# line-prefix #12=3D(space :width (- 27 (8)))) 526 53= 1 (wrap-prefix #1# line-prefix #12#) 531 538 (wrap-prefix #1# line-prefix #= 12#) 539 540 (erc--msg msg erc--ts 1680332400 erc--spkr "Dummy" erc--cmd PR= IVMSG wrap-prefix #1# line-prefix #13=3D(space :width (- 27 0)) display #9#= ) 540 545 (wrap-prefix #1# line-prefix #13# display #9#) 545 547 (wrap-pref= ix #1# line-prefix #13# display #9#) 547 551 (wrap-prefix #1# line-prefix #= 13#)) \ No newline at end of file diff --git a/test/lisp/erc/resources/fill/snapshots/merge-02-right.eld b/te= st/lisp/erc/resources/fill/snapshots/merge-02-right.eld index 78450ec08e2..e2064b914c4 100644 --- a/test/lisp/erc/resources/fill/snapshots/merge-02-right.eld +++ b/test/lisp/erc/resources/fill/snapshots/merge-02-right.eld @@ -1 +1 @@ -#("\n\n\n[Thu Jan 1 1970]\n*** This server is in debug mode and is loggin= g all user I/O. If you do not wish for everything you send to be readable b= y the server owner(s), please disconnect.[00:00]\n bob: come, you ar= e a tedious fool: to the purpose. What was done to Elbow's wife, that he ha= th cause to complain of? Come me to what was done to her.\n alice: Eit= her your unparagoned mistress is dead, or she's outprized by a trifle.\n\n[= Sat Apr 1 2023]\n zero.[07:00]\n one.\n two.\n thr= ee.\n four.\n five.\n six.\n" 2 3 (erc--msg datestamp er= c--ts 0 field erc-timestamp) 3 20 (field erc-timestamp wrap-prefix #1=3D(sp= ace :width 29) line-prefix (space :width (- 29 (18)))) 21 22 (erc--msg noti= ce erc--ts 0 wrap-prefix #1# line-prefix #2=3D(space :width (- 29 (4)))) 22= 183 (wrap-prefix #1# line-prefix #2#) 183 190 (field erc-timestamp wrap-pr= efix #1# line-prefix #2# display (#6=3D(margin right-margin) #("[00:00]" 0 = 7 (invisible timestamp)))) 191 192 (erc--msg msg erc--ts 0 erc--cmd PRIVMSG= wrap-prefix #1# line-prefix #3=3D(space :width (- 29 (8)))) 192 197 (wrap-= prefix #1# line-prefix #3#) 197 199 (wrap-prefix #1# line-prefix #3#) 199 2= 02 (wrap-prefix #1# line-prefix #3#) 202 315 (wrap-prefix #1# line-prefix #= 3#) 316 348 (wrap-prefix #1# line-prefix #3#) 349 350 (erc--msg msg erc--ts= 0 erc--cmd PRIVMSG wrap-prefix #1# line-prefix #4=3D(space :width (- 29 (6= )))) 350 353 (wrap-prefix #1# line-prefix #4#) 353 355 (wrap-prefix #1# lin= e-prefix #4#) 355 360 (wrap-prefix #1# line-prefix #4#) 360 435 (wrap-prefi= x #1# line-prefix #4#) 436 437 (erc--msg datestamp erc--ts 1680307200 field= erc-timestamp) 437 454 (field erc-timestamp wrap-prefix #1# line-prefix (s= pace :width (- 29 (18)))) 455 456 (erc--msg msg erc--ts 1680332400 erc--cmd= PRIVMSG wrap-prefix #1# line-prefix #5=3D(space :width (- 29 (6)))) 456 45= 9 (wrap-prefix #1# line-prefix #5#) 459 466 (wrap-prefix #1# line-prefix #5= #) 466 473 (field erc-timestamp wrap-prefix #1# line-prefix #5# display (#6= # #("[07:00]" 0 7 (invisible timestamp)))) 474 475 (erc--msg msg erc--ts 16= 80332400 erc--cmd PRIVMSG wrap-prefix #1# line-prefix #7=3D(space :width (-= 29 (8)))) 475 480 (wrap-prefix #1# line-prefix #7#) 480 486 (wrap-prefix #= 1# line-prefix #7#) 487 488 (erc--msg msg erc--ts 1680332400 erc--cmd PRIVM= SG wrap-prefix #1# line-prefix #8=3D(space :width (- 29 0)) display #9=3D""= ) 488 493 (wrap-prefix #1# line-prefix #8# display #9#) 493 495 (wrap-prefi= x #1# line-prefix #8# display #9#) 495 499 (wrap-prefix #1# line-prefix #8#= ) 500 501 (erc--msg msg erc--ts 1680332400 erc--cmd PRIVMSG wrap-prefix #1#= line-prefix #10=3D(space :width (- 29 (6)))) 501 504 (wrap-prefix #1# line= -prefix #10#) 504 512 (wrap-prefix #1# line-prefix #10#) 513 514 (erc--msg = msg erc--ts 1680332400 erc--cmd PRIVMSG wrap-prefix #1# line-prefix #11=3D(= space :width (- 29 0)) display #9#) 514 517 (wrap-prefix #1# line-prefix #1= 1# display #9#) 517 519 (wrap-prefix #1# line-prefix #11# display #9#) 519 = 524 (wrap-prefix #1# line-prefix #11#) 525 526 (erc--msg msg erc--ts 168033= 2400 erc--cmd PRIVMSG wrap-prefix #1# line-prefix #12=3D(space :width (- 29= (8)))) 526 531 (wrap-prefix #1# line-prefix #12#) 531 538 (wrap-prefix #1#= line-prefix #12#) 539 540 (erc--msg msg erc--ts 1680332400 erc--cmd PRIVMS= G wrap-prefix #1# line-prefix #13=3D(space :width (- 29 0)) display #9#) 54= 0 545 (wrap-prefix #1# line-prefix #13# display #9#) 545 547 (wrap-prefix #= 1# line-prefix #13# display #9#) 547 551 (wrap-prefix #1# line-prefix #13#)) +#("\n\n\n[Thu Jan 1 1970]\n*** This server is in debug mode and is loggin= g all user I/O. If you do not wish for everything you send to be readable b= y the server owner(s), please disconnect.[00:00]\n bob: come, you ar= e a tedious fool: to the purpose. What was done to Elbow's wife, that he ha= th cause to complain of? Come me to what was done to her.\n alice: Eit= her your unparagoned mistress is dead, or she's outprized by a trifle.\n\n[= Sat Apr 1 2023]\n zero.[07:00]\n one.\n two.\n thr= ee.\n four.\n five.\n six.\n" 2 3 (erc--msg datestamp er= c--ts 0 field erc-timestamp) 3 20 (wrap-prefix #1=3D(space :width 29) line-= prefix (space :width (- 29 (18))) field erc-timestamp) 21 22 (wrap-prefix #= 1# line-prefix #2=3D(space :width (- 29 (4))) erc--msg notice erc--ts 0) 22= 183 (wrap-prefix #1# line-prefix #2#) 183 190 (wrap-prefix #1# line-prefix= #2# field erc-timestamp display (#6=3D(margin right-margin) #("[00:00]" 0 = 7 (invisible timestamp)))) 191 192 (wrap-prefix #1# line-prefix #3=3D(space= :width (- 29 (8))) erc--msg msg erc--ts 0 erc--spkr "alice" erc--cmd PRIVM= SG) 192 197 (wrap-prefix #1# line-prefix #3#) 197 199 (wrap-prefix #1# line= -prefix #3#) 199 202 (wrap-prefix #1# line-prefix #3#) 202 315 (wrap-prefix= #1# line-prefix #3#) 316 348 (wrap-prefix #1# line-prefix (space :width (-= 29 (8)))) 349 350 (wrap-prefix #1# line-prefix #4=3D(space :width (- 29 (6= ))) erc--msg msg erc--ts 0 erc--spkr "bob" erc--cmd PRIVMSG) 350 353 (wrap-= prefix #1# line-prefix #4#) 353 355 (wrap-prefix #1# line-prefix #4#) 355 3= 60 (wrap-prefix #1# line-prefix #4#) 360 435 (wrap-prefix #1# line-prefix #= 4#) 436 437 (erc--msg datestamp erc--ts 1680307200 field erc-timestamp) 437= 454 (wrap-prefix #1# line-prefix (space :width (- 29 (18))) field erc-time= stamp) 455 456 (wrap-prefix #1# line-prefix #5=3D(space :width (- 29 (6))) = erc--msg msg erc--ts 1680332400 erc--spkr "bob" erc--cmd PRIVMSG) 456 459 (= wrap-prefix #1# line-prefix #5#) 459 466 (wrap-prefix #1# line-prefix #5#) = 466 473 (wrap-prefix #1# line-prefix #5# field erc-timestamp display (#6# #= ("[07:00]" 0 7 (invisible timestamp)))) 474 475 (wrap-prefix #1# line-prefi= x #7=3D(space :width (- 29 (8))) erc--msg msg erc--ts 1680332400 erc--spkr = "alice" erc--cmd PRIVMSG) 475 480 (wrap-prefix #1# line-prefix #7#) 480 486= (wrap-prefix #1# line-prefix #7#) 487 488 (wrap-prefix #1# line-prefix #8= =3D(space :width (- 29 0)) erc--msg msg erc--ts 1680332400 erc--spkr "alice= " erc--cmd PRIVMSG display #9=3D"") 488 493 (wrap-prefix #1# line-prefix #8= # display #9#) 493 495 (wrap-prefix #1# line-prefix #8# display #9#) 495 49= 9 (wrap-prefix #1# line-prefix #8#) 500 501 (wrap-prefix #1# line-prefix #1= 0=3D(space :width (- 29 (6))) erc--msg msg erc--ts 1680332400 erc--spkr "bo= b" erc--cmd PRIVMSG) 501 504 (wrap-prefix #1# line-prefix #10#) 504 512 (wr= ap-prefix #1# line-prefix #10#) 513 514 (wrap-prefix #1# line-prefix #11=3D= (space :width (- 29 0)) erc--msg msg erc--ts 1680332400 erc--spkr "bob" erc= --cmd PRIVMSG display #9#) 514 517 (wrap-prefix #1# line-prefix #11# displa= y #9#) 517 519 (wrap-prefix #1# line-prefix #11# display #9#) 519 524 (wrap= -prefix #1# line-prefix #11#) 525 526 (wrap-prefix #1# line-prefix #12=3D(s= pace :width (- 29 (8))) erc--msg msg erc--ts 1680332400 erc--spkr "Dummy" e= rc--cmd PRIVMSG) 526 531 (wrap-prefix #1# line-prefix #12#) 531 538 (wrap-p= refix #1# line-prefix #12#) 539 540 (wrap-prefix #1# line-prefix #13=3D(spa= ce :width (- 29 0)) erc--msg msg erc--ts 1680332400 erc--spkr "Dummy" erc--= cmd PRIVMSG display #9#) 540 545 (wrap-prefix #1# line-prefix #13# display = #9#) 545 547 (wrap-prefix #1# line-prefix #13# display #9#) 547 551 (wrap-p= refix #1# line-prefix #13#)) \ No newline at end of file diff --git a/test/lisp/erc/resources/fill/snapshots/merge-wrap-01.eld b/tes= t/lisp/erc/resources/fill/snapshots/merge-wrap-01.eld index 8e5535093e1..9f648915d5c 100644 --- a/test/lisp/erc/resources/fill/snapshots/merge-wrap-01.eld +++ b/test/lisp/erc/resources/fill/snapshots/merge-wrap-01.eld @@ -1 +1 @@ -#("\n\n\n[Thu Jan 1 1970]\n*** This server is in debug mode and is loggin= g all user I/O. If you do not wish for everything you send to be readable b= y the server owner(s), please disconnect.[00:00]\n bob: come, you ar= e a tedious fool: to the purpose. What was done to Elbow's wife, that he ha= th cause to complain of? Come me to what was done to her.\n alice: Eit= her your unparagoned mistress is dead, or she's outprized by a trifle.\n\n[= Sat Apr 1 2023]\n zero.[07:00]\n 0.5\n* bob one.\n two.\n 2.5\n* bob three\n four.\n" 2 3 (erc--msg datestamp erc--ts 0 fiel= d erc-timestamp) 3 20 (field erc-timestamp wrap-prefix #1=3D(space :width 2= 7) line-prefix (space :width (- 27 (18)))) 21 22 (erc--msg notice erc--ts 0= wrap-prefix #1# line-prefix #2=3D(space :width (- 27 (4)))) 22 183 (wrap-p= refix #1# line-prefix #2#) 183 190 (field erc-timestamp wrap-prefix #1# lin= e-prefix #2# display (#5=3D(margin right-margin) #("[00:00]" 0 7 (invisible= timestamp)))) 191 192 (erc--msg msg erc--ts 0 erc--cmd PRIVMSG wrap-prefix= #1# line-prefix #3=3D(space :width (- 27 (8)))) 192 197 (wrap-prefix #1# l= ine-prefix #3#) 197 199 (wrap-prefix #1# line-prefix #3#) 199 202 (wrap-pre= fix #1# line-prefix #3#) 202 315 (wrap-prefix #1# line-prefix #3#) 316 348 = (wrap-prefix #1# line-prefix #3#) 349 350 (erc--msg msg erc--ts 0 erc--cmd = PRIVMSG wrap-prefix #1# line-prefix #4=3D(space :width (- 27 (6)))) 350 353= (wrap-prefix #1# line-prefix #4#) 353 355 (wrap-prefix #1# line-prefix #4#= ) 355 360 (wrap-prefix #1# line-prefix #4#) 360 435 (wrap-prefix #1# line-p= refix #4#) 436 437 (erc--msg datestamp erc--ts 1680307200 field erc-timesta= mp) 437 454 (field erc-timestamp wrap-prefix #1# line-prefix (space :width = (- 27 (18)))) 455 456 (erc--msg msg erc--ts 1680332400 erc--cmd PRIVMSG wra= p-prefix #1# line-prefix #6=3D(space :width (- 27 (6)))) 456 459 (wrap-pref= ix #1# line-prefix #6#) 459 466 (wrap-prefix #1# line-prefix #6#) 466 473 (= field erc-timestamp wrap-prefix #1# line-prefix #6# display (#5# #("[07:00]= " 0 7 (invisible timestamp)))) 474 475 (erc--msg msg erc--ts 1680332400 erc= --cmd PRIVMSG wrap-prefix #1# line-prefix #7=3D(space :width (- 27 0)) disp= lay #8=3D"") 475 478 (wrap-prefix #1# line-prefix #7# display #8#) 478 480 = (wrap-prefix #1# line-prefix #7# display #8#) 480 483 (wrap-prefix #1# line= -prefix #7#) 484 485 (erc--msg msg erc--ts 1680332400 erc--cmd PRIVMSG erc-= -ctcp ACTION wrap-prefix #1# line-prefix #9=3D(space :width (- 27 (6)))) 48= 5 486 (wrap-prefix #1# line-prefix #9#) 486 489 (wrap-prefix #1# line-prefi= x #9#) 489 494 (wrap-prefix #1# line-prefix #9#) 495 496 (erc--msg msg erc-= -ts 1680332400 erc--cmd PRIVMSG wrap-prefix #1# line-prefix #10=3D(space :w= idth (- 27 (6)))) 496 499 (wrap-prefix #1# line-prefix #10#) 499 505 (wrap-= prefix #1# line-prefix #10#) 506 507 (erc--msg msg erc--ts 1680332400 erc--= cmd PRIVMSG wrap-prefix #1# line-prefix #11=3D(space :width (- 27 0)) displ= ay #8#) 507 510 (wrap-prefix #1# line-prefix #11# display #8#) 510 512 (wra= p-prefix #1# line-prefix #11# display #8#) 512 515 (wrap-prefix #1# line-pr= efix #11#) 516 517 (erc--msg msg erc--ts 1680332400 erc--cmd PRIVMSG erc--c= tcp ACTION wrap-prefix #1# line-prefix #12=3D(space :width (- 27 (2)))) 517= 518 (wrap-prefix #1# line-prefix #12#) 518 521 (wrap-prefix #1# line-prefi= x #12#) 521 527 (wrap-prefix #1# line-prefix #12#) 528 529 (erc--msg msg er= c--ts 1680332400 erc--cmd PRIVMSG wrap-prefix #1# line-prefix #13=3D(space = :width (- 27 (6)))) 529 532 (wrap-prefix #1# line-prefix #13#) 532 539 (wra= p-prefix #1# line-prefix #13#)) +#("\n\n\n[Thu Jan 1 1970]\n*** This server is in debug mode and is loggin= g all user I/O. If you do not wish for everything you send to be readable b= y the server owner(s), please disconnect.[00:00]\n bob: come, you ar= e a tedious fool: to the purpose. What was done to Elbow's wife, that he ha= th cause to complain of? Come me to what was done to her.\n alice: Eit= her your unparagoned mistress is dead, or she's outprized by a trifle.\n\n[= Sat Apr 1 2023]\n zero.[07:00]\n 0.5\n* bob one.\n two.\n 2.5\n* bob three\n four.\n" 2 3 (erc--msg datestamp erc--ts 0 fiel= d erc-timestamp) 3 20 (field erc-timestamp wrap-prefix #1=3D(space :width 2= 7) line-prefix (space :width (- 27 (18)))) 21 22 (erc--msg notice erc--ts 0= wrap-prefix #1# line-prefix #2=3D(space :width (- 27 (4)))) 22 183 (wrap-p= refix #1# line-prefix #2#) 183 190 (field erc-timestamp wrap-prefix #1# lin= e-prefix #2# display (#5=3D(margin right-margin) #("[00:00]" 0 7 (invisible= timestamp)))) 191 192 (erc--msg msg erc--ts 0 erc--spkr "alice" erc--cmd P= RIVMSG wrap-prefix #1# line-prefix #3=3D(space :width (- 27 (8)))) 192 197 = (wrap-prefix #1# line-prefix #3#) 197 199 (wrap-prefix #1# line-prefix #3#)= 199 202 (wrap-prefix #1# line-prefix #3#) 202 315 (wrap-prefix #1# line-pr= efix #3#) 316 348 (wrap-prefix #1# line-prefix #3#) 349 350 (erc--msg msg e= rc--ts 0 erc--spkr "bob" erc--cmd PRIVMSG wrap-prefix #1# line-prefix #4=3D= (space :width (- 27 (6)))) 350 353 (wrap-prefix #1# line-prefix #4#) 353 35= 5 (wrap-prefix #1# line-prefix #4#) 355 360 (wrap-prefix #1# line-prefix #4= #) 360 435 (wrap-prefix #1# line-prefix #4#) 436 437 (erc--msg datestamp er= c--ts 1680307200 field erc-timestamp) 437 454 (field erc-timestamp wrap-pre= fix #1# line-prefix (space :width (- 27 (18)))) 455 456 (erc--msg msg erc--= ts 1680332400 erc--spkr "bob" erc--cmd PRIVMSG wrap-prefix #1# line-prefix = #6=3D(space :width (- 27 (6)))) 456 459 (wrap-prefix #1# line-prefix #6#) 4= 59 466 (wrap-prefix #1# line-prefix #6#) 466 473 (field erc-timestamp wrap-= prefix #1# line-prefix #6# display (#5# #("[07:00]" 0 7 (invisible timestam= p)))) 474 475 (erc--msg msg erc--ts 1680332400 erc--spkr "bob" erc--cmd PRI= VMSG wrap-prefix #1# line-prefix #7=3D(space :width (- 27 0)) display #8=3D= "") 475 478 (wrap-prefix #1# line-prefix #7# display #8#) 478 480 (wrap-pre= fix #1# line-prefix #7# display #8#) 480 483 (wrap-prefix #1# line-prefix #= 7#) 484 485 (erc--msg msg erc--ts 1680332400 erc--spkr "bob" erc--cmd PRIVM= SG erc--ctcp ACTION wrap-prefix #1# line-prefix #9=3D(space :width (- 27 (6= )))) 485 486 (wrap-prefix #1# line-prefix #9#) 486 489 (wrap-prefix #1# lin= e-prefix #9#) 489 494 (wrap-prefix #1# line-prefix #9#) 495 496 (erc--msg m= sg erc--ts 1680332400 erc--spkr "bob" erc--cmd PRIVMSG wrap-prefix #1# line= -prefix #10=3D(space :width (- 27 (6)))) 496 499 (wrap-prefix #1# line-pref= ix #10#) 499 505 (wrap-prefix #1# line-prefix #10#) 506 507 (erc--msg msg e= rc--ts 1680332400 erc--spkr "bob" erc--cmd PRIVMSG wrap-prefix #1# line-pre= fix #11=3D(space :width (- 27 0)) display #8#) 507 510 (wrap-prefix #1# lin= e-prefix #11# display #8#) 510 512 (wrap-prefix #1# line-prefix #11# displa= y #8#) 512 515 (wrap-prefix #1# line-prefix #11#) 516 517 (erc--msg msg erc= --ts 1680332400 erc--spkr "bob" erc--cmd PRIVMSG erc--ctcp ACTION wrap-pref= ix #1# line-prefix #12=3D(space :width (- 27 (2)))) 517 518 (wrap-prefix #1= # line-prefix #12#) 518 521 (wrap-prefix #1# line-prefix #12#) 521 527 (wra= p-prefix #1# line-prefix #12#) 528 529 (erc--msg msg erc--ts 1680332400 erc= --spkr "bob" erc--cmd PRIVMSG wrap-prefix #1# line-prefix #13=3D(space :wid= th (- 27 (6)))) 529 532 (wrap-prefix #1# line-prefix #13#) 532 539 (wrap-pr= efix #1# line-prefix #13#)) \ No newline at end of file diff --git a/test/lisp/erc/resources/fill/snapshots/merge-wrap-indicator-po= st-01.eld b/test/lisp/erc/resources/fill/snapshots/merge-wrap-indicator-pos= t-01.eld index a0c03244afe..a63fcad3d38 100644 --- a/test/lisp/erc/resources/fill/snapshots/merge-wrap-indicator-post-01.e= ld +++ b/test/lisp/erc/resources/fill/snapshots/merge-wrap-indicator-post-01.e= ld @@ -1 +1 @@ -#("\n\n\n[Thu Jan 1 1970]\n*** This server is in debug mode and is loggin= g all user I/O. If you do not wish for everything you send to be readable b= y the server owner(s), please disconnect.[00:00]\n bob: come, you ar= e a tedious fool: to the purpose. What was done to Elbow's wife, that he ha= th cause to complain of? Come me to what was done to her.\n alice: Eit= her your unparagoned mistress is dead, or she's outprized by a trifle.\n\n[= Sat Apr 1 2023]\n zero.[07:00]\n 0.5\n* bob one.\n two.\n 2.5\n* bob three\n four.\n" 2 3 (erc--msg datestamp erc--ts 0 fiel= d erc-timestamp) 3 20 (field erc-timestamp wrap-prefix #1=3D(space :width 2= 7) line-prefix (space :width (- 27 (18)))) 21 22 (erc--msg notice erc--ts 0= wrap-prefix #1# line-prefix #2=3D(space :width (- 27 (4)))) 22 183 (wrap-p= refix #1# line-prefix #2#) 183 190 (field erc-timestamp wrap-prefix #1# lin= e-prefix #2# display (#5=3D(margin right-margin) #("[00:00]" 0 7 (invisible= timestamp)))) 191 192 (erc--msg msg erc--ts 0 erc--cmd PRIVMSG wrap-prefix= #1# line-prefix #3=3D(space :width (- 27 (8)))) 192 197 (wrap-prefix #1# l= ine-prefix #3#) 197 199 (wrap-prefix #1# line-prefix #3#) 199 202 (wrap-pre= fix #1# line-prefix #3#) 202 315 (wrap-prefix #1# line-prefix #3#) 316 348 = (wrap-prefix #1# line-prefix #3#) 349 350 (erc--msg msg erc--ts 0 erc--cmd = PRIVMSG wrap-prefix #1# line-prefix #4=3D(space :width (- 27 (6)))) 350 353= (wrap-prefix #1# line-prefix #4#) 353 355 (wrap-prefix #1# line-prefix #4#= ) 355 360 (wrap-prefix #1# line-prefix #4#) 360 435 (wrap-prefix #1# line-p= refix #4#) 436 437 (erc--msg datestamp erc--ts 1680307200 field erc-timesta= mp) 437 454 (field erc-timestamp wrap-prefix #1# line-prefix (space :width = (- 27 (18)))) 455 456 (erc--msg msg erc--ts 1680332400 erc--cmd PRIVMSG wra= p-prefix #1# line-prefix #6=3D(space :width (- 27 (6)))) 456 459 (wrap-pref= ix #1# line-prefix #6#) 459 466 (wrap-prefix #1# line-prefix #6#) 466 473 (= field erc-timestamp wrap-prefix #1# line-prefix #6# display (#5# #("[07:00]= " 0 7 (invisible timestamp)))) 474 475 (erc--msg msg erc--ts 1680332400 erc= --cmd PRIVMSG wrap-prefix #1# line-prefix #7=3D(space :width (- 27 0)) disp= lay #8=3D"") 475 478 (wrap-prefix #1# line-prefix #7# display #8#) 478 480 = (wrap-prefix #1# line-prefix #7# display #8#) 480 483 (wrap-prefix #1# line= -prefix #7#) 484 485 (erc--msg msg erc--ts 1680332400 erc--cmd PRIVMSG erc-= -ctcp ACTION wrap-prefix #1# line-prefix #9=3D(space :width (- 27 (6)))) 48= 5 486 (wrap-prefix #1# line-prefix #9#) 486 489 (wrap-prefix #1# line-prefi= x #9#) 489 494 (wrap-prefix #1# line-prefix #9#) 495 496 (erc--msg msg erc-= -ts 1680332400 erc--cmd PRIVMSG wrap-prefix #1# line-prefix #10=3D(space :w= idth (- 27 (6)))) 496 499 (wrap-prefix #1# line-prefix #10#) 499 505 (wrap-= prefix #1# line-prefix #10#) 505 506 (display #("~\n" 0 2 (font-lock-face s= hadow))) 506 507 (erc--msg msg erc--ts 1680332400 erc--cmd PRIVMSG wrap-pre= fix #1# line-prefix #11=3D(space :width (- 27 0)) display #8#) 507 510 (wra= p-prefix #1# line-prefix #11# display #8#) 510 512 (wrap-prefix #1# line-pr= efix #11# display #8#) 512 515 (wrap-prefix #1# line-prefix #11#) 516 517 (= erc--msg msg erc--ts 1680332400 erc--cmd PRIVMSG erc--ctcp ACTION wrap-pref= ix #1# line-prefix #12=3D(space :width (- 27 (2)))) 517 518 (wrap-prefix #1= # line-prefix #12#) 518 521 (wrap-prefix #1# line-prefix #12#) 521 527 (wra= p-prefix #1# line-prefix #12#) 528 529 (erc--msg msg erc--ts 1680332400 erc= --cmd PRIVMSG wrap-prefix #1# line-prefix #13=3D(space :width (- 27 (6)))) = 529 532 (wrap-prefix #1# line-prefix #13#) 532 539 (wrap-prefix #1# line-pr= efix #13#)) \ No newline at end of file +#("\n\n\n[Thu Jan 1 1970]\n*** This server is in debug mode and is loggin= g all user I/O. If you do not wish for everything you send to be readable b= y the server owner(s), please disconnect.[00:00]\n bob: come, you ar= e a tedious fool: to the purpose. What was done to Elbow's wife, that he ha= th cause to complain of? Come me to what was done to her.\n alice: Eit= her your unparagoned mistress is dead, or she's outprized by a trifle.\n\n[= Sat Apr 1 2023]\n zero.[07:00]\n 0.5\n* bob one.\n two.\n 2.5\n* bob three\n four.\n" 2 3 (erc--msg datestamp erc--ts 0 fiel= d erc-timestamp) 3 20 (field erc-timestamp wrap-prefix #1=3D(space :width 2= 7) line-prefix (space :width (- 27 (18)))) 21 22 (erc--msg notice erc--ts 0= wrap-prefix #1# line-prefix #2=3D(space :width (- 27 (4)))) 22 183 (wrap-p= refix #1# line-prefix #2#) 183 190 (field erc-timestamp wrap-prefix #1# lin= e-prefix #2# display (#5=3D(margin right-margin) #("[00:00]" 0 7 (invisible= timestamp)))) 191 192 (erc--msg msg erc--ts 0 erc--spkr "alice" erc--cmd P= RIVMSG wrap-prefix #1# line-prefix #3=3D(space :width (- 27 (8)))) 192 197 = (wrap-prefix #1# line-prefix #3#) 197 199 (wrap-prefix #1# line-prefix #3#)= 199 202 (wrap-prefix #1# line-prefix #3#) 202 315 (wrap-prefix #1# line-pr= efix #3#) 316 348 (wrap-prefix #1# line-prefix #3#) 349 350 (erc--msg msg e= rc--ts 0 erc--spkr "bob" erc--cmd PRIVMSG wrap-prefix #1# line-prefix #4=3D= (space :width (- 27 (6)))) 350 353 (wrap-prefix #1# line-prefix #4#) 353 35= 5 (wrap-prefix #1# line-prefix #4#) 355 360 (wrap-prefix #1# line-prefix #4= #) 360 435 (wrap-prefix #1# line-prefix #4#) 436 437 (erc--msg datestamp er= c--ts 1680307200 field erc-timestamp) 437 454 (field erc-timestamp wrap-pre= fix #1# line-prefix (space :width (- 27 (18)))) 455 456 (erc--msg msg erc--= ts 1680332400 erc--spkr "bob" erc--cmd PRIVMSG wrap-prefix #1# line-prefix = #6=3D(space :width (- 27 (6)))) 456 459 (wrap-prefix #1# line-prefix #6#) 4= 59 466 (wrap-prefix #1# line-prefix #6#) 466 473 (field erc-timestamp wrap-= prefix #1# line-prefix #6# display (#5# #("[07:00]" 0 7 (invisible timestam= p)))) 474 475 (erc--msg msg erc--ts 1680332400 erc--spkr "bob" erc--cmd PRI= VMSG wrap-prefix #1# line-prefix #7=3D(space :width (- 27 0)) display #8=3D= "") 475 478 (wrap-prefix #1# line-prefix #7# display #8#) 478 480 (wrap-pre= fix #1# line-prefix #7# display #8#) 480 483 (wrap-prefix #1# line-prefix #= 7#) 484 485 (erc--msg msg erc--ts 1680332400 erc--spkr "bob" erc--cmd PRIVM= SG erc--ctcp ACTION wrap-prefix #1# line-prefix #9=3D(space :width (- 27 (6= )))) 485 486 (wrap-prefix #1# line-prefix #9#) 486 489 (wrap-prefix #1# lin= e-prefix #9#) 489 494 (wrap-prefix #1# line-prefix #9#) 495 496 (erc--msg m= sg erc--ts 1680332400 erc--spkr "bob" erc--cmd PRIVMSG wrap-prefix #1# line= -prefix #10=3D(space :width (- 27 (6)))) 496 499 (wrap-prefix #1# line-pref= ix #10#) 499 505 (wrap-prefix #1# line-prefix #10#) 505 506 (display #("~\n= " 0 2 (font-lock-face shadow))) 506 507 (erc--msg msg erc--ts 1680332400 er= c--spkr "bob" erc--cmd PRIVMSG wrap-prefix #1# line-prefix #11=3D(space :wi= dth (- 27 0)) display #8#) 507 510 (wrap-prefix #1# line-prefix #11# displa= y #8#) 510 512 (wrap-prefix #1# line-prefix #11# display #8#) 512 515 (wrap= -prefix #1# line-prefix #11#) 516 517 (erc--msg msg erc--ts 1680332400 erc-= -spkr "bob" erc--cmd PRIVMSG erc--ctcp ACTION wrap-prefix #1# line-prefix #= 12=3D(space :width (- 27 (2)))) 517 518 (wrap-prefix #1# line-prefix #12#) = 518 521 (wrap-prefix #1# line-prefix #12#) 521 527 (wrap-prefix #1# line-pr= efix #12#) 528 529 (erc--msg msg erc--ts 1680332400 erc--spkr "bob" erc--cm= d PRIVMSG wrap-prefix #1# line-prefix #13=3D(space :width (- 27 (6)))) 529 = 532 (wrap-prefix #1# line-prefix #13#) 532 539 (wrap-prefix #1# line-prefix= #13#)) \ No newline at end of file diff --git a/test/lisp/erc/resources/fill/snapshots/merge-wrap-indicator-pr= e-01.eld b/test/lisp/erc/resources/fill/snapshots/merge-wrap-indicator-pre-= 01.eld index c4a51e06354..7cbabfd0581 100644 --- a/test/lisp/erc/resources/fill/snapshots/merge-wrap-indicator-pre-01.eld +++ b/test/lisp/erc/resources/fill/snapshots/merge-wrap-indicator-pre-01.eld @@ -1 +1 @@ -#("\n\n\n[Thu Jan 1 1970]\n*** This server is in debug mode and is loggin= g all user I/O. If you do not wish for everything you send to be readable b= y the server owner(s), please disconnect.[00:00]\n bob: come, you ar= e a tedious fool: to the purpose. What was done to Elbow's wife, that he ha= th cause to complain of? Come me to what was done to her.\n alice: Eit= her your unparagoned mistress is dead, or she's outprized by a trifle.\n\n[= Sat Apr 1 2023]\n zero.[07:00]\n 0.5\n* bob one.\n two.\n 2.5\n* bob three\n four.\n" 2 3 (erc--msg datestamp erc--ts 0 fiel= d erc-timestamp) 3 20 (field erc-timestamp wrap-prefix #1=3D(space :width 2= 7) line-prefix (space :width (- 27 (18)))) 21 22 (erc--msg notice erc--ts 0= wrap-prefix #1# line-prefix #2=3D(space :width (- 27 (4)))) 22 183 (wrap-p= refix #1# line-prefix #2#) 183 190 (field erc-timestamp wrap-prefix #1# lin= e-prefix #2# display (#5=3D(margin right-margin) #("[00:00]" 0 7 (invisible= timestamp)))) 191 192 (erc--msg msg erc--ts 0 erc--cmd PRIVMSG wrap-prefix= #1# line-prefix #3=3D(space :width (- 27 (8)))) 192 197 (wrap-prefix #1# l= ine-prefix #3#) 197 199 (wrap-prefix #1# line-prefix #3#) 199 202 (wrap-pre= fix #1# line-prefix #3#) 202 315 (wrap-prefix #1# line-prefix #3#) 316 348 = (wrap-prefix #1# line-prefix #3#) 349 350 (erc--msg msg erc--ts 0 erc--cmd = PRIVMSG wrap-prefix #1# line-prefix #4=3D(space :width (- 27 (6)))) 350 353= (wrap-prefix #1# line-prefix #4#) 353 355 (wrap-prefix #1# line-prefix #4#= ) 355 360 (wrap-prefix #1# line-prefix #4#) 360 435 (wrap-prefix #1# line-p= refix #4#) 436 437 (erc--msg datestamp erc--ts 1680307200 field erc-timesta= mp) 437 454 (field erc-timestamp wrap-prefix #1# line-prefix (space :width = (- 27 (18)))) 455 456 (erc--msg msg erc--ts 1680332400 erc--cmd PRIVMSG wra= p-prefix #1# line-prefix #6=3D(space :width (- 27 (6)))) 456 459 (wrap-pref= ix #1# line-prefix #6#) 459 466 (wrap-prefix #1# line-prefix #6#) 466 473 (= field erc-timestamp wrap-prefix #1# line-prefix #6# display (#5# #("[07:00]= " 0 7 (invisible timestamp)))) 474 475 (erc--msg msg erc--ts 1680332400 erc= --cmd PRIVMSG wrap-prefix #1# line-prefix #7=3D(space :width (- 27 #10=3D(2= ))) display #8=3D#("> " 0 1 (font-lock-face shadow))) 475 478 (wrap-prefix = #1# line-prefix #7# display #8#) 478 480 (wrap-prefix #1# line-prefix #7# d= isplay #8#) 480 483 (wrap-prefix #1# line-prefix #7#) 484 485 (erc--msg msg= erc--ts 1680332400 erc--cmd PRIVMSG erc--ctcp ACTION wrap-prefix #1# line-= prefix #9=3D(space :width (- 27 (6)))) 485 486 (wrap-prefix #1# line-prefix= #9#) 486 489 (wrap-prefix #1# line-prefix #9#) 489 494 (wrap-prefix #1# li= ne-prefix #9#) 495 496 (erc--msg msg erc--ts 1680332400 erc--cmd PRIVMSG wr= ap-prefix #1# line-prefix #11=3D(space :width (- 27 (6)))) 496 499 (wrap-pr= efix #1# line-prefix #11#) 499 505 (wrap-prefix #1# line-prefix #11#) 506 5= 07 (erc--msg msg erc--ts 1680332400 erc--cmd PRIVMSG wrap-prefix #1# line-p= refix #12=3D(space :width (- 27 #10#)) display #8#) 507 510 (wrap-prefix #1= # line-prefix #12# display #8#) 510 512 (wrap-prefix #1# line-prefix #12# d= isplay #8#) 512 515 (wrap-prefix #1# line-prefix #12#) 516 517 (erc--msg ms= g erc--ts 1680332400 erc--cmd PRIVMSG erc--ctcp ACTION wrap-prefix #1# line= -prefix #13=3D(space :width (- 27 (2)))) 517 518 (wrap-prefix #1# line-pref= ix #13#) 518 521 (wrap-prefix #1# line-prefix #13#) 521 527 (wrap-prefix #1= # line-prefix #13#) 528 529 (erc--msg msg erc--ts 1680332400 erc--cmd PRIVM= SG wrap-prefix #1# line-prefix #14=3D(space :width (- 27 (6)))) 529 532 (wr= ap-prefix #1# line-prefix #14#) 532 539 (wrap-prefix #1# line-prefix #14#)) \ No newline at end of file +#("\n\n\n[Thu Jan 1 1970]\n*** This server is in debug mode and is loggin= g all user I/O. If you do not wish for everything you send to be readable b= y the server owner(s), please disconnect.[00:00]\n bob: come, you ar= e a tedious fool: to the purpose. What was done to Elbow's wife, that he ha= th cause to complain of? Come me to what was done to her.\n alice: Eit= her your unparagoned mistress is dead, or she's outprized by a trifle.\n\n[= Sat Apr 1 2023]\n zero.[07:00]\n 0.5\n* bob one.\n two.\n 2.5\n* bob three\n four.\n" 2 3 (erc--msg datestamp erc--ts 0 fiel= d erc-timestamp) 3 20 (field erc-timestamp wrap-prefix #1=3D(space :width 2= 7) line-prefix (space :width (- 27 (18)))) 21 22 (erc--msg notice erc--ts 0= wrap-prefix #1# line-prefix #2=3D(space :width (- 27 (4)))) 22 183 (wrap-p= refix #1# line-prefix #2#) 183 190 (field erc-timestamp wrap-prefix #1# lin= e-prefix #2# display (#5=3D(margin right-margin) #("[00:00]" 0 7 (invisible= timestamp)))) 191 192 (erc--msg msg erc--ts 0 erc--spkr "alice" erc--cmd P= RIVMSG wrap-prefix #1# line-prefix #3=3D(space :width (- 27 (8)))) 192 197 = (wrap-prefix #1# line-prefix #3#) 197 199 (wrap-prefix #1# line-prefix #3#)= 199 202 (wrap-prefix #1# line-prefix #3#) 202 315 (wrap-prefix #1# line-pr= efix #3#) 316 348 (wrap-prefix #1# line-prefix #3#) 349 350 (erc--msg msg e= rc--ts 0 erc--spkr "bob" erc--cmd PRIVMSG wrap-prefix #1# line-prefix #4=3D= (space :width (- 27 (6)))) 350 353 (wrap-prefix #1# line-prefix #4#) 353 35= 5 (wrap-prefix #1# line-prefix #4#) 355 360 (wrap-prefix #1# line-prefix #4= #) 360 435 (wrap-prefix #1# line-prefix #4#) 436 437 (erc--msg datestamp er= c--ts 1680307200 field erc-timestamp) 437 454 (field erc-timestamp wrap-pre= fix #1# line-prefix (space :width (- 27 (18)))) 455 456 (erc--msg msg erc--= ts 1680332400 erc--spkr "bob" erc--cmd PRIVMSG wrap-prefix #1# line-prefix = #6=3D(space :width (- 27 (6)))) 456 459 (wrap-prefix #1# line-prefix #6#) 4= 59 466 (wrap-prefix #1# line-prefix #6#) 466 473 (field erc-timestamp wrap-= prefix #1# line-prefix #6# display (#5# #("[07:00]" 0 7 (invisible timestam= p)))) 474 475 (erc--msg msg erc--ts 1680332400 erc--spkr "bob" erc--cmd PRI= VMSG wrap-prefix #1# line-prefix #7=3D(space :width (- 27 #10=3D(2))) displ= ay #8=3D#("> " 0 1 (font-lock-face shadow))) 475 478 (wrap-prefix #1# line-= prefix #7# display #8#) 478 480 (wrap-prefix #1# line-prefix #7# display #8= #) 480 483 (wrap-prefix #1# line-prefix #7#) 484 485 (erc--msg msg erc--ts = 1680332400 erc--spkr "bob" erc--cmd PRIVMSG erc--ctcp ACTION wrap-prefix #1= # line-prefix #9=3D(space :width (- 27 (6)))) 485 486 (wrap-prefix #1# line= -prefix #9#) 486 489 (wrap-prefix #1# line-prefix #9#) 489 494 (wrap-prefix= #1# line-prefix #9#) 495 496 (erc--msg msg erc--ts 1680332400 erc--spkr "b= ob" erc--cmd PRIVMSG wrap-prefix #1# line-prefix #11=3D(space :width (- 27 = (6)))) 496 499 (wrap-prefix #1# line-prefix #11#) 499 505 (wrap-prefix #1# = line-prefix #11#) 506 507 (erc--msg msg erc--ts 1680332400 erc--spkr "bob" = erc--cmd PRIVMSG wrap-prefix #1# line-prefix #12=3D(space :width (- 27 #10#= )) display #8#) 507 510 (wrap-prefix #1# line-prefix #12# display #8#) 510 = 512 (wrap-prefix #1# line-prefix #12# display #8#) 512 515 (wrap-prefix #1#= line-prefix #12#) 516 517 (erc--msg msg erc--ts 1680332400 erc--spkr "bob"= erc--cmd PRIVMSG erc--ctcp ACTION wrap-prefix #1# line-prefix #13=3D(space= :width (- 27 (2)))) 517 518 (wrap-prefix #1# line-prefix #13#) 518 521 (wr= ap-prefix #1# line-prefix #13#) 521 527 (wrap-prefix #1# line-prefix #13#) = 528 529 (erc--msg msg erc--ts 1680332400 erc--spkr "bob" erc--cmd PRIVMSG w= rap-prefix #1# line-prefix #14=3D(space :width (- 27 (6)))) 529 532 (wrap-p= refix #1# line-prefix #14#) 532 539 (wrap-prefix #1# line-prefix #14#)) \ No newline at end of file diff --git a/test/lisp/erc/resources/fill/snapshots/monospace-01-start.eld = b/test/lisp/erc/resources/fill/snapshots/monospace-01-start.eld index 5eea73b4f16..c94629cf357 100644 --- a/test/lisp/erc/resources/fill/snapshots/monospace-01-start.eld +++ b/test/lisp/erc/resources/fill/snapshots/monospace-01-start.eld @@ -1 +1 @@ -#("\n\n\n[Thu Jan 1 1970]\n*** This server is in debug mode and is loggin= g all user I/O. If you do not wish for everything you send to be readable b= y the server owner(s), please disconnect.[00:00]\n bob: come, you ar= e a tedious fool: to the purpose. What was done to Elbow's wife, that he ha= th cause to complain of? Come me to what was done to her.\n alice: Eit= her your unparagoned mistress is dead, or she's outprized by a trifle.\n" 2= 3 (erc--msg datestamp erc--ts 0 field erc-timestamp) 3 20 (field erc-times= tamp wrap-prefix #1=3D(space :width 27) line-prefix (space :width (- 27 (18= )))) 21 22 (erc--msg notice erc--ts 0 wrap-prefix #1# line-prefix #2=3D(spa= ce :width (- 27 (4)))) 22 183 (wrap-prefix #1# line-prefix #2#) 183 190 (fi= eld erc-timestamp wrap-prefix #1# line-prefix #2# display ((margin right-ma= rgin) #("[00:00]" 0 7 (invisible timestamp)))) 191 192 (erc--msg msg erc--t= s 0 erc--cmd PRIVMSG wrap-prefix #1# line-prefix #3=3D(space :width (- 27 (= 8)))) 192 197 (wrap-prefix #1# line-prefix #3#) 197 199 (wrap-prefix #1# li= ne-prefix #3#) 199 202 (wrap-prefix #1# line-prefix #3#) 202 315 (wrap-pref= ix #1# line-prefix #3#) 316 348 (wrap-prefix #1# line-prefix #3#) 349 350 (= erc--msg msg erc--ts 0 erc--cmd PRIVMSG wrap-prefix #1# line-prefix #4=3D(s= pace :width (- 27 (6)))) 350 353 (wrap-prefix #1# line-prefix #4#) 353 355 = (wrap-prefix #1# line-prefix #4#) 355 360 (wrap-prefix #1# line-prefix #4#)= 360 435 (wrap-prefix #1# line-prefix #4#)) +#("\n\n\n[Thu Jan 1 1970]\n*** This server is in debug mode and is loggin= g all user I/O. If you do not wish for everything you send to be readable b= y the server owner(s), please disconnect.[00:00]\n bob: come, you ar= e a tedious fool: to the purpose. What was done to Elbow's wife, that he ha= th cause to complain of? Come me to what was done to her.\n alice: Eit= her your unparagoned mistress is dead, or she's outprized by a trifle.\n" 2= 3 (erc--msg datestamp erc--ts 0 field erc-timestamp) 3 20 (field erc-times= tamp wrap-prefix #1=3D(space :width 27) line-prefix (space :width (- 27 (18= )))) 21 22 (erc--msg notice erc--ts 0 wrap-prefix #1# line-prefix #2=3D(spa= ce :width (- 27 (4)))) 22 183 (wrap-prefix #1# line-prefix #2#) 183 190 (fi= eld erc-timestamp wrap-prefix #1# line-prefix #2# display ((margin right-ma= rgin) #("[00:00]" 0 7 (invisible timestamp)))) 191 192 (erc--msg msg erc--t= s 0 erc--spkr "alice" erc--cmd PRIVMSG wrap-prefix #1# line-prefix #3=3D(sp= ace :width (- 27 (8)))) 192 197 (wrap-prefix #1# line-prefix #3#) 197 199 (= wrap-prefix #1# line-prefix #3#) 199 202 (wrap-prefix #1# line-prefix #3#) = 202 315 (wrap-prefix #1# line-prefix #3#) 316 348 (wrap-prefix #1# line-pre= fix #3#) 349 350 (erc--msg msg erc--ts 0 erc--spkr "bob" erc--cmd PRIVMSG w= rap-prefix #1# line-prefix #4=3D(space :width (- 27 (6)))) 350 353 (wrap-pr= efix #1# line-prefix #4#) 353 355 (wrap-prefix #1# line-prefix #4#) 355 360= (wrap-prefix #1# line-prefix #4#) 360 435 (wrap-prefix #1# line-prefix #4#= )) \ No newline at end of file diff --git a/test/lisp/erc/resources/fill/snapshots/monospace-02-right.eld = b/test/lisp/erc/resources/fill/snapshots/monospace-02-right.eld index bc59c0bef22..127c0b29bc9 100644 --- a/test/lisp/erc/resources/fill/snapshots/monospace-02-right.eld +++ b/test/lisp/erc/resources/fill/snapshots/monospace-02-right.eld @@ -1 +1 @@ -#("\n\n\n[Thu Jan 1 1970]\n*** This server is in debug mode and is loggin= g all user I/O. If you do not wish for everything you send to be readable b= y the server owner(s), please disconnect.[00:00]\n bob: come, you ar= e a tedious fool: to the purpose. What was done to Elbow's wife, that he ha= th cause to complain of? Come me to what was done to her.\n alice: Eit= her your unparagoned mistress is dead, or she's outprized by a trifle.\n" 2= 3 (erc--msg datestamp erc--ts 0 field erc-timestamp) 3 20 (field erc-times= tamp wrap-prefix #1=3D(space :width 29) line-prefix (space :width (- 29 (18= )))) 21 22 (erc--msg notice erc--ts 0 wrap-prefix #1# line-prefix #2=3D(spa= ce :width (- 29 (4)))) 22 183 (wrap-prefix #1# line-prefix #2#) 183 190 (fi= eld erc-timestamp wrap-prefix #1# line-prefix #2# display ((margin right-ma= rgin) #("[00:00]" 0 7 (invisible timestamp)))) 191 192 (erc--msg msg erc--t= s 0 erc--cmd PRIVMSG wrap-prefix #1# line-prefix #3=3D(space :width (- 29 (= 8)))) 192 197 (wrap-prefix #1# line-prefix #3#) 197 199 (wrap-prefix #1# li= ne-prefix #3#) 199 202 (wrap-prefix #1# line-prefix #3#) 202 315 (wrap-pref= ix #1# line-prefix #3#) 316 348 (wrap-prefix #1# line-prefix #3#) 349 350 (= erc--msg msg erc--ts 0 erc--cmd PRIVMSG wrap-prefix #1# line-prefix #4=3D(s= pace :width (- 29 (6)))) 350 353 (wrap-prefix #1# line-prefix #4#) 353 355 = (wrap-prefix #1# line-prefix #4#) 355 360 (wrap-prefix #1# line-prefix #4#)= 360 435 (wrap-prefix #1# line-prefix #4#)) +#("\n\n\n[Thu Jan 1 1970]\n*** This server is in debug mode and is loggin= g all user I/O. If you do not wish for everything you send to be readable b= y the server owner(s), please disconnect.[00:00]\n bob: come, you ar= e a tedious fool: to the purpose. What was done to Elbow's wife, that he ha= th cause to complain of? Come me to what was done to her.\n alice: Eit= her your unparagoned mistress is dead, or she's outprized by a trifle.\n" 2= 3 (erc--msg datestamp erc--ts 0 field erc-timestamp) 3 20 (field erc-times= tamp wrap-prefix #1=3D(space :width 29) line-prefix (space :width (- 29 (18= )))) 21 22 (erc--msg notice erc--ts 0 wrap-prefix #1# line-prefix #2=3D(spa= ce :width (- 29 (4)))) 22 183 (wrap-prefix #1# line-prefix #2#) 183 190 (fi= eld erc-timestamp wrap-prefix #1# line-prefix #2# display ((margin right-ma= rgin) #("[00:00]" 0 7 (invisible timestamp)))) 191 192 (erc--msg msg erc--t= s 0 erc--spkr "alice" erc--cmd PRIVMSG wrap-prefix #1# line-prefix #3=3D(sp= ace :width (- 29 (8)))) 192 197 (wrap-prefix #1# line-prefix #3#) 197 199 (= wrap-prefix #1# line-prefix #3#) 199 202 (wrap-prefix #1# line-prefix #3#) = 202 315 (wrap-prefix #1# line-prefix #3#) 316 348 (wrap-prefix #1# line-pre= fix #3#) 349 350 (erc--msg msg erc--ts 0 erc--spkr "bob" erc--cmd PRIVMSG w= rap-prefix #1# line-prefix #4=3D(space :width (- 29 (6)))) 350 353 (wrap-pr= efix #1# line-prefix #4#) 353 355 (wrap-prefix #1# line-prefix #4#) 355 360= (wrap-prefix #1# line-prefix #4#) 360 435 (wrap-prefix #1# line-prefix #4#= )) \ No newline at end of file diff --git a/test/lisp/erc/resources/fill/snapshots/monospace-03-left.eld b= /test/lisp/erc/resources/fill/snapshots/monospace-03-left.eld index bfb75c0838e..a9f3f1d1904 100644 --- a/test/lisp/erc/resources/fill/snapshots/monospace-03-left.eld +++ b/test/lisp/erc/resources/fill/snapshots/monospace-03-left.eld @@ -1 +1 @@ -#("\n\n\n[Thu Jan 1 1970]\n*** This server is in debug mode and is loggin= g all user I/O. If you do not wish for everything you send to be readable b= y the server owner(s), please disconnect.[00:00]\n bob: come, you ar= e a tedious fool: to the purpose. What was done to Elbow's wife, that he ha= th cause to complain of? Come me to what was done to her.\n alice: Eit= her your unparagoned mistress is dead, or she's outprized by a trifle.\n" 2= 3 (erc--msg datestamp erc--ts 0 field erc-timestamp) 3 20 (field erc-times= tamp wrap-prefix #1=3D(space :width 25) line-prefix (space :width (- 25 (18= )))) 21 22 (erc--msg notice erc--ts 0 wrap-prefix #1# line-prefix #2=3D(spa= ce :width (- 25 (4)))) 22 183 (wrap-prefix #1# line-prefix #2#) 183 190 (fi= eld erc-timestamp wrap-prefix #1# line-prefix #2# display ((margin right-ma= rgin) #("[00:00]" 0 7 (invisible timestamp)))) 191 192 (erc--msg msg erc--t= s 0 erc--cmd PRIVMSG wrap-prefix #1# line-prefix #3=3D(space :width (- 25 (= 8)))) 192 197 (wrap-prefix #1# line-prefix #3#) 197 199 (wrap-prefix #1# li= ne-prefix #3#) 199 202 (wrap-prefix #1# line-prefix #3#) 202 315 (wrap-pref= ix #1# line-prefix #3#) 316 348 (wrap-prefix #1# line-prefix #3#) 349 350 (= erc--msg msg erc--ts 0 erc--cmd PRIVMSG wrap-prefix #1# line-prefix #4=3D(s= pace :width (- 25 (6)))) 350 353 (wrap-prefix #1# line-prefix #4#) 353 355 = (wrap-prefix #1# line-prefix #4#) 355 360 (wrap-prefix #1# line-prefix #4#)= 360 435 (wrap-prefix #1# line-prefix #4#)) +#("\n\n\n[Thu Jan 1 1970]\n*** This server is in debug mode and is loggin= g all user I/O. If you do not wish for everything you send to be readable b= y the server owner(s), please disconnect.[00:00]\n bob: come, you ar= e a tedious fool: to the purpose. What was done to Elbow's wife, that he ha= th cause to complain of? Come me to what was done to her.\n alice: Eit= her your unparagoned mistress is dead, or she's outprized by a trifle.\n" 2= 3 (erc--msg datestamp erc--ts 0 field erc-timestamp) 3 20 (field erc-times= tamp wrap-prefix #1=3D(space :width 25) line-prefix (space :width (- 25 (18= )))) 21 22 (erc--msg notice erc--ts 0 wrap-prefix #1# line-prefix #2=3D(spa= ce :width (- 25 (4)))) 22 183 (wrap-prefix #1# line-prefix #2#) 183 190 (fi= eld erc-timestamp wrap-prefix #1# line-prefix #2# display ((margin right-ma= rgin) #("[00:00]" 0 7 (invisible timestamp)))) 191 192 (erc--msg msg erc--t= s 0 erc--spkr "alice" erc--cmd PRIVMSG wrap-prefix #1# line-prefix #3=3D(sp= ace :width (- 25 (8)))) 192 197 (wrap-prefix #1# line-prefix #3#) 197 199 (= wrap-prefix #1# line-prefix #3#) 199 202 (wrap-prefix #1# line-prefix #3#) = 202 315 (wrap-prefix #1# line-prefix #3#) 316 348 (wrap-prefix #1# line-pre= fix #3#) 349 350 (erc--msg msg erc--ts 0 erc--spkr "bob" erc--cmd PRIVMSG w= rap-prefix #1# line-prefix #4=3D(space :width (- 25 (6)))) 350 353 (wrap-pr= efix #1# line-prefix #4#) 353 355 (wrap-prefix #1# line-prefix #4#) 355 360= (wrap-prefix #1# line-prefix #4#) 360 435 (wrap-prefix #1# line-prefix #4#= )) \ No newline at end of file diff --git a/test/lisp/erc/resources/fill/snapshots/monospace-04-reset.eld = b/test/lisp/erc/resources/fill/snapshots/monospace-04-reset.eld index 5eea73b4f16..c94629cf357 100644 --- a/test/lisp/erc/resources/fill/snapshots/monospace-04-reset.eld +++ b/test/lisp/erc/resources/fill/snapshots/monospace-04-reset.eld @@ -1 +1 @@ -#("\n\n\n[Thu Jan 1 1970]\n*** This server is in debug mode and is loggin= g all user I/O. If you do not wish for everything you send to be readable b= y the server owner(s), please disconnect.[00:00]\n bob: come, you ar= e a tedious fool: to the purpose. What was done to Elbow's wife, that he ha= th cause to complain of? Come me to what was done to her.\n alice: Eit= her your unparagoned mistress is dead, or she's outprized by a trifle.\n" 2= 3 (erc--msg datestamp erc--ts 0 field erc-timestamp) 3 20 (field erc-times= tamp wrap-prefix #1=3D(space :width 27) line-prefix (space :width (- 27 (18= )))) 21 22 (erc--msg notice erc--ts 0 wrap-prefix #1# line-prefix #2=3D(spa= ce :width (- 27 (4)))) 22 183 (wrap-prefix #1# line-prefix #2#) 183 190 (fi= eld erc-timestamp wrap-prefix #1# line-prefix #2# display ((margin right-ma= rgin) #("[00:00]" 0 7 (invisible timestamp)))) 191 192 (erc--msg msg erc--t= s 0 erc--cmd PRIVMSG wrap-prefix #1# line-prefix #3=3D(space :width (- 27 (= 8)))) 192 197 (wrap-prefix #1# line-prefix #3#) 197 199 (wrap-prefix #1# li= ne-prefix #3#) 199 202 (wrap-prefix #1# line-prefix #3#) 202 315 (wrap-pref= ix #1# line-prefix #3#) 316 348 (wrap-prefix #1# line-prefix #3#) 349 350 (= erc--msg msg erc--ts 0 erc--cmd PRIVMSG wrap-prefix #1# line-prefix #4=3D(s= pace :width (- 27 (6)))) 350 353 (wrap-prefix #1# line-prefix #4#) 353 355 = (wrap-prefix #1# line-prefix #4#) 355 360 (wrap-prefix #1# line-prefix #4#)= 360 435 (wrap-prefix #1# line-prefix #4#)) +#("\n\n\n[Thu Jan 1 1970]\n*** This server is in debug mode and is loggin= g all user I/O. If you do not wish for everything you send to be readable b= y the server owner(s), please disconnect.[00:00]\n bob: come, you ar= e a tedious fool: to the purpose. What was done to Elbow's wife, that he ha= th cause to complain of? Come me to what was done to her.\n alice: Eit= her your unparagoned mistress is dead, or she's outprized by a trifle.\n" 2= 3 (erc--msg datestamp erc--ts 0 field erc-timestamp) 3 20 (field erc-times= tamp wrap-prefix #1=3D(space :width 27) line-prefix (space :width (- 27 (18= )))) 21 22 (erc--msg notice erc--ts 0 wrap-prefix #1# line-prefix #2=3D(spa= ce :width (- 27 (4)))) 22 183 (wrap-prefix #1# line-prefix #2#) 183 190 (fi= eld erc-timestamp wrap-prefix #1# line-prefix #2# display ((margin right-ma= rgin) #("[00:00]" 0 7 (invisible timestamp)))) 191 192 (erc--msg msg erc--t= s 0 erc--spkr "alice" erc--cmd PRIVMSG wrap-prefix #1# line-prefix #3=3D(sp= ace :width (- 27 (8)))) 192 197 (wrap-prefix #1# line-prefix #3#) 197 199 (= wrap-prefix #1# line-prefix #3#) 199 202 (wrap-prefix #1# line-prefix #3#) = 202 315 (wrap-prefix #1# line-prefix #3#) 316 348 (wrap-prefix #1# line-pre= fix #3#) 349 350 (erc--msg msg erc--ts 0 erc--spkr "bob" erc--cmd PRIVMSG w= rap-prefix #1# line-prefix #4=3D(space :width (- 27 (6)))) 350 353 (wrap-pr= efix #1# line-prefix #4#) 353 355 (wrap-prefix #1# line-prefix #4#) 355 360= (wrap-prefix #1# line-prefix #4#) 360 435 (wrap-prefix #1# line-prefix #4#= )) \ No newline at end of file diff --git a/test/lisp/erc/resources/fill/snapshots/spacing-01-mono.eld b/t= est/lisp/erc/resources/fill/snapshots/spacing-01-mono.eld index 1362c57ef10..754d7989cea 100644 --- a/test/lisp/erc/resources/fill/snapshots/spacing-01-mono.eld +++ b/test/lisp/erc/resources/fill/snapshots/spacing-01-mono.eld @@ -1 +1 @@ -#("\n\n\n[Thu Jan 1 1970]\n*** This server is in debug mode and is loggin= g all user I/O. If you do not wish for everything you send to be readable b= y the server owner(s), please disconnect.[00:00]\n bob: come, you ar= e a tedious fool: to the purpose. What was done to Elbow's wife, that he ha= th cause to complain of? Come me to what was done to her.\n alice: Eit= her your unparagoned mistress is dead, or she's outprized by a trifle.\n This buffer is for text.\n*** one two three\n*** four five six\n So= mebody stop me\n" 2 3 (erc--msg datestamp erc--ts 0 field erc-timestamp) 3 = 20 (field erc-timestamp wrap-prefix #1=3D(space :width 27) line-prefix (spa= ce :width (- 27 (18)))) 21 22 (erc--msg notice erc--ts 0 wrap-prefix #1# li= ne-prefix #2=3D(space :width (- 27 (4)))) 22 183 (wrap-prefix #1# line-pref= ix #2#) 183 190 (field erc-timestamp wrap-prefix #1# line-prefix #2# displa= y ((margin right-margin) #("[00:00]" 0 7 (invisible timestamp)))) 190 191 (= line-spacing 0.5) 191 192 (erc--msg msg erc--cmd PRIVMSG erc--ts 0 wrap-pre= fix #1# line-prefix #3=3D(space :width (- 27 (8)))) 192 197 (wrap-prefix #1= # line-prefix #3#) 197 199 (wrap-prefix #1# line-prefix #3#) 199 202 (wrap-= prefix #1# line-prefix #3#) 202 315 (wrap-prefix #1# line-prefix #3#) 316 3= 48 (wrap-prefix #1# line-prefix #3#) 348 349 (line-spacing 0.5) 349 350 (er= c--msg msg erc--cmd PRIVMSG erc--ts 0 wrap-prefix #1# line-prefix #4=3D(spa= ce :width (- 27 (6)))) 350 353 (wrap-prefix #1# line-prefix #4#) 353 355 (w= rap-prefix #1# line-prefix #4#) 355 360 (wrap-prefix #1# line-prefix #4#) 3= 60 435 (wrap-prefix #1# line-prefix #4#) 435 436 (line-spacing 0.5) 436 437= (erc--msg msg erc--cmd PRIVMSG erc--ts 0 wrap-prefix #1# line-prefix #5=3D= (space :width (- 27 0)) display #6=3D"") 437 440 (wrap-prefix #1# line-pref= ix #5# display #6#) 440 442 (wrap-prefix #1# line-prefix #5# display #6#) 4= 42 466 (wrap-prefix #1# line-prefix #5#) 466 467 (line-spacing 0.5) 467 468= (erc--msg notice erc--ts 0 wrap-prefix #1# line-prefix #7=3D(space :width = (- 27 (4)))) 468 484 (wrap-prefix #1# line-prefix #7#) 485 486 (erc--msg no= tice erc--ts 0 wrap-prefix #1# line-prefix #8=3D(space :width (- 27 (4)))) = 486 502 (wrap-prefix #1# line-prefix #8#) 502 503 (line-spacing 0.5) 503 50= 4 (erc--msg msg erc--cmd PRIVMSG erc--ts 0 wrap-prefix #1# line-prefix #9= =3D(space :width (- 27 (6)))) 504 507 (wrap-prefix #1# line-prefix #9#) 507= 525 (wrap-prefix #1# line-prefix #9#)) +#("\n\n\n[Thu Jan 1 1970]\n*** This server is in debug mode and is loggin= g all user I/O. If you do not wish for everything you send to be readable b= y the server owner(s), please disconnect.[00:00]\n bob: come, you ar= e a tedious fool: to the purpose. What was done to Elbow's wife, that he ha= th cause to complain of? Come me to what was done to her.\n alice: Eit= her your unparagoned mistress is dead, or she's outprized by a trifle.\n This buffer is for text.\n*** one two three\n*** four five six\n So= mebody stop me\n" 2 3 (erc--msg datestamp erc--ts 0 field erc-timestamp) 3 = 20 (field erc-timestamp wrap-prefix #1=3D(space :width 27) line-prefix (spa= ce :width (- 27 (18)))) 21 22 (erc--msg notice erc--ts 0 wrap-prefix #1# li= ne-prefix #2=3D(space :width (- 27 (4)))) 22 183 (wrap-prefix #1# line-pref= ix #2#) 183 190 (field erc-timestamp wrap-prefix #1# line-prefix #2# displa= y ((margin right-margin) #("[00:00]" 0 7 (invisible timestamp)))) 190 191 (= line-spacing 0.5) 191 192 (erc--msg msg erc--ts 0 erc--spkr "alice" erc--cm= d PRIVMSG wrap-prefix #1# line-prefix #3=3D(space :width (- 27 (8)))) 192 1= 97 (wrap-prefix #1# line-prefix #3#) 197 199 (wrap-prefix #1# line-prefix #= 3#) 199 202 (wrap-prefix #1# line-prefix #3#) 202 315 (wrap-prefix #1# line= -prefix #3#) 316 348 (wrap-prefix #1# line-prefix #3#) 348 349 (line-spacin= g 0.5) 349 350 (erc--msg msg erc--ts 0 erc--spkr "bob" erc--cmd PRIVMSG wra= p-prefix #1# line-prefix #4=3D(space :width (- 27 (6)))) 350 353 (wrap-pref= ix #1# line-prefix #4#) 353 355 (wrap-prefix #1# line-prefix #4#) 355 360 (= wrap-prefix #1# line-prefix #4#) 360 435 (wrap-prefix #1# line-prefix #4#) = 435 436 (line-spacing 0.5) 436 437 (erc--msg msg erc--ts 0 erc--spkr "bob" = erc--cmd PRIVMSG wrap-prefix #1# line-prefix #5=3D(space :width (- 27 0)) d= isplay #6=3D"") 437 440 (wrap-prefix #1# line-prefix #5# display #6#) 440 4= 42 (wrap-prefix #1# line-prefix #5# display #6#) 442 466 (wrap-prefix #1# l= ine-prefix #5#) 466 467 (line-spacing 0.5) 467 468 (erc--msg notice erc--ts= 0 wrap-prefix #1# line-prefix #7=3D(space :width (- 27 (4)))) 468 484 (wra= p-prefix #1# line-prefix #7#) 485 486 (erc--msg notice erc--ts 0 wrap-prefi= x #1# line-prefix #8=3D(space :width (- 27 (4)))) 486 502 (wrap-prefix #1# = line-prefix #8#) 502 503 (line-spacing 0.5) 503 504 (erc--msg msg erc--ts 0= erc--spkr "bob" erc--cmd PRIVMSG wrap-prefix #1# line-prefix #9=3D(space := width (- 27 (6)))) 504 507 (wrap-prefix #1# line-prefix #9#) 507 525 (wrap-= prefix #1# line-prefix #9#)) \ No newline at end of file diff --git a/test/lisp/erc/resources/fill/snapshots/stamps-left-01.eld b/te= st/lisp/erc/resources/fill/snapshots/stamps-left-01.eld index 4f87c7d2547..1b22b6c5cfd 100644 --- a/test/lisp/erc/resources/fill/snapshots/stamps-left-01.eld +++ b/test/lisp/erc/resources/fill/snapshots/stamps-left-01.eld @@ -1 +1 @@ -#("\n\n[00:00]*** This server is in debug mode and is logging all user I/O= . If you do not wish for everything you send to be readable by the server o= wner(s), please disconnect.\n[00:00] bob: come, you are a tedious fo= ol: to the purpose. What was done to Elbow's wife, that he hath cause to co= mplain of? Come me to what was done to her.\n[00:00] alice: Either you= r unparagoned mistress is dead, or she's outprized by a trifle.\n" 2 3 (erc= --msg notice erc--ts 0 display #3=3D(#5=3D(margin left-margin) #("[00:00]" = 0 7 (invisible timestamp font-lock-face erc-timestamp-face))) field erc-tim= estamp wrap-prefix #1=3D(space :width 27) line-prefix #2=3D(space :width (-= 27 (4)))) 3 9 (display #3# field erc-timestamp wrap-prefix #1# line-prefix= #2#) 9 171 (wrap-prefix #1# line-prefix #2#) 172 173 (erc--msg msg erc--ts= 0 erc--cmd PRIVMSG display #6=3D(#5# #("[00:00]" 0 7 (invisible timestamp = font-lock-face erc-timestamp-face))) field erc-timestamp wrap-prefix #1# li= ne-prefix #4=3D(space :width (- 27 (8)))) 173 179 (display #6# field erc-ti= mestamp wrap-prefix #1# line-prefix #4#) 179 180 (wrap-prefix #1# line-pref= ix #4#) 180 185 (wrap-prefix #1# line-prefix #4#) 185 187 (wrap-prefix #1# = line-prefix #4#) 187 190 (wrap-prefix #1# line-prefix #4#) 190 303 (wrap-pr= efix #1# line-prefix #4#) 304 336 (wrap-prefix #1# line-prefix #4#) 337 338= (erc--msg msg erc--ts 0 erc--cmd PRIVMSG display #8=3D(#5# #("[00:00]" 0 7= (invisible timestamp font-lock-face erc-timestamp-face))) field erc-timest= amp wrap-prefix #1# line-prefix #7=3D(space :width (- 27 (6)))) 338 344 (di= splay #8# field erc-timestamp wrap-prefix #1# line-prefix #7#) 344 345 (wra= p-prefix #1# line-prefix #7#) 345 348 (wrap-prefix #1# line-prefix #7#) 348= 350 (wrap-prefix #1# line-prefix #7#) 350 355 (wrap-prefix #1# line-prefix= #7#) 355 430 (wrap-prefix #1# line-prefix #7#)) +#("\n\n[00:00]*** This server is in debug mode and is logging all user I/O= . If you do not wish for everything you send to be readable by the server o= wner(s), please disconnect.\n[00:00] bob: come, you are a tedious fo= ol: to the purpose. What was done to Elbow's wife, that he hath cause to co= mplain of? Come me to what was done to her.\n[00:00] alice: Either you= r unparagoned mistress is dead, or she's outprized by a trifle.\n" 2 3 (erc= --msg notice erc--ts 0 display #3=3D(#5=3D(margin left-margin) #("[00:00]" = 0 7 (invisible timestamp font-lock-face erc-timestamp-face))) field erc-tim= estamp wrap-prefix #1=3D(space :width 27) line-prefix #2=3D(space :width (-= 27 (4)))) 3 9 (display #3# field erc-timestamp wrap-prefix #1# line-prefix= #2#) 9 171 (wrap-prefix #1# line-prefix #2#) 172 173 (erc--msg msg erc--ts= 0 erc--spkr "alice" erc--cmd PRIVMSG display #6=3D(#5# #("[00:00]" 0 7 (in= visible timestamp font-lock-face erc-timestamp-face))) field erc-timestamp = wrap-prefix #1# line-prefix #4=3D(space :width (- 27 (8)))) 173 179 (displa= y #6# field erc-timestamp wrap-prefix #1# line-prefix #4#) 179 180 (wrap-pr= efix #1# line-prefix #4#) 180 185 (wrap-prefix #1# line-prefix #4#) 185 187= (wrap-prefix #1# line-prefix #4#) 187 190 (wrap-prefix #1# line-prefix #4#= ) 190 303 (wrap-prefix #1# line-prefix #4#) 304 336 (wrap-prefix #1# line-p= refix #4#) 337 338 (erc--msg msg erc--ts 0 erc--spkr "bob" erc--cmd PRIVMSG= display #8=3D(#5# #("[00:00]" 0 7 (invisible timestamp font-lock-face erc-= timestamp-face))) field erc-timestamp wrap-prefix #1# line-prefix #7=3D(spa= ce :width (- 27 (6)))) 338 344 (display #8# field erc-timestamp wrap-prefix= #1# line-prefix #7#) 344 345 (wrap-prefix #1# line-prefix #7#) 345 348 (wr= ap-prefix #1# line-prefix #7#) 348 350 (wrap-prefix #1# line-prefix #7#) 35= 0 355 (wrap-prefix #1# line-prefix #7#) 355 430 (wrap-prefix #1# line-prefi= x #7#)) \ No newline at end of file --=20 2.42.0 --=-=-=--