>From a6662c04e156b1dd37661991a045acaf3c5cb9b4 Mon Sep 17 00:00:00 2001 From: "F. Jason Park" Date: Tue, 14 Mar 2023 06:25:32 -0700 Subject: [PATCH 0/3] *** NOT A PATCH *** *** BLURB HERE *** F. Jason Park (3): [5.6] Don't associate ERC modules with undefined groups [5.6] Warn when setting minor-mode vars for ERC modules [5.6] Fill doc strings for ERC modules. lisp/erc/erc-capab.el | 1 + lisp/erc/erc-common.el | 146 +++++++++++++++++++++++++++++++++---- lisp/erc/erc.el | 3 +- test/lisp/erc/erc-tests.el | 88 +++++++++++++++++----- 4 files changed, 207 insertions(+), 31 deletions(-) Interdiff: diff --git a/lisp/erc/erc-common.el b/lisp/erc/erc-common.el index 4332ed00cfb..522803b91e2 100644 --- a/lisp/erc/erc-common.el +++ b/lisp/erc/erc-common.el @@ -162,11 +162,14 @@ erc--assemble-toggle erc-modules))) `(,(if val v `(not ,v))))) (let ((erc--inside-mode-toggle-p t)) - (customize-set-variable - 'erc-modules (,(if val 'cons 'delq) - ',(erc--normalize-module-symbol name) - erc-modules)))) + (custom-set-variables + `(erc-modules ',(,(if val 'cons 'delq) + ',(erc--normalize-module-symbol name) + erc-modules))))) (setq ,mode ,val) + ;; Avoid "changed" state from `erc-update-modules' + (unless (called-interactively-p 'any) + (put ',mode 'standard-value (list ,val))) ,@body))))) ;; This is a migration helper that determines a module's `:group' @@ -203,9 +206,9 @@ erc--find-group (defun erc--custom-set-minor-mode (variable value) (let ((name (get variable 'erc-module)) (erc--inside-mode-toggle-p t)) - (customize-set-variable - 'erc-modules - (if value (cl-pushnew name erc-modules) (delq name erc-modules))) + (custom-set-variables + `(erc-modules + ',(if value (cl-pushnew name erc-modules) (delq name erc-modules)))) (custom-set-minor-mode variable value))) ;; This exists as a separate, top-level function to prevent the byte diff --git a/test/lisp/erc/erc-tests.el b/test/lisp/erc/erc-tests.el index 62480c0604e..ef742c853d6 100644 --- a/test/lisp/erc/erc-tests.el +++ b/test/lisp/erc/erc-tests.el @@ -1340,9 +1340,11 @@ define-erc-module--global (unless (or erc--inside-mode-toggle-p (memq 'mname erc-modules)) (let ((erc--inside-mode-toggle-p t)) - (customize-set-variable - 'erc-modules (cons 'mname erc-modules)))) + (custom-set-variables + `(erc-modules ',(cons 'mname erc-modules))))) (setq erc-mname-mode t) + (unless (called-interactively-p 'any) + (put 'erc-mname-mode 'standard-value (list t))) (ignore a) (ignore b)) (defun erc-mname-disable () @@ -1351,9 +1353,11 @@ define-erc-module--global (unless (or erc--inside-mode-toggle-p (not (memq 'mname erc-modules))) (let ((erc--inside-mode-toggle-p t)) - (customize-set-variable - 'erc-modules (delq 'mname erc-modules)))) + (custom-set-variables + `(erc-modules ',(delq 'mname erc-modules))))) (setq erc-mname-mode nil) + (unless (called-interactively-p 'any) + (put 'erc-mname-mode 'standard-value (list nil))) (ignore c) (ignore d)) (defalias 'erc-malias-mode #'erc-mname-mode) -- 2.39.2