master ece62f5c1c3 9/9: ; Prepare for ERC 5.6 release

[F. Jason Park]

branch: master
commit ece62f5c1c3ab0e1ed5e71b7adb3a6bc230f23d1
Author: F. Jason Park <jp@neverwas.me>
Commit: F. Jason Park <jp@neverwas.me>

    ; Prepare for ERC 5.6 release
    
    * doc/misc/erc.texi: Minor tweak in SASL section.
    * etc/ERC-NEWS: Revise various sections under 5.6.
    * lisp/erc/erc-button.el (erc-button-alist): Remove comment.
    (erc-nick-popup-alist): Remove comment.
    * lisp/erc/erc-fill.el (erc-fill-wrap-margin-width): Remove comment.
    (erc-fill-wrap-margin-side): Remove comment.
    (erc-fill-line-spacing): Remove comment.
    (erc-fill-wrap-use-pixels): Remove comment.
    (erc-fill-wrap-visual-keys): Remove comment.
    (erc-fill-wrap-force-screen-line-movement): Remove comment.
    (erc-fill-wrap-merge): Remove comment.
    * lisp/erc/erc-goodies.el (erc-scrolltobottom-all): Remove comment.
    (erc-keep-place-indicator-style): Remove comment.
    (erc-keep-place-indicator-buffer-type): Remove comment.
    (erc-keep-place-indicator-follow): Remove comment.
    * lisp/erc/erc-networks.el (erc-server-alist): Remove comment.
    * lisp/erc/erc-nicks.el (erc-nicks): Remove comment.
    * lisp/erc/erc-speedbar.el
    (erc-speedbar-nicknames-window-width): Remove comment.
    (erc-speedbar-hide-mode-topic): Remove comment.
    (erc-speedbar-my-nick-face): Remove comment.
    * lisp/erc/erc-stamp.el (erc-timestamp-format-right): Remove comment.
    (erc-echo-timestamp-zone): Remove comment.
    (erc-timestamp-use-align-to): Remove comment.
    * lisp/erc/erc-status-sidebar.el
    (erc-status-sidebar-highlight-active-buffer): Remove comment.
    (erc-status-sidebar-style): Remove comment.
    (erc-status-sidebar-click-display-action): Remove comment.
    * lisp/erc/erc.el: Bump required Compat version to 29.1.4.3 in
    Package-Requires header.
    (erc-notice-face): Remove comment.
    (erc-action-face): Remove comment.
    (erc-interactive-display): Remove comment.
    (erc-auto-reconnect-display-timeout): Remove comment.
    (erc-reconnect-display-server-buffers): Remove comment.
    (erc-modules): Remove comment.
    * test/lisp/erc/resources/base/display-message/multibuf.eld: Remove
    reference to specific ERC version in QUIT command reason.
    * test/lisp/erc/resources/base/assoc/reconplay/foonet.eld: Timeout.
---
 doc/misc/erc.texi                                  |   4 +-
 etc/ERC-NEWS                                       | 116 ++++++++++++---------
 lisp/erc/erc-button.el                             |   4 +-
 lisp/erc/erc-fill.el                               |  14 +--
 lisp/erc/erc-goodies.el                            |   8 +-
 lisp/erc/erc-networks.el                           |   2 +-
 lisp/erc/erc-nicks.el                              |   2 +-
 lisp/erc/erc-speedbar.el                           |   6 +-
 lisp/erc/erc-stamp.el                              |   6 +-
 lisp/erc/erc-status-sidebar.el                     |   6 +-
 lisp/erc/erc.el                                    |  14 +--
 .../erc/resources/base/assoc/reconplay/foonet.eld  |   2 +-
 .../resources/base/display-message/multibuf.eld    |   2 +-
 13 files changed, 101 insertions(+), 85 deletions(-)

diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi
index 44e82084b90..d7260ffa329 100644
--- a/doc/misc/erc.texi
+++ b/doc/misc/erc.texi
@@ -1066,14 +1066,14 @@ The name of an SASL subprotocol type as a 
@emph{lowercase} symbol.
 The value can be one of the following:
 
 @table @asis
