[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 1e2b156f040 04/19: Double hyphenate internal ERC 5.6 text props
|
From: |
F. Jason Park |
|
Subject: |
master 1e2b156f040 04/19: Double hyphenate internal ERC 5.6 text props |
|
Date: |
Sun, 17 Dec 2023 23:21:37 -0500 (EST) |
branch: master
commit 1e2b156f040bae9a35c1cdf72f0ab0f6036a593f
Author: F. Jason Park <jp@neverwas.me>
Commit: F. Jason Park <jp@neverwas.me>
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. Rename `erc-speaker' to `erc--speaker'.
* 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.
(erc--send-action-display, erc--own-property-names,
erc--get-speaker-bounds, erc-format-privmessage, erc-format-my-nick,
erc-ctcp-query-ACTION): Rename `erc-speaker' to `erc--speaker'.
* 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". Rename `erc-speaker' to `erc--speaker'.
* 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.
(erc-format-privmessage): Rename `erc-speaker' to `erc--speaker'.
(Bug#60936) (Bug#67677)
; * 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 | 32 +++++------
lisp/erc/erc-goodies.el | 2 +-
lisp/erc/erc-stamp.el | 24 ++++----
lisp/erc/erc-track.el | 4 +-
lisp/erc/erc.el | 66 +++++++++++-----------
test/lisp/erc/erc-scenarios-display-message.el | 4 +-
test/lisp/erc/erc-scenarios-match.el | 14 ++---
test/lisp/erc/erc-scenarios-stamp.el | 20 +++----
test/lisp/erc/erc-stamp-tests.el | 2 +-
test/lisp/erc/erc-tests.el | 26 ++++-----
.../resources/fill/snapshots/merge-01-start.eld | 2 +-
.../resources/fill/snapshots/merge-02-right.eld | 2 +-
.../erc/resources/fill/snapshots/merge-wrap-01.eld | 2 +-
.../snapshots/merge-wrap-indicator-post-01.eld | 2 +-
.../fill/snapshots/merge-wrap-indicator-pre-01.eld | 2 +-
.../fill/snapshots/monospace-01-start.eld | 2 +-
.../fill/snapshots/monospace-02-right.eld | 2 +-
.../resources/fill/snapshots/monospace-03-left.eld | 2 +-
.../fill/snapshots/monospace-04-reset.eld | 2 +-
.../resources/fill/snapshots/spacing-01-mono.eld | 2 +-
.../resources/fill/snapshots/stamps-left-01.eld | 2 +-
21 files changed, 108 insertions(+), 108 deletions(-)
diff --git a/lisp/erc/erc-fill.el b/lisp/erc/erc-fill.el
index 9b0c74b518d..b1bbb5e19b9 100644
--- a/lisp/erc/erc-fill.el
+++ b/lisp/erc/erc-fill.el
@@ -177,10 +177,10 @@ You can put this on `erc-insert-modify-hook' and/or
`erc-send-modify-hook'."
(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--msg))))
(eq 'msg m)))
(put-text-property (1- p) p
'line-spacing erc-fill-line-spacing))))))))
@@ -190,7 +190,7 @@ You can put this on `erc-insert-modify-hook' and/or
`erc-send-modify-hook'."
(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 @@ sender as that of the previous \"PRIVMSG\". As a side
effect,
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,22 +568,22 @@ marked as being ephemeral."
(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-speaker)))
- (cons (get-text-property m 'erc-ts)
- (get-text-property spr 'erc-speaker)))))
+ (spr (next-single-property-change m
'erc--speaker)))
+ (cons (get-text-property m 'erc--ts)
+ (get-text-property spr 'erc--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-speaker))
- ((not (erc--check-msg-prop 'erc-ctcp 'ACTION)))
- (nick (get-text-property speaker 'erc-speaker))
+ (speaker (next-single-property-change (point-min) 'erc--speaker))
+ ((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 @@ See `erc-fill-wrap-mode' for details."
(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 "^-")
@@ -746,7 +746,7 @@ With REPAIRP, destructively fill gaps and re-merge
speakers."
(remove-text-properties beg (1+ end) '(line-prefix nil wrap-prefix nil))
(when-let ((repairp)
(dbeg (text-property-not-all beg end 'display nil))
- ((get-text-property (1+ dbeg) 'erc-speaker))
+ ((get-text-property (1+ dbeg) 'erc--speaker))
(dval (get-text-property dbeg 'display))
((equal "" dval)))
(remove-text-properties
@@ -755,7 +755,7 @@ With REPAIRP, destructively fill gaps and re-merge
speakers."
(field-beginning beg)
beg))
(erc--msg-props (map-into (text-properties-at pos) 'hash-table))
- (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-message))
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 @@ Do nothing if the variable `erc-command-indicator' is nil."
(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 @@ the stamp passed to `erc-insert-timestamp-function'.")
(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))
(cl-defmethod erc-stamp--current-time :around ()
@@ -249,10 +249,10 @@ or `erc-send-modify-hook'."
;; FIXME on major version bump, make this `erc-' prefixed.
(if invisible `(timestamp ,@(ensure-list invisible)) 'timestamp))
(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 @@ or `erc-send-modify-hook'."
;; 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))))))
(defvar-local erc-timestamp-last-window-width nil
"The width of the last window that showed the current buffer.
@@ -403,7 +403,7 @@ non-nil."
;; 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 @@ value of t means the option's value doesn't require
trimming.")
(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 @@ Return the empty string if FORMAT is nil."
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 @@ Return the empty string if FORMAT is nil."
(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))))
@@ -940,7 +940,7 @@ enabled when the message was inserted."
(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))
(defun erc-echo-timestamp (dir stamp &optional zone)
@@ -950,7 +950,7 @@ hours (or seconds, if its abs value is larger than 14), and
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 (<= (abs v) 14) (* v 3600) v))
@@ -964,7 +964,7 @@ with the option `erc-echo-timestamps', see the companion
option
(setq erc-stamp--last-stamp nil))))
(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)))
(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 @@ that face with highest priority in NEW-FACES is also a
member of
choice))))
(defvar erc-track--skipped-msgs '(datestamp)
- "Values of `erc-msg' text prop to ignore.")
+ "Values of `erc--msg' text prop to ignore.")
(defun erc-track-modified-channels ()
"Hook function for `erc-insert-post-hook'.
@@ -806,7 +806,7 @@ the current buffer is in `erc-mode'."
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 558b17788bf..c499afb22f7 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -154,26 +154,26 @@ visiting and editing inserted messages. Modules should
align
their markers accordingly. The following properties have meaning
as of ERC 5.6:
- - `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'
- - `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)
- - `erc-ctcp': a CTCP command, like `ACTION'
+ - `erc--ctcp': a CTCP command, like `ACTION'
- - `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
- - `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 @@ target, and an `erc-server-send' FORCE flag.")
;; 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,11 +3013,11 @@ target, and an `erc-server-send' FORCE flag.")
(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
+ (setq nick (propertize nick 'erc--speaker nick
'font-lock-face 'erc-my-nick-face))
(erc-display-message nil '(t action input) (current-buffer)
'ACTION ?n nick ?a string ?u "" ?h "")))
@@ -3142,20 +3142,20 @@ Return ONLY one side when the first arg is `end' or
`beg'. With
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-msg)))
+ 'erc--msg)))
(if (= 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 @@ If END is a marker, possibly update its position."
(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 @@ modification hooks)."
(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)) props)))
(erc--refresh-prompt)))))
(run-hooks 'erc-insert-done-hook)
@@ -3340,8 +3340,8 @@ the old pattern (erc-display-line (erc-make-notice)
my-buffer) as
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)))
(defvar erc--merge-text-properties-p nil
@@ -3458,7 +3458,7 @@ subsequent message."
(substring (delete-and-extract-region (1- (point)) (1+ end))
-1))))))))
-(defvar erc--ranked-properties '(erc-msg erc-ts erc-cmd))
+(defvar erc--ranked-properties '(erc--msg erc--ts erc--cmd))
(defun erc--order-text-properties-from-hash (table)
"Return a plist of text props from items in TABLE.
@@ -3732,7 +3732,7 @@ filling, and other effects."
(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 @@ filling, and other effects."
(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)))
@@ -5258,7 +5258,7 @@ Eventually add a # in front of it, if that turns it into
a valid channel name."
(concat "#" channel)))
(defvar erc--own-property-names
- '( tags erc-speaker erc-parsed display ; core
+ '( tags erc--speaker erc-parsed display ; core
;; `erc-display-prompt'
rear-nonsticky erc-prompt field front-sticky read-only
;; stamp
@@ -5742,12 +5742,12 @@ and as second argument the event parsed as a vector."
(not (string-match "^\C-aACTION.*\C-a$" message))))
(defun erc--get-speaker-bounds ()
- "Return the bounds of `erc-speaker' text property when present.
+ "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))))
+ 'erc--speaker nil)))
+ (cons beg (next-single-property-change beg 'erc--speaker))))
(defvar erc--cmem-from-nick-function #'erc--cmem-get-existing
"Function maybe returning a \"channel member\" cons from a nick.
@@ -5776,7 +5776,7 @@ NUH, and the current `erc-response' object.")
(erc-put-text-property 0 (length mark-s) 'font-lock-face msg-face str)
(erc-put-text-properties (+ (length mark-s) prefix-len)
(+ (length mark-s) (length nick))
- '(font-lock-face erc-speaker) str
+ '(font-lock-face erc--speaker) str
(list nick-face
(substring-no-properties nick prefix-len)))
(erc-put-text-property (+ (length mark-s) (length nick)) (length str)
@@ -5830,7 +5830,7 @@ also `erc-format-nick-function'."
(concat
(propertize open 'font-lock-face 'erc-default-face)
(propertize mode 'font-lock-face 'erc-my-nick-prefix-face)
- (propertize nick 'font-lock-face 'erc-my-nick-face 'erc-speaker nick)
+ (propertize nick 'font-lock-face 'erc-my-nick-face 'erc--speaker nick)
(propertize close 'font-lock-face 'erc-default-face)))
(let ((prefix "> "))
(propertize prefix 'font-lock-face 'erc-default-face))))
@@ -6074,8 +6074,8 @@ See also `erc-display-message'."
(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")
@@ -6111,7 +6111,7 @@ See also `erc-display-message'."
(buf (or (erc-get-buffer to proc)
(erc-get-buffer nick proc)
(process-buffer proc))))
- (setq nick (propertize nick 'erc-speaker nick))
+ (setq nick (propertize nick 'erc--speaker nick))
(erc-display-message
parsed 'action buf
'ACTION ?n nick ?u login ?h host ?a s))))
@@ -7521,7 +7521,7 @@ as outgoing chat messages and echoed slash commands."
(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 ovs))
+ (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 @@
(with-current-buffer (erc-d-t-wait-for 5 (get-buffer "dummy"))
(funcall expect 10 "<dummy> 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)))))
(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)))))
(with-current-buffer "foonet"
(erc-cmd-QUIT ""))))
diff --git a/test/lisp/erc/erc-scenarios-match.el
b/test/lisp/erc/erc-scenarios-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 @@
(should (= mend (field-end right-stamp)))
(should (eq (field-at-pos (1- mend)) 'erc-timestamp))))
- ;; 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--ts))
;; Line ending has the `invisible' property `match-fools'.
(should (eq (get-text-property mbeg 'invisible) 'match-fools))
@@ -413,7 +413,7 @@
(should-not (equal "" (get-text-property (pos-bol) 'display)))
;; 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 @@
(should (eq (field-at-pos (field-end mbeg)) 'erc-timestamp))
(should (eq (field-at-pos (1- mend)) 'erc-timestamp)))
- ;; 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--ts))
;; Line ending has the `invisible' property `match-fools'.
(should (= (char-after mend) ?\n))
diff --git a/test/lisp/erc/erc-scenarios-stamp.el
b/test/lisp/erc/erc-scenarios-stamp.el
index 49307dd228a..bb3a4195e0d 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)
(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 (= ?\n (char-before erc-scenarios-stamp--user-marker)))
@@ -68,11 +68,11 @@
(ert-info ("Stamps appear in left margin and are invisible")
(should (eq 'erc-timestamp (field-at-pos (pos-bol))))
(should (= (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 (= ?- (char-after (field-end (pos-bol)))))
(should (equal (get-text-property (1+ (field-end (pos-bol)))
- 'erc-speaker)
+ 'erc--speaker)
"irc.foonet.org"))
(should (pcase (get-text-property (pos-bol) 'display)
(`((margin left-margin) ,s)
@@ -104,14 +104,14 @@
(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)
(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)))))))
;; 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 @@
;; 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))))))
;; 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)))
@@ -174,7 +174,7 @@
(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))))
(funcall expect 5 "This server is in debug mode")))))
diff --git a/test/lisp/erc/erc-stamp-tests.el b/test/lisp/erc/erc-stamp-tests.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 @@
(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 03879b02347..1b610a367b6 100644
--- a/test/lisp/erc/erc-tests.el
+++ b/test/lisp/erc/erc-tests.el
@@ -1738,7 +1738,7 @@
: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 @@
;; 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 @@
(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)))))
(erc--delete-inserted-message (point))
@@ -1855,19 +1855,19 @@
(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)
@@ -2341,7 +2341,7 @@
nil 'msgp)
#("<bob> oh my"
0 1 (font-lock-face erc-default-face)
- 1 4 (erc-speaker "bob" font-lock-face erc-nick-default-face)
+ 1 4 (erc--speaker "bob" font-lock-face erc-nick-default-face)
4 11 (font-lock-face erc-default-face))))
;; Basic NOTICE
@@ -2351,7 +2351,7 @@
nil nil)
#("-bob- oh my"
0 1 (font-lock-face erc-default-face)
- 1 4 (erc-speaker "bob" font-lock-face erc-nick-default-face)
+ 1 4 (erc--speaker "bob" font-lock-face erc-nick-default-face)
4 11 (font-lock-face erc-default-face))))
;; Prefixed PRIVMSG
@@ -2367,7 +2367,7 @@
#("<@Bob> oh my"
0 1 (font-lock-face erc-default-face)
1 2 (font-lock-face erc-nick-prefix-face help-echo "operator")
- 2 5 (erc-speaker "Bob" font-lock-face erc-nick-default-face)
+ 2 5 (erc--speaker "Bob" font-lock-face erc-nick-default-face)
5 12 (font-lock-face erc-default-face))))))
(ert-deftest erc--route-insertion ()
@@ -2392,7 +2392,7 @@
(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/test/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 logging
all user I/O. If you do not wish for everything you send to be readable by the
server owner(s), please disconnect.[00:00]\n<alice> bob: come, you are a
tedious fool: to the purpose. What was done to Elbow's wife, that he hath cause
to complain of? Come me to what was done to her.\n<bob> alice: Either your
unparagoned mistress is dead, or she's outprized by a trifle.\n\n[Sat Apr 1
2023]\n<bob> zero.[07:00]\n<alic [...]
+#("\n\n\n[Thu Jan 1 1970]\n*** 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 owner(s), please disconnect.[00:00]\n<alice> bob: come, you are a
tedious fool: to the purpose. What was done to Elbow's wife, that he hath cause
to complain of? Come me to what was done to her.\n<bob> alice: Either your
unparagoned mistress is dead, or she's outprized by a trifle.\n\n[Sat Apr 1
2023]\n<bob> zero.[07:00]\n<alic [...]
diff --git a/test/lisp/erc/resources/fill/snapshots/merge-02-right.eld
b/test/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 logging
all user I/O. If you do not wish for everything you send to be readable by the
server owner(s), please disconnect.[00:00]\n<alice> bob: come, you are a
tedious fool: to the purpose. What was done to Elbow's wife, that he hath cause
to complain of? Come me to what was done to her.\n<bob> alice: Either your
unparagoned mistress is dead, or she's outprized by a trifle.\n\n[Sat Apr 1
2023]\n<bob> zero.[07:00]\n<alic [...]
+#("\n\n\n[Thu Jan 1 1970]\n*** 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 owner(s), please disconnect.[00:00]\n<alice> bob: come, you are a
tedious fool: to the purpose. What was done to Elbow's wife, that he hath cause
to complain of? Come me to what was done to her.\n<bob> alice: Either your
unparagoned mistress is dead, or she's outprized by a trifle.\n\n[Sat Apr 1
2023]\n<bob> zero.[07:00]\n<alic [...]
diff --git a/test/lisp/erc/resources/fill/snapshots/merge-wrap-01.eld
b/test/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 logging
all user I/O. If you do not wish for everything you send to be readable by the
server owner(s), please disconnect.[00:00]\n<alice> bob: come, you are a
tedious fool: to the purpose. What was done to Elbow's wife, that he hath cause
to complain of? Come me to what was done to her.\n<bob> alice: Either your
unparagoned mistress is dead, or she's outprized by a trifle.\n\n[Sat Apr 1
2023]\n<bob> zero.[07:00]\n<bob> [...]
+#("\n\n\n[Thu Jan 1 1970]\n*** 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 owner(s), please disconnect.[00:00]\n<alice> bob: come, you are a
tedious fool: to the purpose. What was done to Elbow's wife, that he hath cause
to complain of? Come me to what was done to her.\n<bob> alice: Either your
unparagoned mistress is dead, or she's outprized by a trifle.\n\n[Sat Apr 1
2023]\n<bob> zero.[07:00]\n<bob> [...]
diff --git
a/test/lisp/erc/resources/fill/snapshots/merge-wrap-indicator-post-01.eld
b/test/lisp/erc/resources/fill/snapshots/merge-wrap-indicator-post-01.eld
index 893588c028f..a0c03244afe 100644
--- a/test/lisp/erc/resources/fill/snapshots/merge-wrap-indicator-post-01.eld
+++ b/test/lisp/erc/resources/fill/snapshots/merge-wrap-indicator-post-01.eld
@@ -1 +1 @@
-#("\n\n\n[Thu Jan 1 1970]\n*** 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 owner(s), please disconnect.[00:00]\n<alice> bob: come, you are a
tedious fool: to the purpose. What was done to Elbow's wife, that he hath cause
to complain of? Come me to what was done to her.\n<bob> alice: Either your
unparagoned mistress is dead, or she's outprized by a trifle.\n\n[Sat Apr 1
2023]\n<bob> zero.[07:00]\n<bob> [...]
\ No newline at end of file
+#("\n\n\n[Thu Jan 1 1970]\n*** 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 owner(s), please disconnect.[00:00]\n<alice> bob: come, you are a
tedious fool: to the purpose. What was done to Elbow's wife, that he hath cause
to complain of? Come me to what was done to her.\n<bob> alice: Either your
unparagoned mistress is dead, or she's outprized by a trifle.\n\n[Sat Apr 1
2023]\n<bob> zero.[07:00]\n<bob> [...]
\ No newline at end of file
diff --git
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
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 logging
all user I/O. If you do not wish for everything you send to be readable by the
server owner(s), please disconnect.[00:00]\n<alice> bob: come, you are a
tedious fool: to the purpose. What was done to Elbow's wife, that he hath cause
to complain of? Come me to what was done to her.\n<bob> alice: Either your
unparagoned mistress is dead, or she's outprized by a trifle.\n\n[Sat Apr 1
2023]\n<bob> zero.[07:00]\n<bob> [...]
\ No newline at end of file
+#("\n\n\n[Thu Jan 1 1970]\n*** 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 owner(s), please disconnect.[00:00]\n<alice> bob: come, you are a
tedious fool: to the purpose. What was done to Elbow's wife, that he hath cause
to complain of? Come me to what was done to her.\n<bob> alice: Either your
unparagoned mistress is dead, or she's outprized by a trifle.\n\n[Sat Apr 1
2023]\n<bob> zero.[07:00]\n<bob> [...]
\ 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 logging
all user I/O. If you do not wish for everything you send to be readable by the
server owner(s), please disconnect.[00:00]\n<alice> bob: come, you are a
tedious fool: to the purpose. What was done to Elbow's wife, that he hath cause
to complain of? Come me to what was done to her.\n<bob> alice: Either your
unparagoned mistress is dead, or she's outprized by a trifle.\n" 2 3 (erc-msg
datestamp erc-ts 0 field erc-ti [...]
+#("\n\n\n[Thu Jan 1 1970]\n*** 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 owner(s), please disconnect.[00:00]\n<alice> bob: come, you are a
tedious fool: to the purpose. What was done to Elbow's wife, that he hath cause
to complain of? Come me to what was done to her.\n<bob> alice: Either your
unparagoned mistress is dead, or she's outprized by a trifle.\n" 2 3 (erc--msg
datestamp erc--ts 0 field erc- [...]
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 logging
all user I/O. If you do not wish for everything you send to be readable by the
server owner(s), please disconnect.[00:00]\n<alice> bob: come, you are a
tedious fool: to the purpose. What was done to Elbow's wife, that he hath cause
to complain of? Come me to what was done to her.\n<bob> alice: Either your
unparagoned mistress is dead, or she's outprized by a trifle.\n" 2 3 (erc-msg
datestamp erc-ts 0 field erc-ti [...]
+#("\n\n\n[Thu Jan 1 1970]\n*** 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 owner(s), please disconnect.[00:00]\n<alice> bob: come, you are a
tedious fool: to the purpose. What was done to Elbow's wife, that he hath cause
to complain of? Come me to what was done to her.\n<bob> alice: Either your
unparagoned mistress is dead, or she's outprized by a trifle.\n" 2 3 (erc--msg
datestamp erc--ts 0 field erc- [...]
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 logging
all user I/O. If you do not wish for everything you send to be readable by the
server owner(s), please disconnect.[00:00]\n<alice> bob: come, you are a
tedious fool: to the purpose. What was done to Elbow's wife, that he hath cause
to complain of? Come me to what was done to her.\n<bob> alice: Either your
unparagoned mistress is dead, or she's outprized by a trifle.\n" 2 3 (erc-msg
datestamp erc-ts 0 field erc-ti [...]
+#("\n\n\n[Thu Jan 1 1970]\n*** 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 owner(s), please disconnect.[00:00]\n<alice> bob: come, you are a
tedious fool: to the purpose. What was done to Elbow's wife, that he hath cause
to complain of? Come me to what was done to her.\n<bob> alice: Either your
unparagoned mistress is dead, or she's outprized by a trifle.\n" 2 3 (erc--msg
datestamp erc--ts 0 field erc- [...]
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 logging
all user I/O. If you do not wish for everything you send to be readable by the
server owner(s), please disconnect.[00:00]\n<alice> bob: come, you are a
tedious fool: to the purpose. What was done to Elbow's wife, that he hath cause
to complain of? Come me to what was done to her.\n<bob> alice: Either your
unparagoned mistress is dead, or she's outprized by a trifle.\n" 2 3 (erc-msg
datestamp erc-ts 0 field erc-ti [...]
+#("\n\n\n[Thu Jan 1 1970]\n*** 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 owner(s), please disconnect.[00:00]\n<alice> bob: come, you are a
tedious fool: to the purpose. What was done to Elbow's wife, that he hath cause
to complain of? Come me to what was done to her.\n<bob> alice: Either your
unparagoned mistress is dead, or she's outprized by a trifle.\n" 2 3 (erc--msg
datestamp erc--ts 0 field erc- [...]
diff --git a/test/lisp/erc/resources/fill/snapshots/spacing-01-mono.eld
b/test/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 logging
all user I/O. If you do not wish for everything you send to be readable by the
server owner(s), please disconnect.[00:00]\n<alice> bob: come, you are a
tedious fool: to the purpose. What was done to Elbow's wife, that he hath cause
to complain of? Come me to what was done to her.\n<bob> alice: Either your
unparagoned mistress is dead, or she's outprized by a trifle.\n<bob> This
buffer is for text.\n*** one two th [...]
+#("\n\n\n[Thu Jan 1 1970]\n*** 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 owner(s), please disconnect.[00:00]\n<alice> bob: come, you are a
tedious fool: to the purpose. What was done to Elbow's wife, that he hath cause
to complain of? Come me to what was done to her.\n<bob> alice: Either your
unparagoned mistress is dead, or she's outprized by a trifle.\n<bob> This
buffer is for text.\n*** one two th [...]
diff --git a/test/lisp/erc/resources/fill/snapshots/stamps-left-01.eld
b/test/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 owner(s),
please disconnect.\n[00:00]<alice> bob: come, you are a tedious fool: to the
purpose. What was done to Elbow's wife, that he hath cause to complain of? Come
me to what was done to her.\n[00:00]<bob> alice: Either your unparagoned
mistress is dead, or she's outprized by a trifle.\n" 2 3 (erc-msg notice erc-ts
0 display #3=(#5=(margin [...]
+#("\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 owner(s),
please disconnect.\n[00:00]<alice> bob: come, you are a tedious fool: to the
purpose. What was done to Elbow's wife, that he hath cause to complain of? Come
me to what was done to her.\n[00:00]<bob> alice: Either your unparagoned
mistress is dead, or she's outprized by a trifle.\n" 2 3 (erc--msg notice
erc--ts 0 display #3=(#5=(marg [...]
- master updated (64a4904353f -> 8e06f224a9e), F. Jason Park, 2023/12/17
- master 61b22ae9f37 03/19: Sequester some special-variable declarations in ERC, F. Jason Park, 2023/12/17
- master 0f058244ab7 18/19: Cache shortened channel names in erc-track, F. Jason Park, 2023/12/17
- master 49bfea4386f 12/19: Use templates for formatting chat messages in ERC, F. Jason Park, 2023/12/17
- master 1e2b156f040 04/19: Double hyphenate internal ERC 5.6 text props,
F. Jason Park <=
- master b5da8ba8070 02/19: Define ERC message-formatting templates with defvar, F. Jason Park, 2023/12/17
- master 69ca2cc1138 05/19: Add utility for iterating over arrays in ERC, F. Jason Park, 2023/12/17
- master 4ee4865ce20 07/19: Add erc-server-396 response handler, F. Jason Park, 2023/12/17
- master 741bce84890 16/19: Forgo excess nick buttonizing on JOINs and QUITs, F. Jason Park, 2023/12/17
- master 7c2e02e6d79 01/19: Remove module from suggested lineup in ERC's manual, F. Jason Park, 2023/12/17
- master 11bae96d23b 08/19: Clarify warning for process-dependent input in ERC, F. Jason Park, 2023/12/17
- master 6e4417eaa7e 14/19: Consolidate status-prefix slots of erc-channel-user, F. Jason Park, 2023/12/17
- master 7db500b50be 09/19: Make erc-get-user-mode-prefix more flexible, F. Jason Park, 2023/12/17
- master 9d961b31070 13/19: Demote erc-fill-line-spacing to a normal variable, F. Jason Park, 2023/12/17
- master c1befaf0a8b 10/19: Skip erc-ignored-user-p when erc-ignore-list is empty, F. Jason Park, 2023/12/17