>>>>> On Wed, 24 Nov 2021 08:48:25 -0500 (EST), larsi@gnus.org (Lars Ingebrigtsen) said:
Lars> diff --git a/lisp/faces.el b/lisp/faces.el
Lars> index a07f8c6..e9f795c 100644
Lars> --- a/lisp/faces.el
Lars> +++ b/lisp/faces.el
Lars> @@ -2611,9 +2611,11 @@ non-nil."
Lars> (defface mode-line
Lars> '((((class color) (min-colors 88))
Lars> :box (:line-width -1 :style released-button)
Lars> + :inherit 'variable-pitch
Lars> :background "grey75" :foreground "black")
Lars> (t
Lars> - :inverse-video t))
Lars> + :inverse-video t
Lars> + :inherit 'variable-pitch))
Lars> "Basic mode line face for selected window."
Lars> :version "21.1"
Lars> :group 'mode-line-faces
M-x customize-face RET mode-line RET
now shows only the lisp expression for the mode-line face. Iʼve fixed
this one, but the default face has the same issue, so Iʼm going to
assume you changed something there too :-)
Robert
--
Robert Pluim <rpluim@gmail.com> writes: > now shows only the lisp expression for the mode-line face. Iʼve fixed > this one, but the default face has the same issue, so Iʼm going to > assume you changed something there too :-) Nope; haven't touched the default face. -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no
>>>>> On Thu, 25 Nov 2021 18:40:08 +0100, Lars Ingebrigtsen <larsi@gnus.org> said: Lars> Robert Pluim <rpluim@gmail.com> writes: >> now shows only the lisp expression for the mode-line face. Iʼve fixed >> this one, but the default face has the same issue, so Iʼm going to >> assume you changed something there too :-) Lars> Nope; haven't touched the default face. Oh yes you have. </panto> The following patch fixes it, otherwise the :weight shows up as "regular", which I guess customize doesnʼt like. diff --git a/src/font.c b/src/font.c index d423fd46b7..0cedb230c8 100644 --- a/src/font.c +++ b/src/font.c @@ -70,7 +70,7 @@ #define DEFAULT_ENCODING Qiso8859_1 { 40, { "ultra-light", "ultralight", "extra-light", "extralight" }}, { 50, { "light" }}, { 55, { "semi-light", "semilight", "demilight" }}, - { 80, { "regular", "normal", "unspecified", "book" }}, + { 80, { "normal", "regular", "unspecified", "book" }}, { 100, { "medium" }}, { 180, { "semi-bold", "semibold", "demibold", "demi-bold", "demi" }}, { 200, { "bold" }},
Robert Pluim <rpluim@gmail.com> writes: > Oh yes you have. </panto> :-) > The following patch fixes it, otherwise the :weight shows up as > "regular", which I guess customize doesnʼt like. > > diff --git a/src/font.c b/src/font.c > index d423fd46b7..0cedb230c8 100644 > --- a/src/font.c > +++ b/src/font.c > @@ -70,7 +70,7 @@ #define DEFAULT_ENCODING Qiso8859_1 > { 40, { "ultra-light", "ultralight", "extra-light", "extralight" }}, > { 50, { "light" }}, > { 55, { "semi-light", "semilight", "demilight" }}, > - { 80, { "regular", "normal", "unspecified", "book" }}, > + { 80, { "normal", "regular", "unspecified", "book" }}, Hm. But is that a problem with Customize or this? I guess "normal" is more normal than regular, so perhaps this is the right solution. -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no
> From: Lars Ingebrigtsen <larsi@gnus.org>
> Date: Thu, 25 Nov 2021 19:18:15 +0100
> Cc: emacs-devel@gnu.org
>
> > diff --git a/src/font.c b/src/font.c
> > index d423fd46b7..0cedb230c8 100644
> > --- a/src/font.c
> > +++ b/src/font.c
> > @@ -70,7 +70,7 @@ #define DEFAULT_ENCODING Qiso8859_1
> > { 40, { "ultra-light", "ultralight", "extra-light", "extralight" }},
> > { 50, { "light" }},
> > { 55, { "semi-light", "semilight", "demilight" }},
> > - { 80, { "regular", "normal", "unspecified", "book" }},
> > + { 80, { "normal", "regular", "unspecified", "book" }},
>
> Hm. But is that a problem with Customize or this? I guess "normal" is
> more normal than regular, so perhaps this is the right solution.
I think it's a bug in Customize that it doesn't support the aliases
here. If nevertheless we fix it in font.c, we should have a prominent
comment there explaining the importance of the order.
>>>>> On Thu, 25 Nov 2021 19:18:15 +0100, Lars Ingebrigtsen <larsi@gnus.org> said:
Lars> Robert Pluim <rpluim@gmail.com> writes:
>> Oh yes you have. </panto>
Lars> :-)
>> The following patch fixes it, otherwise the :weight shows up as
>> "regular", which I guess customize doesnʼt like.
>>
>> diff --git a/src/font.c b/src/font.c
>> index d423fd46b7..0cedb230c8 100644
>> --- a/src/font.c
>> +++ b/src/font.c
>> @@ -70,7 +70,7 @@ #define DEFAULT_ENCODING Qiso8859_1
>> { 40, { "ultra-light", "ultralight", "extra-light", "extralight" }},
>> { 50, { "light" }},
>> { 55, { "semi-light", "semilight", "demilight" }},
>> - { 80, { "regular", "normal", "unspecified", "book" }},
>> + { 80, { "normal", "regular", "unspecified", "book" }},
Lars> Hm. But is that a problem with Customize or this? I guess "normal" is
Lars> more normal than regular, so perhaps this is the right solution.
I donʼt know, I couldn't find anything obvious in customize where I
could get it to recognize 'regular', but that might be the place to
put it. Doing it here feels fragile.
Robert
--
>>>>> On Thu, 25 Nov 2021 20:28:27 +0200, Eli Zaretskii <eliz@gnu.org> said: >> From: Lars Ingebrigtsen <larsi@gnus.org> >> Date: Thu, 25 Nov 2021 19:18:15 +0100 >> Cc: emacs-devel@gnu.org >> >> > diff --git a/src/font.c b/src/font.c >> > index d423fd46b7..0cedb230c8 100644 >> > --- a/src/font.c >> > +++ b/src/font.c >> > @@ -70,7 +70,7 @@ #define DEFAULT_ENCODING Qiso8859_1 >> > { 40, { "ultra-light", "ultralight", "extra-light", "extralight" }}, >> > { 50, { "light" }}, >> > { 55, { "semi-light", "semilight", "demilight" }}, >> > - { 80, { "regular", "normal", "unspecified", "book" }}, >> > + { 80, { "normal", "regular", "unspecified", "book" }}, >> >> Hm. But is that a problem with Customize or this? I guess "normal" is >> more normal than regular, so perhaps this is the right solution. Eli> I think it's a bug in Customize that it doesn't support the aliases Eli> here. If nevertheless we fix it in font.c, we should have a prominent Eli> comment there explaining the importance of the order. This also does it, but those weights look seriously out of whack compared to the list in font.c diff --git a/lisp/cus-face.el b/lisp/cus-face.el index 5037ee77c7..82fe8f23be 100644 --- a/lisp/cus-face.el +++ b/lisp/cus-face.el @@ -92,7 +92,7 @@ custom-face-attributes (const :tag "semilight" semi-light) (const :tag "book" semi-light) (const :tag "normal" normal) - (const :tag "regular" normal) + (const :tag "regular" regular) (const :tag "medium" normal) (const :tag "semibold" semi-bold) (const :tag "demibold" semi-bold)
> From: Robert Pluim <rpluim@gmail.com>
> Date: Thu, 25 Nov 2021 19:32:37 +0100
> Cc: emacs-devel@gnu.org
>
> Lars> Hm. But is that a problem with Customize or this? I guess "normal" is
> Lars> more normal than regular, so perhaps this is the right solution.
>
> I donʼt know, I couldn't find anything obvious in customize where I
> could get it to recognize 'regular'
Where does it recognize 'normal'?
> From: Robert Pluim <rpluim@gmail.com> > Cc: Lars Ingebrigtsen <larsi@gnus.org>, emacs-devel@gnu.org > Date: Thu, 25 Nov 2021 19:44:40 +0100 > > This also does it, but those weights look seriously out of whack > compared to the list in font.c Does the below look reasonable? diff --git a/lisp/cus-face.el b/lisp/cus-face.el index 5037ee7..5323639 100644 --- a/lisp/cus-face.el +++ b/lisp/cus-face.el @@ -85,22 +85,32 @@ custom-face-attributes (choice :tag "Weight" :help-echo "Font weight." :value normal ; default + (const :tag "thin" thin) (const :tag "ultralight" ultra-light) - (const :tag "extralight" extra-light) + (const :tag "ultra-light" ultra-light) + (const :tag "extralight" ultra-light) + (const :tag "extra-light" ultra-light) (const :tag "light" light) - (const :tag "thin" thin) (const :tag "semilight" semi-light) - (const :tag "book" semi-light) + (const :tag "semi-light" semi-light) + (const :tag "demilight" semi-light) (const :tag "normal" normal) (const :tag "regular" normal) - (const :tag "medium" normal) + (const :tag "book" normal) + (const :tag "medium" medium) (const :tag "semibold" semi-bold) + (const :tag "semi-bold" semi-bold) (const :tag "demibold" semi-bold) + (const :tag "demi-bold" semi-bold) (const :tag "bold" bold) (const :tag "extrabold" extra-bold) - (const :tag "heavy" extra-bold) - (const :tag "ultrabold" ultra-bold) - (const :tag "black" ultra-bold))) + (const :tag "extra-bold" extra-bold) + (const :tag "ultrabold" extra-bold) + (const :tag "ultra-bold" extra-bold) + (const :tag "heavy" heavy) + (const :tag "black" heavy) + (const :tag "ultra-heavy" ultra-heavy) + (const :tag "ultraheavy" ultra-heavy))) (:slant (choice :tag "Slant"
Eli Zaretskii <eliz@gnu.org> writes: >> This also does it, but those weights look seriously out of whack >> compared to the list in font.c > > Does the below look reasonable? Yes, I think so. -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no
> From: Lars Ingebrigtsen <larsi@gnus.org>
> Cc: Robert Pluim <rpluim@gmail.com>, emacs-devel@gnu.org
> Date: Thu, 25 Nov 2021 20:15:32 +0100
>
> Eli Zaretskii <eliz@gnu.org> writes:
>
> >> This also does it, but those weights look seriously out of whack
> >> compared to the list in font.c
> >
> > Does the below look reasonable?
>
> Yes, I think so.
Thanks, installed (with similar changes in other attributes).
>>>>> On Thu, 25 Nov 2021 21:30:43 +0200, Eli Zaretskii <eliz@gnu.org> said:
>> From: Lars Ingebrigtsen <larsi@gnus.org>
>> Cc: Robert Pluim <rpluim@gmail.com>, emacs-devel@gnu.org
>> Date: Thu, 25 Nov 2021 20:15:32 +0100
>>
>> Eli Zaretskii <eliz@gnu.org> writes:
>>
>> >> This also does it, but those weights look seriously out of whack
>> >> compared to the list in font.c
>> >
>> > Does the below look reasonable?
>>
>> Yes, I think so.
Eli> Thanks, installed (with similar changes in other attributes).
Except that M-x customize-face RET default RET still shows the lisp
expression, since the weight is still coming back as 'regular'. So
either we drop "regular" from font.c, or adjust cus-face.el
Robert
--
> From: Robert Pluim <rpluim@gmail.com>
> Cc: Lars Ingebrigtsen <larsi@gnus.org>, emacs-devel@gnu.org
> Date: Fri, 26 Nov 2021 09:26:52 +0100
>
> Except that M-x customize-face RET default RET still shows the lisp
> expression, since the weight is still coming back as 'regular'. So
> either we drop "regular" from font.c, or adjust cus-face.el
The latter, I think. Dropping "regular" is out of the question.
>>>>> On Fri, 26 Nov 2021 10:36:17 +0200, Eli Zaretskii <eliz@gnu.org> said:
>> From: Robert Pluim <rpluim@gmail.com>
>> Cc: Lars Ingebrigtsen <larsi@gnus.org>, emacs-devel@gnu.org
>> Date: Fri, 26 Nov 2021 09:26:52 +0100
>>
>> Except that M-x customize-face RET default RET still shows the lisp
>> expression, since the weight is still coming back as 'regular'. So
>> either we drop "regular" from font.c, or adjust cus-face.el
Eli> The latter, I think. Dropping "regular" is out of the question.
OK. Iʼm tempted to move "regular" back after "normal" in font.c, but
Lars explicitly swapped them when adding support for "medium", so Iʼm
wondering if thereʼs a reason for the order.
Robert
--
> From: Robert Pluim <rpluim@gmail.com>
> Cc: larsi@gnus.org, emacs-devel@gnu.org
> Date: Fri, 26 Nov 2021 09:42:41 +0100
>
> >>>>> On Fri, 26 Nov 2021 10:36:17 +0200, Eli Zaretskii <eliz@gnu.org> said:
>
> >> From: Robert Pluim <rpluim@gmail.com>
> >> Cc: Lars Ingebrigtsen <larsi@gnus.org>, emacs-devel@gnu.org
> >> Date: Fri, 26 Nov 2021 09:26:52 +0100
> >>
> >> Except that M-x customize-face RET default RET still shows the lisp
> >> expression, since the weight is still coming back as 'regular'. So
> >> either we drop "regular" from font.c, or adjust cus-face.el
>
> Eli> The latter, I think. Dropping "regular" is out of the question.
>
> OK. Iʼm tempted to move "regular" back after "normal" in font.c, but
> Lars explicitly swapped them when adding support for "medium", so Iʼm
> wondering if thereʼs a reason for the order.
I think this is on purpose, since that's the "normal" name for that
weight.
Lars?
Eli Zaretskii <eliz@gnu.org> writes: >> OK. Iʼm tempted to move "regular" back after "normal" in font.c, but >> Lars explicitly swapped them when adding support for "medium", so Iʼm >> wondering if thereʼs a reason for the order. > > I think this is on purpose, since that's the "normal" name for that > weight. > > Lars? Yes, that was my reason for making that the "main" name for that group -- name of the font is usually "Foo Bar Regular", not "Foo Bar Normal". -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no
>>>>> On Fri, 26 Nov 2021 13:39:44 +0100, Lars Ingebrigtsen <larsi@gnus.org> said:
Lars> Eli Zaretskii <eliz@gnu.org> writes:
>>> OK. Iʼm tempted to move "regular" back after "normal" in font.c, but
>>> Lars explicitly swapped them when adding support for "medium", so Iʼm
>>> wondering if thereʼs a reason for the order.
>>
>> I think this is on purpose, since that's the "normal" name for that
>> weight.
>>
>> Lars?
Lars> Yes, that was my reason for making that the "main" name for that group
Lars> -- name of the font is usually "Foo Bar Regular", not "Foo Bar Normal".
Fair enough. Fixed on master.
Robert
--