-@item @code{plain} and @code{scram} (``password-based'')
+@item @code{plain} or @code{scram} (``password-based'')
 Here, ``password'' refers to your account password, which is usually
 your @samp{NickServ} password.  To make this work, customize
 @code{erc-sasl-user} and @code{erc-sasl-password} or specify the
 @code{:user} and @code{:password} keyword arguments when invoking
 @code{erc-tls}.
 
-@item @code{external} (via Client TLS Certificate)
+@item @code{external} (via client @acronym{TLS} certificate)
 This works in conjunction with the @code{:client-certificate} keyword
 offered by @code{erc-tls}.  Just ensure you've registered your
 fingerprint with the network beforehand.  The fingerprint is usually a
diff --git a/etc/ERC-NEWS b/etc/ERC-NEWS
index cd4a283ef1c..04b11fc19f0 100644
--- a/etc/ERC-NEWS
+++ b/etc/ERC-NEWS
@@ -100,7 +100,7 @@ one's optionally accessible from the keyboard, just like 
any other
 side window.  Hit '<RET>' over a nick to spawn a "/QUERY" or a
 "Lastlog" (Occur) session.  See 'erc-nickbar-mode' for more.
 
-** The option 'erc-timestamp-use-align-to' is more versatile.
+** Option 'erc-timestamp-use-align-to' more versatile.
 While this option has always offered to right-align stamps via the
 'display' text property, it's now more effective at doing so when set
 to a number indicating an offset from the right edge.  Users of the
@@ -220,7 +220,7 @@ the same effect by issuing a "/CLEAR" at the prompt.
 ** The 'truncate' module no longer enables logging automatically.
 Users expecting 'truncate' to perform logging based on the option
 'erc-enable-logging' need to instead add 'log' to 'erc-modules' for
-continued integration.  With the existing design, merely loading the
+continued integration.  Under the original design, merely loading the
 library 'erc-log' caused 'truncate' to start writing logs, possibly
 against a user's wishes.
 
@@ -257,10 +257,10 @@ tally of blank lines padded and trailing blanks culled.
 Some minor quality-of-life niceties have finally made their way to
 ERC.  For example, fool visibility has become togglable with the new
 command 'erc-match-toggle-hidden-fools'.  The 'button' module's
-'erc-button-previous' now moves to the beginning instead of the end of
-buttons.  A new command, 'erc-news', can be invoked to visit this very
-file.  And the 'irccontrols' module now supports additional colors and
-special handling for "spoilers" (hidden text).
+'erc-button-previous' command now moves to the beginning instead of
+the end of buttons.  A new command, 'erc-news', can be invoked to
+visit this very file.  And the 'irccontrols' module now supports
+additional colors and special handling for "spoilers" (hidden text).
 
 ** Changes in the library API.
 
@@ -276,21 +276,26 @@ sparingly, and the latter two have only been around for 
one minor
 release cycle, so their removal hopefully won't cause much churn.
 
 *** Some ERC-applied text properties have changed.
-Chiefly, 'rear-sticky' has been replaced by 'erc-command', which
-records the IRC command (or numeric) associated with a message.  Less
-impactfully, the value of the 'field' property for ERC's prompt has
-changed from 't' to the more useful 'erc-prompt', although the
-property of the same name has been retained and now has a value of
-'hidden' when disconnected.
+Chiefly, a new set of metadata-oriented properties, the details of
+which should be considered internal, now occupy the first character of
+all inserted messages, including local notices, date stamps, and
+interactive feedback.  These properties will likely form the basis for
+a new message-traversal/insertion/deletion API in future versions.
+Less impactfully, the no-op property 'rear-sticky' has been removed,
+and the value of the 'field' property for ERC's prompt has changed
+from 't' to the more useful 'erc-prompt', although the property of the
+same name has been retained and now has a value of 'hidden' when
+disconnected.
 
 *** Members of insert- and send-related hooks have been reordered.
