Re: master fa4203300fd: Merge remote-tracking branch 'origin/feature/which-key-in-core'

[Philip Kaludercic <philipk@posteo.net>]

[-- Attachment #1: Type: text/plain, Size: 1142 bytes --]

Michael Albinus <michael.albinus@gmx.de> writes:

> Philip Kaludercic <philipk@posteo.net> writes:
>
>> branch: master
>> commit fa4203300fde6820a017bf1089652fb95759d68c
>> Merge: a7dff8c53dd cc0a3a5f65b
>> Author: Philip Kaludercic <philipk@posteo.net>
>> Commit: Philip Kaludercic <philipk@posteo.net>
>>
>>     Merge remote-tracking branch 'origin/feature/which-key-in-core'
>> ---
>>  etc/NEWS                     |    7 +
>>  lisp/which-key.el            | 2814 ++++++++++++++++++++++++++++++++++++++++++
>>  test/lisp/which-key-tests.el |  267 ++++
>>  3 files changed, 3088 insertions(+)
>
> Seen in the emacs-30 branch:
>
> # make -C test test-custom-opts
> ...
> The following options might have problems:
> variable: which-key-separator
>    value: nil
>     type: (string)
> variable: which-key-ellipsis
>    value: nil
>     type: (string)
> ...
>    FAILED  1/1  check-for-wrong-custom-opts (39.873179 sec) at misc/test-custom-opts.el:33
>
> Ran 1 tests, 0 results as expected, 1 unexpected (2024-06-24 21:14:57+0200, 40.332174 sec)
>
> 1 unexpected results:
>    FAILED  check-for-wrong-custom-opts

This should fix the issue:


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-lisp-which-key.el-which-key-dont-use-unicode-Add-ini.patch --]
[-- Type: text/x-patch, Size: 1131 bytes --]

From c707ba33a4c3b1de7cb7e8c35736e48ced81a0e0 Mon Sep 17 00:00:00 2001
From: Philip Kaludercic <philipk@posteo.net>
Date: Mon, 24 Jun 2024 22:15:25 +0200
Subject: [PATCH] ; * lisp/which-key.el (which-key-dont-use-unicode): Add
 :initialize

This fixes the change from 768e92b9, which accidentally would call
'custom-reevaluate-setting' on user options before they were registered,
initialising their default value to nil.  When the 'defcustom'
expressions were evaluated later on, they were not properly initialised
as their variables were already bound to some value (nil).

https://lists.gnu.org/archive/html/emacs-devel/2024-06/msg00825.html
---
 lisp/which-key.el | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lisp/which-key.el b/lisp/which-key.el
index 91007ce4ada..8b78bfb2576 100644
--- a/lisp/which-key.el
+++ b/lisp/which-key.el
@@ -133,6 +133,7 @@ which-key-dont-use-unicode
          (mapc #'custom-reevaluate-setting
                '(which-key-separator
                  which-key-ellipsis)))
+  :initialize #'custom-initialize-changed
   :type 'boolean
   :package-version "1.0" :version "30.1")
 
-- 
2.45.2


[-- Attachment #3: Type: text/plain, Size: 37 bytes --]


-- 
	Philip Kaludercic on peregrine