>From 0faa97e1c1fbba6d008f2db217d2ce6558216898 Mon Sep 17 00:00:00 2001 From: "F. Jason Park" Date: Tue, 25 Apr 2023 06:22:03 -0700 Subject: [PATCH 0/2] *** NOT A PATCH *** *** BLURB HERE *** F. Jason Park (2): * doc/misc/erc.texi: Elaborate on upgrading via ELPA. Explain ERC 5.5 regressions in new version 5.5.0.29.1 doc/misc/erc.texi | 22 ++++++++++++++++++++- etc/ERC-NEWS | 4 +--- lisp/erc/erc-dcc.el | 6 +++++- lisp/erc/erc-networks.el | 7 +++++-- lisp/erc/erc.el | 41 +++++++++++++++++++++++++++++++--------- 5 files changed, 64 insertions(+), 16 deletions(-) Interdiff: diff --git a/lisp/erc/erc-networks.el b/lisp/erc/erc-networks.el index 97ab8ecced3..e2ba59a3c47 100644 --- a/lisp/erc/erc-networks.el +++ b/lisp/erc/erc-networks.el @@ -1494,14 +1494,11 @@ erc-networks-on-MOTD-end (memq (erc--target-symbol erc--target) erc-networks--bouncer-targets))) proc) - (require 'info nil t) (let ((m (concat "Unexpected state detected. If you've just issued an" " /MOTD, please know that the command is bugged in ERC" " 5.5 (Emacs 29) but will be fixed in the next release." " Otherwise, please report this occurrence via" - (substitute-command-keys " \\[erc-bug].") - " For additional help options, see" - " Info:\"(erc) Getting Help and Reporting Bugs\"."))) + (substitute-command-keys " \\[erc-bug].")))) (erc-display-error-notice parsed m)))) ;; For now, retain compatibility with erc-server-NNN-functions. diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index 42b4bec9e1c..de0810364bf 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -1505,10 +1505,9 @@ erc-reconnect-display :package-version '(ERC . "5.5") :group 'erc-buffers :set (lambda (sym val) - (when val + (when (set sym val) (lwarn 'erc :warning "Setting `%s' to `%s' is currently bugged; %s" - sym val "see doc string for more information.")) - (set sym val)) + sym val "see doc string for more information."))) :type '(choice (const :tag "Use value of `erc-join-buffer'" nil) (const :tag "Split window and select" window) (const :tag "Split window, don't select" window-noselect) @@ -4544,22 +4543,20 @@ erc-query-on-unjoined-chan-privmsg WARNING: this option was mistakenly removed from ERC 5.5's client code, so setting it to nil is temporarily ineffective. That is, ERC now always creates a buffer when receiving a PRIVMSG directed -at a channel for which none exists. Note also that despite the -option's name and the upper portion of this doc string, in which -\"query\" appears to refer to any exchange with a target other -than the server itself, the option did not previously allow for -opting out of buffer creation for direct messages, at least not -in Emacs 27 and 28. However, such behavior continues to be -attainable by setting `erc-auto-query' to nil. If needing to -restore pre-5.5 functionality immediately, see Info node `(erc) -Upgrading'." +at a channel for which none exists. And despite this option's +name and its doc string's use of the term \"query\" to refer to +any conversation with a target, it did not previously allow for +opting out of buffer creation for direct messages (at least not +in Emacs 27 and 28). However, such behavior has always been and +continues to be available by setting `erc-auto-query' to nil. If +needing to restore pre-5.5 functionality immediately, see Info +node `(erc) Upgrading'." :group 'erc-query :set (lambda (sym val) - (unless val + (unless (set sym val) (lwarn 'erc :warning "Setting `%s' to nil is currently ineffective; %s" - sym "see doc string for details.")) - (set sym val)) + sym "see doc string for details."))) :type 'boolean) (defcustom erc-format-query-as-channel-p t -- 2.40.0