-Built-in and third-party modules rely on certain hooks for adjusting
-incoming and outgoing messages upon insertion.  And some modules only
-want to do so after others have done their damage.  Traditionally,
-this has required various hacks and finagling to achieve.  And while
-this release makes an effort to load modules in a more consistent
-order, that alone isn't enough to ensure similar predictability among
-essential members of important hooks.
+As anyone reading this is no doubt aware, both built-in and
+third-party modules rely on certain hooks for adjusting incoming and
+outgoing messages upon insertion.  And some modules only want to do so
+after others have done their damage.  Traditionally, this has required
+various hacks and finagling to achieve.  And while this release makes
+an effort to load modules in a more consistent order, that alone isn't
+enough to ensure predictability among essential members of important
+hooks.
 
 Luckily, ERC now leverages a feature introduced in Emacs 27, "hook
 depth," to secure the positions of a few key members of
@@ -317,18 +322,18 @@ ERC's own code base in 2002.  That this example has 
endured makes some
 sense because it's probably seen as less cumbersome than fiddling with
 the more powerful and complicated 'erc-display-message'.
 
-The latest twist in this saga comes with this release, in which a
-healthy bit of "pre-insertion" business has taken up residence in
-'erc-display-message'.  While this would seem to put antiquated
-patterns, like the above mentioned 'erc-make-notice' combo, at risk of
-having messages ignored or subject to degraded treatment by built-in
-modules, an adaptive measure has been introduced that recasts
-'erc-display-line' as a thin wrapper around 'erc-display-message'.
-And though nothing of the sort has been done for the lower-level
-'erc-display-line-1' (now an obsolete alias for 'erc-insert-line'),
-some last-ditch fallback code is in place to ensure baseline
-functionality.  As always, if you find these developments disturbing,
-please say so on the tracker.
+The latest twist in this tale comes with this release, for which a
+healthy helping of "pre-insertion" business has permanently ensconced
+itself in none other than 'erc-display-message'.  While this would
+seem to put antiquated patterns, like the above mentioned
+'erc-make-notice' combo, at risk of having messages ignored or subject
+to degraded treatment by built-in modules, an adaptive measure has
+been introduced that recasts 'erc-display-line' as a thin wrapper
+around 'erc-display-message'.  And though nothing of the sort has been
+done for the lower-level 'erc-display-line-1' (now an obsolete alias
+for 'erc-insert-line'), some last-ditch fallback code has been
+introduced to guarantee baseline functionality.  As always, if you
+find these developments disturbing, please say so on the tracker.
 
 *** ERC now manages timestamp-related properties a bit differently.
 For starters, the 'cursor-sensor-functions' text property is absent by
@@ -342,37 +347,45 @@ Also affecting the 'stamp' module is the deprecation of 
the function
 the module now merges its 'invisible' property with existing ones and
 includes all white space around stamps when doing so.
 
-This "propertizing" of surrounding white space also extends to all
+This "propertizing" of surrounding white space extends to all
 'stamp'-applied properties, like 'field', in all intervening space
 between message text and timestamps.  Technically, this constitutes a
 breaking change from the perspective of detecting a timestamp's
 bounds.  However, ERC has always propertized leading space before
-right-sided stamps on the same line as message text but not those
-folded onto the next line.  Such inconsistency made stamp detection
-overly complex and produced uneven results when toggling stamp
-visibility.
+right-sided stamps on the same line as message text but not before
+those folded onto the next line.  Such inconsistency made stamp
+detection overly complex and produced uneven results when toggling
+stamp visibility.
 
-*** Date stamps are independent messages.
+*** Date stamps have become independent messages.
 ERC now inserts "date stamps" generated from the option
-'erc-timestamp-format-left' as separate, standalone messages.  (This
-only matters if 'erc-insert-timestamp-function' is set to its default
-value of 'erc-insert-timestamp-left-and-right'.)  ERC's near-term UI
-goals require exposing these stamps to existing code designed to
+'erc-timestamp-format-left' as separate, standalone messages.  This
+currently only matters if 'erc-insert-timestamp-function' is set to
+its default value of 'erc-insert-timestamp-left-and-right', however
+plans exist to decouple these features.  In any case, ERC's near-term
+UI goals require exposing these stamps to existing code designed to
 operate on complete messages.  For example, users likely expect date
 stamps to be togglable with 'erc-toggle-timestamps' while also being
 immune to hiding from commands like 'erc-match-toggle-hidden-fools'.
 Before this change, meeting such expectations demanded brittle
 heuristics that checked for the presence of these stamps in the
 leading portion of message bodies as well as special casing to act on
