Re: [PATCH] Update ERC version to 5.5
"J.P." <[email protected]>
| Newsgroups | gmane.emacs.erc.general |
|---|---|
| Message-ID | <[email protected]> |
v2. Fix some merge conflicts. Update required Compat version. This has me wondering how soon after this release we can hope to start pushing 5.6 stuff to master. What if we end up needing bug fixes on emacs-29? Barring some way to have GNU ELPA "watch" emacs-29 instead of master (so that incrementing 29's 5.5 to 5.5.1 would trigger a release), we'd either have to hold off on diverging while patches pile up or just risk living with a buggy release until 5.6 is ready, which could be a while seeing as it's been over a year since 5.4.1 was let loose. Hm.
0000-v1-v2.diff
(text/x-patch, 5.3 KB)
From d184a0949ab5886f53ed966ce2ceda363f7cf599 Mon Sep 17 00:00:00 2001 From: "F. Jason Park" <[email protected]> Date: Thu, 19 Jan 2023 00:33:07 -0800 Subject: [PATCH 0/1] *** NOT A PATCH *** *** BLURB HERE *** F. Jason Park (1): Update ERC version to 5.5 doc/misc/erc.texi | 2 +- etc/ERC-NEWS | 10 ++++++++-- lisp/erc/erc-backend.el | 4 ++-- lisp/erc/erc-match.el | 2 +- lisp/erc/erc-sasl.el | 2 +- lisp/erc/erc-services.el | 4 ++-- lisp/erc/erc.el | 39 ++++++++++++++++++++------------------- 7 files changed, 35 insertions(+), 28 deletions(-) Range-diff: 1: ecf75a0f31e ! 1: d184a0949ab Update ERC version to 5.5 @@ Commit message Update ERC version to 5.5 * doc/misc/erc.texi: Update ERCVER to 5.5. + * etc/ERC-NEWS: Mention Compat dependency. * lisp/erc/erc-backend.el: (erc-server-reconnect-function, erc-tags-format): Update package version to 5.5. * lisp/erc/erc-match.el (erc-match-quote-when-adding): Update package @@ Commit message package version to 5.5. Change choice type from const to function-item. * lisp/erc/erc.el (erc-version): Update to 5.5. Also update - `customize-package-emacs-version-alist' entry and main Version header. + `customize-package-emacs-version-alist' entry, main Version header, + and Compat version for Package Requires. (erc-inhibit-multiline-input, erc-ask-about-multiline-input, erc-prompt-hidden, erc-hide-prompt, erc-unhide-query-prompt, erc-join-buffer, erc-reconnect-display, erc-kill-server-hook, @@ doc/misc/erc.texi @include docstyle.texi @syncodeindex fn cp + ## etc/ERC-NEWS ## +@@ etc/ERC-NEWS: off by default, new users are encouraged to enable them. + Clicking on 'irc://' and 'ircs://' links elsewhere in Emacs now does + the right thing most of the time. However, for security reasons, + users are now prompted to confirm connection parameters prior to lift +-off. See the new '(erc) Integrations' section in the Info manual to +-override this. ++off. See the new '(erc) Integrations' section in the Info manual for ++details. + + ** Miscellaneous behavioral changes impacting the user experience. + A bug has been fixed that saw prompts being mangled, doubled, or +@@ etc/ERC-NEWS: file called erc-common.el. This was done to further lessen the + various complications arising from the mutual dependency between 'erc' + and 'erc-backend'. + ++ERC now relies on the Compat library from GNU ELPA to supply forward ++compatibility shims for users running older versions of Emacs. The ++required Compat version resides atop ERC's main library file, in the ++'Package-Requires' header. Third-party ERC modules will benefit ++automatically from this adoption. ++ + The function 'erc-network' always returns non-nil in server and target + buffers belonging to a successfully established IRC connection, even + after that connection has been closed. (Also see the note in the + ## lisp/erc/erc-backend.el ## @@ lisp/erc/erc-backend.el: erc-server-reconnect-function include exponential backoff and probing for connectivity prior to @@ lisp/erc/erc-services.el @@ lisp/erc/erc-services.el: erc-auth-source-services-function services. In return, ERC expects a string to send as the password, or nil, to fall through to the next method, such as - prompting. See info node `(erc) Connecting' for details." + prompting. See info node `(erc) auth-source' for details." - :package-version '(ERC . "5.4.1") ; FIXME update when publishing to ELPA - :type '(choice (const erc-auth-source-search) + :package-version '(ERC . "5.5") @@ lisp/erc/erc.el ;; Michael Olson ([email protected]) ;; Kelvin White ([email protected]) -;; Version: 5.4.1 +-;; Package-Requires: ((emacs "27.1") (compat "28.1.2.0")) +;; Version: 5.5 - ;; Package-Requires: ((emacs "27.1") (compat "28.1.2.0")) ++;; Package-Requires: ((emacs "27.1") (compat "29.1.2.0")) ;; Keywords: IRC, chat, client, Internet ;; URL: https://www.gnu.org/software/emacs/erc.html + @@ (require 'iso8601) (eval-when-compile (require 'subr-x) (require 'url-parse)) @@ lisp/erc/erc.el: erc-reconnect-display @@ lisp/erc/erc.el: erc-auth-source-server-function explicit `:password' argument to entry-point commands `erc' and `erc-tls' also inhibits lookup, as does setting this option to - nil. See info node `(erc) Connecting' for details." + nil. See info node `(erc) auth-source' for details." - :package-version '(ERC . "5.4.1") ; FIXME update when publishing to ELPA + :package-version '(ERC . "5.5") :group 'erc @@ lisp/erc/erc.el: erc-auth-source-server-function @@ lisp/erc/erc.el: erc-auth-source-join-function option itself to nil tells ERC to always forgo consulting auth-source for channel keys. For more information, see info - node `(erc) Connecting'." + node `(erc) auth-source'." - :package-version '(ERC . "5.4.1") ; FIXME update when publishing to ELPA + :package-version '(ERC . "5.5") :group 'erc -- 2.38.1
0001-Update-ERC-version-to-5.5.patch
(text/x-patch, 11.9 KB)
From d184a0949ab5886f53ed966ce2ceda363f7cf599 Mon Sep 17 00:00:00 2001 From: "F. Jason Park" <[email protected]> Date: Tue, 29 Nov 2022 22:53:44 -0800 Subject: [PATCH 1/1] Update ERC version to 5.5 * doc/misc/erc.texi: Update ERCVER to 5.5. * etc/ERC-NEWS: Mention Compat dependency. * lisp/erc/erc-backend.el: (erc-server-reconnect-function, erc-tags-format): Update package version to 5.5. * lisp/erc/erc-match.el (erc-match-quote-when-adding): Update package version to 5.5. * lisp/erc/erc-sasl.el (erc-sasl): Update package version to 5.5. * lisp/erc/erc-services.el (erc-auth-source-services-function): Update package version to 5.5. Change choice type from const to function-item. * lisp/erc/erc.el (erc-version): Update to 5.5. Also update `customize-package-emacs-version-alist' entry, main Version header, and Compat version for Package Requires. (erc-inhibit-multiline-input, erc-ask-about-multiline-input, erc-prompt-hidden, erc-hide-prompt, erc-unhide-query-prompt, erc-join-buffer, erc-reconnect-display, erc-kill-server-hook, erc-kill-channel-hook, erc-kill-buffer-hook, erc-url-connect-function): Update package version to 5.5. (erc-auth-source-server-function, erc-auth-source-join-function): Update package version to 5.5. Change choice type from const to function-item. --- doc/misc/erc.texi | 2 +- etc/ERC-NEWS | 10 ++++++++-- lisp/erc/erc-backend.el | 4 ++-- lisp/erc/erc-match.el | 2 +- lisp/erc/erc-sasl.el | 2 +- lisp/erc/erc-services.el | 4 ++-- lisp/erc/erc.el | 39 ++++++++++++++++++++------------------- 7 files changed, 35 insertions(+), 28 deletions(-) diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi index 23cdcbff575..3e0fe446633 100644 --- a/doc/misc/erc.texi +++ b/doc/misc/erc.texi @@ -2,7 +2,7 @@ @c %**start of header @setfilename ../../info/erc.info @settitle ERC Manual -@set ERCVER 5.4.1 +@set ERCVER 5.5 @set ERCDIST as distributed with Emacs @value{EMACSVER} @include docstyle.texi @syncodeindex fn cp diff --git a/etc/ERC-NEWS b/etc/ERC-NEWS index 9d09172401f..8c925bfea9e 100644 --- a/etc/ERC-NEWS +++ b/etc/ERC-NEWS @@ -88,8 +88,8 @@ off by default, new users are encouraged to enable them. Clicking on 'irc://' and 'ircs://' links elsewhere in Emacs now does the right thing most of the time. However, for security reasons, users are now prompted to confirm connection parameters prior to lift -off. See the new '(erc) Integrations' section in the Info manual to -override this. +off. See the new '(erc) Integrations' section in the Info manual for +details. ** Miscellaneous behavioral changes impacting the user experience. A bug has been fixed that saw prompts being mangled, doubled, or @@ -117,6 +117,12 @@ file called erc-common.el. This was done to further lessen the various complications arising from the mutual dependency between 'erc' and 'erc-backend'. +ERC now relies on the Compat library from GNU ELPA to supply forward +compatibility shims for users running older versions of Emacs. The +required Compat version resides atop ERC's main library file, in the +'Package-Requires' header. Third-party ERC modules will benefit +automatically from this adoption. + The function 'erc-network' always returns non-nil in server and target buffers belonging to a successfully established IRC connection, even after that connection has been closed. (Also see the note in the diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el index 1da701aebc4..f6e29f276ba 100644 --- a/lisp/erc/erc-backend.el +++ b/lisp/erc/erc-backend.el @@ -425,7 +425,7 @@ erc-server-reconnect-function include exponential backoff and probing for connectivity prior to dialing. Use `erc-schedule-reconnect' to instead try again later and optionally alter the attempts tally." - :package-version '(ERC . "5.4.1") ; FIXME on next release + :package-version '(ERC . "5.5") :type '(choice (function-item erc-server-delayed-reconnect) function)) @@ -1167,7 +1167,7 @@ erc-tags-format will not be compatible with the legacy format. User code should eventually transition to expecting this \"5.5+ variant\" and set this option to nil." - :package-version '(ERC . "5.4.1") ; FIXME increment on next release + :package-version '(ERC . "5.5") :type '(choice (const nil) (const legacy) (const overridable))) diff --git a/lisp/erc/erc-match.el b/lisp/erc/erc-match.el index 499bcaf5724..52ee5c855f3 100644 --- a/lisp/erc/erc-match.el +++ b/lisp/erc/erc-match.el @@ -244,7 +244,7 @@ erc-match-quote-when-adding "Whether to `regexp-quote' when adding to a match list interactively. When the value is a boolean, the opposite behavior will be made available via universal argument." - :package-version '(ERC . "5.4.1") ; FIXME increment on next release + :package-version '(ERC . "5.5") :type '(choice (const ask) (const t) (const nil))) diff --git a/lisp/erc/erc-sasl.el b/lisp/erc/erc-sasl.el index a0b36d07613..aaa4f1e0a27 100644 --- a/lisp/erc/erc-sasl.el +++ b/lisp/erc/erc-sasl.el @@ -52,7 +52,7 @@ (defgroup erc-sasl nil "SASL for ERC." :group 'erc - :package-version '(ERC . "5.4.1")) ; FIXME increment on next release + :package-version '(ERC . "5.5")) (defcustom erc-sasl-mechanism 'plain "SASL mechanism to connect with. diff --git a/lisp/erc/erc-services.el b/lisp/erc/erc-services.el index 1c2fc2fcdc8..6ede16d3b57 100644 --- a/lisp/erc/erc-services.el +++ b/lisp/erc/erc-services.el @@ -181,8 +181,8 @@ erc-auth-source-services-function services. In return, ERC expects a string to send as the password, or nil, to fall through to the next method, such as prompting. See info node `(erc) auth-source' for details." - :package-version '(ERC . "5.4.1") ; FIXME update when publishing to ELPA - :type '(choice (const erc-auth-source-search) + :package-version '(ERC . "5.5") + :type '(choice (function-item erc-auth-source-search) (const nil) function)) diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index 7f51b7bfb2e..f97ca0fb92d 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -12,8 +12,8 @@ ;; David Edmondson ([email protected]) ;; Michael Olson ([email protected]) ;; Kelvin White ([email protected]) -;; Version: 5.4.1 -;; Package-Requires: ((emacs "27.1") (compat "28.1.2.0")) +;; Version: 5.5 +;; Package-Requires: ((emacs "27.1") (compat "29.1.2.0")) ;; Keywords: IRC, chat, client, Internet ;; URL: https://www.gnu.org/software/emacs/erc.html @@ -72,7 +72,7 @@ (require 'iso8601) (eval-when-compile (require 'subr-x) (require 'url-parse)) -(defconst erc-version "5.4.1" +(defconst erc-version "5.5" "This version of ERC.") (defvar erc-official-location @@ -87,7 +87,8 @@ erc-official-location '(ERC ("5.2" . "22.1") ("5.3" . "23.1") ("5.4" . "28.1") - ("5.4.1" . "29.1"))) + ("5.4.1" . "29.1") + ("5.5" . "29.1"))) (defgroup erc nil "Emacs Internet Relay Chat client." @@ -251,19 +252,19 @@ erc-inhibit-multiline-input Issue an error when the number of input lines submitted for sending exceeds this value. The value t means disallow more than 1 line of input." - :package-version '(ERC . "5.4.1") ; FIXME match to next release + :package-version '(ERC . "5.5") :group 'erc :type '(choice integer boolean)) (defcustom erc-ask-about-multiline-input nil "Whether to ask to ignore `erc-inhibit-multiline-input' when tripped." - :package-version '(ERC . "5.4.1") ; FIXME match to next release + :package-version '(ERC . "5.5") :group 'erc :type 'boolean) (defcustom erc-prompt-hidden ">" "Text to show in lieu of the prompt when hidden." - :package-version '(ERC . "5.4.1") ; FIXME increment on next ELPA release + :package-version '(ERC . "5.5") :group 'erc-display :type 'string) @@ -273,7 +274,7 @@ erc-hide-prompt prompt remains unhidden until the next disconnection. Channel prompts are unhidden upon rejoining. See `erc-unhide-query-prompt' for behavior concerning query prompts." - :package-version '(ERC . "5.4.1") ; FIXME increment on next ELPA release + :package-version '(ERC . "5.5") :group 'erc-display :type '(choice (const :tag "Always hide prompt" t) (set (const server) @@ -285,7 +286,7 @@ erc-unhide-query-prompt Otherwise, prompts in a connection's query buffers remain hidden until the user types in the input area or a new message arrives from the target." - :package-version '(ERC . "5.4.1") ; FIXME increment on next ELPA release + :package-version '(ERC . "5.5") :group 'erc-display ;; Extensions may one day offer a way to discover whether a target ;; is online. When that happens, this can be expanded accordingly. @@ -1480,7 +1481,7 @@ erc-join-buffer `bury' - bury it in a new buffer, `buffer' - in place of the current buffer, any other value - in place of the current buffer." - :package-version '(ERC . "5.4.1") ; FIXME increment upon publishing to ELPA + :package-version '(ERC . "5.5") :group 'erc-buffers :type '(choice (const :tag "Split window and select" window) (const :tag "Split window, don't select" window-noselect) @@ -1496,7 +1497,7 @@ erc-reconnect-display issuing a /reconnect command or reinvoking `erc-tls' with the same args (assuming success, of course). See `erc-join-buffer' for a description of possible values." - :package-version '(ERC . "5.4.1") ; FIXME increment upon publishing to ELPA + :package-version '(ERC . "5.5") :group 'erc-buffers :type '(choice (const :tag "Use value of `erc-join-buffer'" nil) (const :tag "Split window and select" window) @@ -3260,9 +3261,9 @@ erc-auth-source-server-function explicit `:password' argument to entry-point commands `erc' and `erc-tls' also inhibits lookup, as does setting this option to nil. See info node `(erc) auth-source' for details." - :package-version '(ERC . "5.4.1") ; FIXME update when publishing to ELPA + :package-version '(ERC . "5.5") :group 'erc - :type '(choice (const erc-auth-source-search) + :type '(choice (function-item erc-auth-source-search) (const nil) function)) @@ -3275,9 +3276,9 @@ erc-auth-source-join-function option itself to nil tells ERC to always forgo consulting auth-source for channel keys. For more information, see info node `(erc) auth-source'." - :package-version '(ERC . "5.4.1") ; FIXME update when publishing to ELPA + :package-version '(ERC . "5.5") :group 'erc - :type '(choice (const erc-auth-source-search) + :type '(choice (function-item erc-auth-source-search) (const nil) function)) @@ -7214,7 +7215,7 @@ erc-format-message (defcustom erc-kill-server-hook '(erc-kill-server erc-networks-shrink-ids-and-buffer-names) "Invoked whenever a live server buffer is killed via `kill-buffer'." - :package-version '(ERC . "5.4.1") ; FIXME increment upon publishing to ELPA + :package-version '(ERC . "5.5") :group 'erc-hooks :type 'hook) @@ -7223,7 +7224,7 @@ erc-kill-channel-hook erc-networks-shrink-ids-and-buffer-names erc-networks-rename-surviving-target-buffer) "Invoked whenever a channel-buffer is killed via `kill-buffer'." - :package-version '(ERC . "5.4.1") ; FIXME increment upon publishing to ELPA + :package-version '(ERC . "5.5") :group 'erc-hooks :type 'hook) @@ -7233,7 +7234,7 @@ erc-kill-buffer-hook "Hook run whenever a query buffer is killed. See also `kill-buffer'." - :package-version '(ERC . "5.4.1") ; FIXME increment upon publishing to ELPA + :package-version '(ERC . "5.5") :group 'erc-hooks :type 'hook) @@ -7312,7 +7313,7 @@ erc-url-connect-function \"ircs\", followed by any number of keyword arguments recognized by `erc' and `erc-tls'." :group 'erc - :package-version '(ERC . "5.4.1") ; FIXME increment on release + :package-version '(ERC . "5.5") :type '(choice (const nil) function)) (defun erc--url-default-connect-function (scheme &rest plist) -- 2.38.1