-these areas without inflicting collateral damage.  It may also be
-worth noting that as consequence of these changes, the internally
-managed variable 'erc-timestamp-last-inserted-left' no longer records
-the final trailing newline in 'erc-timestamp-format-left'.  If you
-must, see variable 'erc-stamp-prepend-date-stamps-p' for a temporary
-escape hatch.
+these areas without inflicting collateral damage.
+
+Despite the rationale, this move admittedly ushers in a heightened
+potential for disruption because third-party members of ERC's
+modification hooks may not take kindly to encountering stamp-only
+messages.  They may also expect members of 'erc-insert-pre-hook' and
+'erc-insert-done-hook' to run unconditionally, even though ERC
+suppresses those hooks when inserting date stamps.  Third parties may
+also not appreciate that 'erc-timestamp-last-inserted-left' no longer
+records the final trailing newline in 'erc-timestamp-format-left'.  If
+these inconveniences prove too encumbering to deal with right away,
+see the escape hatch 'erc-stamp-prepend-date-stamps-p', which should
+help ease the transition.
 
 *** The role of a module's Custom group is now more clearly defined.
-Associating built-in modules with Custom groups and provided library
+Associating built-in modules with Custom groups and "provided" library
 features has improved.  More specifically, a module's group now enjoys
 the singular purpose of determining where the module's minor mode
 variable lives in the Customize interface.  And although ERC is now
@@ -390,7 +403,8 @@ like bridges to other protocols.
 Some IRC "slash" commands are hierarchical and require users to
 specify a subcommand to actually carry out anything of consequence.
 Built-in modules can now provide more detailed help for a particular
-subcommand by telling ERC to defer to a specialized handler.
+subcommand by telling ERC to defer to a specialized handler.  This
+facility can be opened up to third parties should any one request it.
 
 *** Longtime quasi modules made proper.
 The 'fill' module is now defined by 'define-erc-module'.  The same
@@ -423,7 +437,9 @@ than lone ones.
 ERC now adjusts input lines to fall within allowed length limits
 before showing hook members the result.  For compatibility,
 third-party code can request that the final input be adjusted again
-prior to being sent.  See doc string for details.
+prior to being sent.  To facilitate this, the 'erc-input' object
+shared among hook members has gained a new 'refoldp' slot, making this
+a breaking change, if only in theory.  See doc string for details.
 
 *** ERC's prompt survives the insertion of user input and messages.
 Previously, ERC's prompt and its input marker disappeared while
diff --git a/lisp/erc/erc-button.el b/lisp/erc/erc-button.el
index 596f896d9c5..e1c10be53f6 100644
--- a/lisp/erc/erc-button.el
+++ b/lisp/erc/erc-button.el
@@ -189,7 +189,7 @@ CALLBACK is the function to call when the user push this 
button.
 
 PAR is a number of a regexp grouping whose text will be passed to
   CALLBACK.  There can be several PAR arguments."
-  :package-version '(ERC . "5.6") ; FIXME sync on release
+  :package-version '(ERC . "5.6")
   :type '(repeat
           (list :tag "Button"
                 (choice :tag "Matches"
@@ -713,7 +713,7 @@ Examples:
    (format
     \"ldapsearch -x -P 2 -h db.debian.org -b dc=debian,dc=org ircnick=%s\"
     nick)))"
-  :package-version '(ERC . "5.6") ; FIXME sync on release
+  :package-version '(ERC . "5.6")
   :type '(repeat (cons (string :tag "Op")
                        (choice function sexp))))
 
diff --git a/lisp/erc/erc-fill.el b/lisp/erc/erc-fill.el
index e8f3f624ff1..e48d5540c86 100644
--- a/lisp/erc/erc-fill.el
+++ b/lisp/erc/erc-fill.el
@@ -127,7 +127,7 @@ However, when `erc-fill-wrap-margin-side' is `left' or
 \"resolves\" to `left', ERC uses the width of the prompt if it's
 wider on MOTD's end, which really only matters when `erc-prompt'
 is a function."
-  :package-version '(ERC . "5.6") ; FIXME sync on release
+  :package-version '(ERC . "5.6")
   :type '(choice (const nil) integer))
 
 (defcustom erc-fill-wrap-margin-side nil
@@ -135,14 +135,14 @@ is a function."
 A value of nil means ERC should decide based on the value of
 `erc-insert-timestamp-function', which does not work for
 user-defined functions."
-  :package-version '(ERC . "5.6") ; FIXME sync on release
+  :package-version '(ERC . "5.6")
   :type '(choice (const nil) (const left) (const right)))
 
 (defcustom erc-fill-line-spacing nil
   "Extra space between messages on graphical displays.
 Its value should be larger than that of the variable
 `line-spacing', if set.  When unsure, start with 0.5."
-  :package-version '(ERC . "5.6") ; FIXME sync on release
+  :package-version '(ERC . "5.6")
   :type '(choice (const nil) number))
 
 (defvar-local erc-fill--function nil
@@ -228,7 +228,7 @@ You can put this on `erc-insert-modify-hook' and/or 
`erc-send-modify-hook'."
 A value of nil means ERC should use columns, which may happen
 regardless, depending on the Emacs version.  This option only
 matters when `erc-fill-wrap-mode' is enabled."
-  :package-version '(ERC . "5.6") ; FIXME sync on release
+  :package-version '(ERC . "5.6")
   :type 'boolean)
 
 (defcustom erc-fill-wrap-visual-keys 'non-input
@@ -240,7 +240,7 @@ never do so.  A value of `non-input' tells ERC to act like 
the
 value is nil in the input area and t elsewhere.  See related
 option `erc-fill-wrap-force-screen-line-movement' for behavior
 involving `next-line' and `previous-line'."
-  :package-version '(ERC . "5.6") ; FIXME sync on release
+  :package-version '(ERC . "5.6")
   :type '(choice (const nil) (const t) (const non-input)))
 
 (defcustom erc-fill-wrap-force-screen-line-movement '(non-input)
@@ -251,14 +251,14 @@ screen line even if the current 
`erc-fill-wrap-visual-keys' value
 would normally do otherwise.  For example, setting this to
 \\='(nil non-input) disables logical-line movement regardless of
 the value of `erc-fill-wrap-visual-keys'."
-  :package-version '(ERC . "5.6") ; FIXME sync on release
+  :package-version '(ERC . "5.6")
   :type '(set (const nil) (const non-input)))
 
 (defcustom erc-fill-wrap-merge t
   "Whether to consolidate messages from the same speaker.
 This tells ERC to omit redundant speaker labels for subsequent
 messages less than a day apart."
-  :package-version '(ERC . "5.6") ; FIXME sync on release
+  :package-version '(ERC . "5.6")
   :type 'boolean)
 
 (defun erc-fill--wrap-move (normal-cmd visual-cmd &rest args)
diff --git a/lisp/erc/erc-goodies.el b/lisp/erc/erc-goodies.el
index 1482c21e931..6c8ec567bd9 100644
--- a/lisp/erc/erc-goodies.el
+++ b/lisp/erc/erc-goodies.el
@@ -73,7 +73,7 @@ messages, such as after typing \"/msg NickServ help\".
 Note that users should consider this option's non-nil behavior to
 be experimental.  It currently only works with Emacs 28+."
   :group 'erc-display
-  :package-version '(ERC . "5.6") ; FIXME sync on release
+  :package-version '(ERC . "5.6")
   :type '(choice boolean (const relaxed)))
 
 ;;;###autoload(autoload 'erc-scrolltobottom-mode "erc-goodies" nil t)
@@ -286,7 +286,7 @@ displays an arrow in the left fringe or margin.  When it's
 `face', ERC adds the face `erc-keep-place-indicator-line' to the
 appropriate line.  A value of t does both."
   :group 'erc
-  :package-version '(ERC . "5.6") ; FIXME sync on release
+  :package-version '(ERC . "5.6")
   :type '(choice (const :tag "Use arrow" arrow)
                  (const :tag "Use face" face)
                  (const :tag "Use both arrow and face" t)))
@@ -295,14 +295,14 @@ appropriate line.  A value of t does both."
   "ERC buffer type in which to display `keep-place-indicator'.
 A value of t means \"all\" ERC buffers."
   :group 'erc
-  :package-version '(ERC . "5.6") ; FIXME sync on release
+  :package-version '(ERC . "5.6")
   :type '(choice (const t) (const server) (const target)))
 
 (defcustom erc-keep-place-indicator-follow nil
   "Whether to sync visual kept place to window's top when reading.
 For use with `erc-keep-place-indicator-mode'."
   :group 'erc
-  :package-version '(ERC . "5.6") ; FIXME sync on release
+  :package-version '(ERC . "5.6")
   :type 'boolean)
 
 (defface erc-keep-place-indicator-line
diff --git a/lisp/erc/erc-networks.el b/lisp/erc/erc-networks.el
index dd047243a3c..f168c90df65 100644
--- a/lisp/erc/erc-networks.el
+++ b/lisp/erc/erc-networks.el
@@ -478,7 +478,7 @@ NET is a symbol indicating to which network from 
`erc-networks-alist'
   this server corresponds,
 HOST is the server's hostname, and (TLS-)PORTS is either a
 number, a list of numbers, or a list of port ranges."
-  :package-version '(ERC . "5.6") ; FIXME sync on release
+  :package-version '(ERC . "5.6")
   :type '(alist :key-type (string :tag "Name")
                :value-type
                (group symbol (string :tag "Hostname")
diff --git a/lisp/erc/erc-nicks.el b/lisp/erc/erc-nicks.el
index d512455090b..fcd3afdbbc4 100644
--- a/lisp/erc/erc-nicks.el
+++ b/lisp/erc/erc-nicks.el
@@ -71,7 +71,7 @@
 
 (defgroup erc-nicks nil
   "Colorize nicknames in ERC target buffers."
-  :package-version '(ERC . "5.6") ; FIXME sync on release
+  :package-version '(ERC . "5.6")
   :group 'erc)
 
 (defcustom erc-nicks-ignore-chars ",`'_-"
diff --git a/lisp/erc/erc-speedbar.el b/lisp/erc/erc-speedbar.el
index bb5fad6f52f..ab06de6a42c 100644
--- a/lisp/erc/erc-speedbar.el
+++ b/lisp/erc/erc-speedbar.el
@@ -54,7 +54,7 @@ node `(speedbar) Top' for more about the underlying 
integration."
 
 (defcustom erc-speedbar-nicknames-window-width 18
   "Default width of the nicknames sidebar (in columns)."
-  :package-version '(ERC . "5.6") ; FIXME sync on release
+  :package-version '(ERC . "5.6")
   :type 'integer)
 
 (defcustom erc-speedbar-sort-users-type 'activity
@@ -69,7 +69,7 @@ nil            - Do not sort users"
 
 (defcustom erc-speedbar-hide-mode-topic 'headerline
   "Hide mode and topic lines."
-  :package-version '(ERC . "5.6") ; FIXME sync on release
+  :package-version '(ERC . "5.6")
   :type '(choice (const :tag "Always show" nil)
                  (const :tag "Always hide" t)
                  (const :tag "Omit when headerline visible" headerline)))
@@ -81,7 +81,7 @@ When the value is t, ERC uses `erc-current-nick-face' if
 When using the `nicks' module, you can see your nick as it
 appears to others by coordinating with the option
 `erc-nicks-skip-faces'."
-  :package-version '(ERC . "5.6") ; FIXME sync on release
+  :package-version '(ERC . "5.6")
   :type '(choice face (const :tag "Current nick or own speaker face" t)))
 
 (defvar erc-speedbar-key-map nil
diff --git a/lisp/erc/erc-stamp.el b/lisp/erc/erc-stamp.el
index e23380eb936..6eeb7706a61 100644
--- a/lisp/erc/erc-stamp.el
+++ b/lisp/erc/erc-stamp.el
@@ -85,7 +85,7 @@ screen when `erc-insert-timestamp-function' is set to
 Unlike `erc-timestamp-format' and `erc-timestamp-format-left', if
 the value of this option is nil, it falls back to using the value
 of `erc-timestamp-format'."
-  :package-version '(ERC . "5.6") ; FIXME sync on release
+  :package-version '(ERC . "5.6")
   :type '(choice (const nil)
                 (string)))
 (make-obsolete-variable 'erc-timestamp-format-right
@@ -159,7 +159,7 @@ Also affects the command `erc-echo-timestamp' (singular).  
See
 the ZONE parameter of `format-time-string' for a description of
 acceptable value types."
   :type '(choice boolean number (const wall) (list number string))
-  :package-version '(ERC . "5.6")) ; FIXME sync on release
+  :package-version '(ERC . "5.6"))
 
 (defcustom erc-timestamp-intangible nil
   "Whether the timestamps should be intangible, i.e. prevent the point
@@ -327,7 +327,7 @@ option adds a space after the end of a message if the stamp
 doesn't already start with one.  And when its value is t, it adds
 a single space, unconditionally."
   :type '(choice boolean integer)
-  :package-version '(ERC . "5.6")) ; FIXME sync on release
+  :package-version '(ERC . "5.6"))
 
 (defvar-local erc-stamp--margin-width nil
   "Width in columns of margin for `erc-stamp--display-margin-mode'.
diff --git a/lisp/erc/erc-status-sidebar.el b/lisp/erc/erc-status-sidebar.el
index cf3d20aeffa..d2ecce94bcd 100644
--- a/lisp/erc/erc-status-sidebar.el
+++ b/lisp/erc/erc-status-sidebar.el
@@ -102,7 +102,7 @@ Only consulted for certain values of 
`erc-status-sidebar-style'."
   "Whether to highlight the selected window's buffer in the sidebar.
 ERC uses the same instance across all frames.  May not be
 compatible with all values of `erc-status-sidebar-style'."
-  :package-version '(ERC . "5.6") ; FIXME sync on release
+  :package-version '(ERC . "5.6")
   :type 'boolean)
 
 (defcustom erc-status-sidebar-style 'all-queries-first
@@ -135,7 +135,7 @@ of the above sets aren't really interoperable, we don't 
offer
 them here as customization choices, but you can still specify
 them manually.  See doc strings for a description of their
 expected arguments and return values."
-  :package-version '(ERC . "5.6") ; FIXME sync on release
+  :package-version '(ERC . "5.6")
   :type '(choice (const channels-only)
                  (const all-mixed)
                  (const all-queries-first)
@@ -150,7 +150,7 @@ expected arguments and return values."
   "How to display a buffer when clicked.
 Values can be anything recognized by `display-buffer' for its
 ACTION parameter."
-  :package-version '(ERC . "5.6") ; FIXME sync on release
+  :package-version '(ERC . "5.6")
   :type '(choice (const :tag "Always use/create other window" t)
                  (const :tag "Let `display-buffer' decide" nil)
                  (const :tag "Same window" (display-buffer-same-window
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index cd1c925a757..edcfcf085e6 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -13,7 +13,7 @@
 ;;               Michael Olson (mwolson@gnu.org)
 ;;               Kelvin White (kwhite@gnu.org)
 ;; Version: 5.6-git
-;; Package-Requires: ((emacs "27.1") (compat "29.1.4.1"))
+;; Package-Requires: ((emacs "27.1") (compat "29.1.4.3"))
 ;; Keywords: IRC, chat, client, Internet
 ;; URL: https://www.gnu.org/software/emacs/erc.html
 
@@ -1354,13 +1354,13 @@ This will only be used if `erc-header-line-face-method' 
is non-nil."
     (((class color) (min-colors 88)) :foreground "SlateBlue")
     (t :foreground "blue"))
   "ERC face for notices."
-  :package-version '(ERC . "5.6") ; FIXME sync on release
+  :package-version '(ERC . "5.6")
   :group 'erc-faces)
 
 (defface erc-action-face '((((supports :weight semi-bold)) :weight semi-bold)
                            (t :weight bold))
   "ERC face for actions generated by /ME."
-  :package-version '(ERC . "5.6") ; FIXME sync on release
+  :package-version '(ERC . "5.6")
   :group 'erc-faces)
 
 (defface erc-error-face '((t :foreground "red"))
@@ -1678,7 +1678,7 @@ All are symbols indicating an inciting user action, such 
as the
 issuance of a slash command, the clicking of a URL hyperlink, or
 the invocation of an entry-point command.  See Info node `(erc)
 display-buffer' for more."
-  :package-version '(ERC . "5.6") ; FIXME sync on release
+  :package-version '(ERC . "5.6")
   :group 'erc-buffers
   :type erc--buffer-display-choices)
 
@@ -1702,7 +1702,7 @@ of the second, \"action\" argument.  The item's key is 
the symbol
   "Duration `erc-auto-reconnect-display' remains active.
 The countdown starts on MOTD and is canceled early by any
 \"slash\" command."
-  :package-version '(ERC . "5.6") ; FIXME sync on release
+  :package-version '(ERC . "5.6")
   :type 'integer
   :group 'erc-buffers)
 
@@ -1713,7 +1713,7 @@ for server buffers when automatically reconnecting, nor 
does it
 consider `erc-interactive-display' when users issue a /RECONNECT.
 Enabling this tells ERC to always display server buffers
 according to those options."
-  :package-version '(ERC . "5.6") ; FIXME sync on release
+  :package-version '(ERC . "5.6")
   :type 'boolean
   :group 'erc-buffers)
 
@@ -2150,7 +2150,7 @@ removed from the list will be disabled."
     (const :tag "unmorse: Translate morse code in messages" unmorse)
     (const :tag "xdcc: Act as an XDCC file-server" xdcc)
     (repeat :tag "Others" :inline t symbol))
-  :package-version '(ERC . "5.6") ; FIXME sync on release
+  :package-version '(ERC . "5.6")
   :group 'erc)
 
 (defun erc-update-modules ()
diff --git a/test/lisp/erc/resources/base/assoc/reconplay/foonet.eld 
b/test/lisp/erc/resources/base/assoc/reconplay/foonet.eld
index f916fea2374..15bcca2a623 100644
--- a/test/lisp/erc/resources/base/assoc/reconplay/foonet.eld
+++ b/test/lisp/erc/resources/base/assoc/reconplay/foonet.eld
@@ -1,5 +1,5 @@
 ;; -*- mode: lisp-data; -*-
-((pass 1 "PASS :changeme"))
+((pass 10 "PASS :changeme"))
 ((nick 1 "NICK tester"))
 ((user 1 "USER user 0 * :tester")
  (0.0 ":irc.foonet.org 001 tester :Welcome to the foonet IRC Network tester")
diff --git a/test/lisp/erc/resources/base/display-message/multibuf.eld 
b/test/lisp/erc/resources/base/display-message/multibuf.eld
index e49a654cd06..424a687e749 100644
--- a/test/lisp/erc/resources/base/display-message/multibuf.eld
+++ b/test/lisp/erc/resources/base/display-message/multibuf.eld
@@ -37,7 +37,7 @@
  (0.07 ":bob!~u@uee7kge7ua5sy.irc PRIVMSG #chan :Would all themselves laugh 
mortal.")
  (0.04 ":dummy!~u@rdjcgiwfuwqmc.irc PRIVMSG tester :hi")
  (0.06 ":bob!~u@uee7kge7ua5sy.irc PRIVMSG #chan :alice: It hath pleased the 
devil drunkenness to give place to the devil wrath; one unperfectness shows me 
another, to make me frankly despise myself.")
- (0.05 ":dummy!~u@rdjcgiwfuwqmc.irc QUIT :Quit: \2ERC\2 5.6-git (IRC client 
for GNU Emacs 30.0.50)")
+ (0.05 ":dummy!~u@rdjcgiwfuwqmc.irc QUIT :Quit: \2ERC\2 5.x (IRC client for 
GNU Emacs)")
  (0.08 ":alice!~u@uee7kge7ua5sy.irc PRIVMSG #chan :You speak of him when he 
was less furnished than now he is with that which makes him both without and 
within."))
 
 ((quit 10 "QUIT :\2ERC\2")