unofficial mirror of bug-gnu-emacs@gnu.org 
 help / color / mirror / code / Atom feed
* bug#46971: 28.0.50; Fontifications in Info buffers break alignment in @multitable
@ 2021-03-06 17:16 Eli Zaretskii
  2021-09-26 14:34 ` Stefan Kangas
  2021-10-06 13:53 ` bug#46971: 28.0.60; [PATCH] Disable modus-themes font mixing by default (bug#46971) Protesilaos Stavrou
  0 siblings, 2 replies; 7+ messages in thread
From: Eli Zaretskii @ 2021-03-06 17:16 UTC (permalink / raw)
  To: 46971

To reproduce:

  emacs -Q
  C-u C-h i ../info/elisp.info RET
  C-s Syntax name

You should now see the table of syntax categories.  The characters in
the rightmost column don't align, which looks ugly.

This happens because font-lock is instructed to do this:

  (defvar Info-mode-font-lock-keywords
    '(("‘\\([‘’]\\|[^‘’]*\\)’" (1 'Info-quoted))))

Thus the quotes and the quoted text use different faces, and if those
faces use different fonts (as they do by default), the table will not
be aligned.

One possible solution would be to modify Info-mode-font-lock-keywords
such that the quotes are also fontified in Info-quoted face.

In GNU Emacs 28.0.50 (build 1071, i686-pc-mingw32)
 of 2021-03-06 built on HOME-C4E4A596F7
Repository revision: 45b1151696287e469dcb426f8b6e908125635373
Repository branch: master
Windowing system distributor 'Microsoft Corp.', version 5.1.2600
System Description: Microsoft Windows XP Service Pack 3 (v5.1.0.2600)

Configured using:
 'configure -C --prefix=/d/usr --with-wide-int --with-modules
 --enable-checking=yes,glyphs 'CFLAGS=-O0 -gdwarf-4 -g3''

Configured features:
ACL GIF GMP GNUTLS HARFBUZZ JPEG JSON LCMS2 LIBXML2 MODULES NOTIFY
W32NOTIFY PDUMPER PNG RSVG SOUND THREADS TIFF TOOLKIT_SCROLL_BARS XPM
ZLIB

Important settings:
  value of $LANG: ENU
  locale-coding-system: cp1255

Major mode: Info

Minor modes in effect:
  tooltip-mode: t
  global-eldoc-mode: t
  electric-indent-mode: t
  mouse-wheel-mode: t
  tool-bar-mode: t
  menu-bar-mode: t
  file-name-shadow-mode: t
  global-font-lock-mode: t
  font-lock-mode: t
  blink-cursor-mode: t
  auto-composition-mode: t
  auto-encryption-mode: t
  auto-compression-mode: t
  buffer-read-only: t
  line-number-mode: t
  transient-mark-mode: t

Load-path shadows:
None found.

Features:
(shadow sort mail-extr emacsbug message rmc puny dired dired-loaddefs
rfc822 mml mml-sec epa derived epg epg-config gnus-util rmail
rmail-loaddefs auth-source cl-seq eieio eieio-core cl-macs
eieio-loaddefs password-cache json map text-property-search time-date
subr-x seq byte-opt gv bytecomp byte-compile cconv mm-decode mm-bodies
mm-encode mail-parse rfc2231 mailabbrev gmm-utils mailheader cl-loaddefs
cl-lib sendmail rfc2047 rfc2045 ietf-drums mm-util mail-prsvr mail-utils
mule-util info iso-transl tooltip eldoc electric uniquify ediff-hook
vc-hooks lisp-float-type mwheel dos-w32 ls-lisp disp-table term/w32-win
w32-win w32-vars term/common-win tool-bar dnd fontset image regexp-opt
fringe tabulated-list replace newcomment text-mode elisp-mode lisp-mode
prog-mode register page tab-bar menu-bar rfn-eshadow isearch easymenu
timer select scroll-bar mouse jit-lock font-lock syntax facemenu
font-core term/tty-colors frame minibuffer cl-generic cham georgian
utf-8-lang misc-lang vietnamese tibetan thai tai-viet lao korean
japanese eucjp-ms cp51932 hebrew greek romanian slovak czech european
ethiopic indian cyrillic chinese composite charscript charprop
case-table epa-hook jka-cmpr-hook help simple abbrev obarray
cl-preloaded nadvice button loaddefs faces cus-face macroexp files
window text-properties overlay sha1 md5 base64 format env code-pages
mule custom widget hashtable-print-readable backquote threads w32notify
w32 lcms2 multi-tty make-network-process emacs)

Memory information:
((conses 16 89749 8422)
 (symbols 48 8122 1)
 (strings 16 27031 2327)
 (string-bytes 1 724882)
 (vectors 16 13691)
 (vector-slots 8 179164 12452)
 (floats 8 27 294)
 (intervals 40 5234 210)
 (buffers 888 11))





^ permalink raw reply	[flat|nested] 7+ messages in thread

* bug#46971: 28.0.50; Fontifications in Info buffers break alignment in @multitable
  2021-03-06 17:16 bug#46971: 28.0.50; Fontifications in Info buffers break alignment in @multitable Eli Zaretskii
@ 2021-09-26 14:34 ` Stefan Kangas
  2021-10-02  4:56   ` Protesilaos Stavrou
  2021-10-06 13:53 ` bug#46971: 28.0.60; [PATCH] Disable modus-themes font mixing by default (bug#46971) Protesilaos Stavrou
  1 sibling, 1 reply; 7+ messages in thread
From: Stefan Kangas @ 2021-09-26 14:34 UTC (permalink / raw)
  To: Eli Zaretskii; +Cc: 46971

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

Eli Zaretskii <eliz@gnu.org> writes:

> To reproduce:
>
>   emacs -Q
>   C-u C-h i ../info/elisp.info RET
>   C-s Syntax name

> You should now see the table of syntax categories.  The characters in
> the rightmost column don't align, which looks ugly.
>
> This happens because font-lock is instructed to do this:
>
>   (defvar Info-mode-font-lock-keywords
>     '(("‘\\([‘’]\\|[^‘’]*\\)’" (1 'Info-quoted))))
>
> Thus the quotes and the quoted text use different faces, and if those
> faces use different fonts (as they do by default), the table will not
> be aligned.
>
> One possible solution would be to modify Info-mode-font-lock-keywords
> such that the quotes are also fontified in Info-quoted face.

That fix solves this issue in "emacs -Q" here, but not in my personal
Emacs configuration where I use a different font.

In "emacs -Q" I have these fonts for the column text (1), and the
whitespace in between columns (2), and everything lines up:

  1. ftcrhb:-bitstream-Courier 10
Pitch-normal-normal-normal-*-16-*-*-*-m-0-iso10646-1 (#x08)
  2. ftcrhb:-Bits-Bitstream Vera Sans
Mono-normal-normal-normal-*-16-*-*-*-m-0-iso10646-1 (#x03)

With my personal configuration, I have these fonts for the column text
(1), and the whitespace in between (2), and the alignment is wrong (see
screenshots below):

  1. ftcrhb:-Bits-Bitstream Vera Sans
Mono-normal-normal-normal-*-21-*-*-*-m-0-iso10646-1 (#xB7)
  2. ftcrhb:-DAMA-Ubuntu
Mono-normal-normal-normal-*-21-*-*-*-m-0-iso10646-1 (#x03)

I don't know if this is relevant, but in "emacs -Q", the cursor stays
the same size when I move it from a character using font 1 to one using
font 2.

With my personal Emacs configuration, the cursor gets noticeably smaller
when I move it from a character using font 1 to one using font 2.  The
attached screenshots demonstrate this effect.

[-- Attachment #2: screenshot1.png --]
[-- Type: image/png, Size: 54001 bytes --]

[-- Attachment #3: screenshot2.png --]
[-- Type: image/png, Size: 56447 bytes --]

^ permalink raw reply	[flat|nested] 7+ messages in thread

* bug#46971: 28.0.50; Fontifications in Info buffers break alignment in @multitable
  2021-09-26 14:34 ` Stefan Kangas
@ 2021-10-02  4:56   ` Protesilaos Stavrou
  2021-10-06  0:43     ` Stefan Kangas
  0 siblings, 1 reply; 7+ messages in thread
From: Protesilaos Stavrou @ 2021-10-02  4:56 UTC (permalink / raw)
  To: Stefan Kangas, Eli Zaretskii; +Cc: 46971

On 2021-09-26, 07:34 -0700, Stefan Kangas <stefan@marxist.se> wrote:

> Eli Zaretskii <eliz@gnu.org> writes:
>
>> To reproduce:
>>
>>   emacs -Q
>>   C-u C-h i ../info/elisp.info RET
>>   C-s Syntax name
>
>> You should now see the table of syntax categories.  The characters in
>> the rightmost column don't align, which looks ugly.
>>
>> This happens because font-lock is instructed to do this:
>>
>>   (defvar Info-mode-font-lock-keywords
>>     '(("‘\\([‘’]\\|[^‘’]*\\)’" (1 'Info-quoted))))
>>
>> Thus the quotes and the quoted text use different faces, and if those
>> faces use different fonts (as they do by default), the table will not
>> be aligned.
>>
>> One possible solution would be to modify Info-mode-font-lock-keywords
>> such that the quotes are also fontified in Info-quoted face.
>
> That fix solves this issue in "emacs -Q" here, but not in my personal
> Emacs configuration where I use a different font.
>
> In "emacs -Q" I have these fonts for the column text (1), and the
> whitespace in between columns (2), and everything lines up:
>
>   1. ftcrhb:-bitstream-Courier 10
> Pitch-normal-normal-normal-*-16-*-*-*-m-0-iso10646-1 (#x08)
>   2. ftcrhb:-Bits-Bitstream Vera Sans
> Mono-normal-normal-normal-*-16-*-*-*-m-0-iso10646-1 (#x03)
>
> With my personal configuration, I have these fonts for the column text
> (1), and the whitespace in between (2), and the alignment is wrong (see
> screenshots below):

Hello Stefan,

The reason you are getting two distinct fonts is because the
'Info-quoted' face is inheriting from 'fixed-pitch'.

Does the alignment get fixed if you make fixed-pitch use the same font
as the default?  Such as with this:

    (set-face-attribute 'fixed-pitch nil
                        :family (face-attribute 'default :family)
                        :height (face-attribute 'default :height))

All the best,
Protesilaos

-- 
Protesilaos Stavrou
https://protesilaos.com

^ permalink raw reply	[flat|nested] 7+ messages in thread

* bug#46971: 28.0.50; Fontifications in Info buffers break alignment in @multitable
  2021-10-02  4:56   ` Protesilaos Stavrou
@ 2021-10-06  0:43     ` Stefan Kangas
  2021-10-06  4:14       ` Protesilaos Stavrou
  0 siblings, 1 reply; 7+ messages in thread
From: Stefan Kangas @ 2021-10-06  0:43 UTC (permalink / raw)
  To: Protesilaos Stavrou, Eli Zaretskii; +Cc: 46971

Protesilaos Stavrou <info@protesilaos.com> writes:

> The reason you are getting two distinct fonts is because the
> 'Info-quoted' face is inheriting from 'fixed-pitch'.
>
> Does the alignment get fixed if you make fixed-pitch use the same font
> as the default?  Such as with this:
>
>     (set-face-attribute 'fixed-pitch nil
>                         :family (face-attribute 'default :family)
>                         :height (face-attribute 'default :height))

Interesting!  Yes, that fixes the issue here.





^ permalink raw reply	[flat|nested] 7+ messages in thread

* bug#46971: 28.0.50; Fontifications in Info buffers break alignment in @multitable
  2021-10-06  0:43     ` Stefan Kangas
@ 2021-10-06  4:14       ` Protesilaos Stavrou
  2021-10-06 12:34         ` Eli Zaretskii
  0 siblings, 1 reply; 7+ messages in thread
From: Protesilaos Stavrou @ 2021-10-06  4:14 UTC (permalink / raw)
  To: Stefan Kangas; +Cc: 46971

On 2021-10-05, 20:43 -0400, Stefan Kangas <stefan@marxist.se> wrote:

> Protesilaos Stavrou <info@protesilaos.com> writes:
>
>> The reason you are getting two distinct fonts is because the
>> 'Info-quoted' face is inheriting from 'fixed-pitch'.
>>
>> Does the alignment get fixed if you make fixed-pitch use the same font
>> as the default?  Such as with this:
>>
>>     (set-face-attribute 'fixed-pitch nil
>>                         :family (face-attribute 'default :family)
>>                         :height (face-attribute 'default :height))
>
> Interesting!  Yes, that fixes the issue here.

There is an option in the modus-themes 1.6.0 (emacs-28) that can disable
this behaviour of some faces inheriting from 'fixed-pitch':
'modus-themes-no-mixed-fonts'.

In my upstream repo I have decided to make that opt-in, instead of
opt-out, seeing as it can create surprising results (as in this case).
So the new option is 'modus-themes-mixed-fonts', which is nil by
default.

Do you think this is something that should be patched for the emacs-28
branch?  Otherwise I will sync my changes with 'master' when I release
the next version (maybe in a month from now).

-- 
Protesilaos Stavrou
https://protesilaos.com





^ permalink raw reply	[flat|nested] 7+ messages in thread

* bug#46971: 28.0.50; Fontifications in Info buffers break alignment in @multitable
  2021-10-06  4:14       ` Protesilaos Stavrou
@ 2021-10-06 12:34         ` Eli Zaretskii
  0 siblings, 0 replies; 7+ messages in thread
From: Eli Zaretskii @ 2021-10-06 12:34 UTC (permalink / raw)
  To: Protesilaos Stavrou; +Cc: 46971, stefan

> From: Protesilaos Stavrou <info@protesilaos.com>
> Date: Wed, 06 Oct 2021 07:14:52 +0300
> Cc: 46971@debbugs.gnu.org
> 
> There is an option in the modus-themes 1.6.0 (emacs-28) that can disable
> this behaviour of some faces inheriting from 'fixed-pitch':
> 'modus-themes-no-mixed-fonts'.
> 
> In my upstream repo I have decided to make that opt-in, instead of
> opt-out, seeing as it can create surprising results (as in this case).
> So the new option is 'modus-themes-mixed-fonts', which is nil by
> default.
> 
> Do you think this is something that should be patched for the emacs-28
> branch?  Otherwise I will sync my changes with 'master' when I release
> the next version (maybe in a month from now).

This sounds like a bugfix, so I think it's okay for the release
branch.





^ permalink raw reply	[flat|nested] 7+ messages in thread

* bug#46971: 28.0.60; [PATCH] Disable modus-themes font mixing by default (bug#46971)
  2021-03-06 17:16 bug#46971: 28.0.50; Fontifications in Info buffers break alignment in @multitable Eli Zaretskii
  2021-09-26 14:34 ` Stefan Kangas
@ 2021-10-06 13:53 ` Protesilaos Stavrou
  1 sibling, 0 replies; 7+ messages in thread
From: Protesilaos Stavrou @ 2021-10-06 13:53 UTC (permalink / raw)
  To: 46971

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

Dear maintainers,

This is a bugfix for the emacs-28 branch, prompted by the discussion in
bug#46971.  It changes the default behaviour of the modus-themes to not
inherit the 'fixed-pitch' face in various spacing sensitive faces.  This
now becomes an opt-in feature and its utility is documented in the doc
string of the new user option as well as the manual.

Note that I have already made these changes to the modus-themes repo and
was planning to sync them with the Emacs 'master' branch upon the next
release of the project (maybe in a month from now).

Please let me know if you think this should be applied to emacs-28.

All the best,
Protesilaos

-- 
Protesilaos Stavrou
https://protesilaos.com

[-- Attachment #2: 0001-Disable-modus-themes-font-mixing-by-default-bug-4697.patch --]
[-- Type: text/x-patch, Size: 11049 bytes --]

From b66924be6d134480b769982c1e6a19cb4e968052 Mon Sep 17 00:00:00 2001
Message-Id: <b66924be6d134480b769982c1e6a19cb4e968052.1633527639.git.info@protesilaos.com>
From: Protesilaos Stavrou <info@protesilaos.com>
Date: Wed, 6 Oct 2021 16:40:18 +0300
Subject: [PATCH] Disable modus-themes font mixing by default (bug#46971)

* doc/misc/modus-themes.org (Customization Options): Include new user
option in code sample.
(Option for no font mixing, Option for font mixing): Rewrite the
section on font mixing to explain the new behaviour of not inheriting
the 'fixed-pitch' face by default.  Users must opt-in instead.
(Acknowledgements): Acknowledge name of person who first reported the
problem with the old option.

* etc/themes/modus-themes.el (modus-themes-variable-pitch)
(modus-themes-fixed-pitch): Update doc strings to mention new user
option.
(modus-themes-no-mixed-fonts): Deprecate old user option and replace
it with 'modus-themes-mixed-fonts'.
(modus-themes-mixed-fonts): Add new defcustom.
(modus-themes--fixed-pitch): Change the way inheritance of
'fixed-pitch' is handled, so that it is disabled by default.
(modus-themes-faces): Update one face that needs to inherit
'fixed-pitch' conditionally, so that it does not do it by default.

Fixes bug#46971, which actually was about the modus-themes.
---
 doc/misc/modus-themes.org  | 54 ++++++++++++++++++++------------------
 etc/themes/modus-themes.el | 44 ++++++++++++++++---------------
 2 files changed, 51 insertions(+), 47 deletions(-)

diff --git a/doc/misc/modus-themes.org b/doc/misc/modus-themes.org
index 675144d517..9e294d62e9 100644
--- a/doc/misc/modus-themes.org
+++ b/doc/misc/modus-themes.org
@@ -380,7 +380,7 @@ * Customization Options
 #+begin_src emacs-lisp
 (setq modus-themes-italic-constructs t
       modus-themes-bold-constructs nil
-      modus-themes-no-mixed-fonts nil
+      modus-themes-mixed-fonts nil
       modus-themes-subtle-line-numbers nil
       modus-themes-success-deuteranopia t
       modus-themes-tabs-accented t
@@ -629,36 +629,38 @@ ** Option for syntax highlighting
 
 [[#h:977c900d-0d6d-4dbb-82d9-c2aae69543d6][Option for more italic constructs]].
 
-** Option for no font mixing
+** Option for font mixing
 :properties:
-:alt_title: No mixed fonts
+:alt_title: Mixed fonts
 :description: Toggle mixing of font families
 :custom_id: h:115e6c23-ee35-4a16-8cef-e2fcbb08e28b
 :end:
 #+vindex: modus-themes-no-mixed-fonts
 
-Symbol: ~modus-themes-no-mixed-fonts~
+Symbol: ~modus-themes-mixed-fonts~
 
 Possible values:
 
 1. ~nil~ (default)
 2. ~t~
 
-By default, the themes configure some spacing-sensitive faces like Org
+When set to non-nil (~t~), configure some spacing-sensitive faces like Org
 tables and code blocks to always inherit from the ~fixed-pitch~ face.
-This is to ensure that those constructs remain monospaced even when
-users opt for a mode that remaps typeface families, such as the built-in
-{{{kbd(M-x variable-pitch-mode)}}}.  Otherwise the layout would appear
-broken, due to how spacing is done.  To disable this behaviour, set the
-option to ~t~.
+This is to ensure that certain constructs like code blocks and tables
+remain monospaced even when users opt for a mode that remaps typeface
+families, such as the built-in {{{kbd(M-x variable-pitch-mode)}}}.  Otherwise
+the layout would appear broken, due to how spacing is done.
 
-Users may prefer to use another package for handling mixed typeface
-configurations, rather than letting the theme do it, perhaps because a
-purpose-specific package has extra functionality.  Two possible options
-are ~org-variable-pitch~ and ~mixed-pitch~.
+For a consistent experience, user may need to specify the font family of
+the ~fixed-pitch~ face.
 
 [[#h:defcf4fc-8fa8-4c29-b12e-7119582cc929][Font configurations for Org and others]].
 
+Furthermore, users may prefer to use another package for handling mixed
+typeface configurations, rather than letting the theme do it, perhaps
+because a purpose-specific package has extra functionality.  Two
+possible options are ~org-variable-pitch~ and ~mixed-pitch~.
+
 ** Option for links
 :properties:
 :alt_title: Link styles
@@ -4337,18 +4339,18 @@ * Acknowledgements
   Edmondson, Davor Rotim, Divan Santana, Eliraz Kedmi, Emanuele Michele
   Alberto Monterosso, Farasha Euker, Feng Shu, Gautier Ponsinet, Gerry
   Agbobada, Gianluca Recchia, Gustavo Barros, Hörmetjan Yiltiz, Ilja
-  Kocken, Iris Garcia, Jeremy Friesen, Jerry Zhang, John Haman, Joshua
-  O'Connor, Kevin Fleming, Kévin Le Gouguec, Kostadin Ninev, Len Trigg,
-  Manuel Uberti, Mark Burton, Markus Beppler, Mauro Aranda, Michael
-  Goldenberg, Morgan Smith, Murilo Pereira, Nicky van Foreest, Nicolas
-  De Jaeghere, Paul Poloskov, Pengji Zhang, Pete Kazmier, Peter Wu,
-  Philip Kaludercic, Pierre Téchoueyres, Roman Rudakov, Ryan Phillips,
-  Rudolf Adamkovič, Sam Kleinman, Shreyas Ragavan, Simon Pugnet, Tassilo
-  Horn, Thibaut Verron, Thomas Heartman, Trey Merkley, Togan Muftuoglu,
-  Toon Claes, Uri Sharf, Utkarsh Singh, Vincent Foley.  As well as
-  users: Ben, CsBigDataHub1, Emacs Contrib, Eugene, Fourchaux, Fredrik,
-  Moesasji, Nick, TheBlob42, Trey, bepolymathe, doolio, fleimgruber,
-  iSeeU, jixiuf, okamsn, pRot0ta1p.
+  Kocken, Iris Garcia, Jeremy Friesen, Jerry Zhang, Johannes Grødem,
+  John Haman, Joshua O'Connor, Kevin Fleming, Kévin Le Gouguec, Kostadin
+  Ninev, Len Trigg, Manuel Uberti, Mark Burton, Markus Beppler, Mauro
+  Aranda, Michael Goldenberg, Morgan Smith, Murilo Pereira, Nicky van
+  Foreest, Nicolas De Jaeghere, Paul Poloskov, Pengji Zhang, Pete
+  Kazmier, Peter Wu, Philip Kaludercic, Pierre Téchoueyres, Roman
+  Rudakov, Ryan Phillips, Rudolf Adamkovič, Sam Kleinman, Shreyas
+  Ragavan, Simon Pugnet, Tassilo Horn, Thibaut Verron, Thomas Heartman,
+  Trey Merkley, Togan Muftuoglu, Toon Claes, Uri Sharf, Utkarsh Singh,
+  Vincent Foley.  As well as users: Ben, CsBigDataHub1, Emacs Contrib,
+  Eugene, Fourchaux, Fredrik, Moesasji, Nick, TheBlob42, Trey,
+  bepolymathe, doolio, fleimgruber, iSeeU, jixiuf, okamsn, pRot0ta1p.
 
 + Packaging :: Basil L.{{{space()}}} Contovounesios, Eli Zaretskii, Glenn
   Morris, Mauro Aranda, Richard Stallman, Stefan Kangas (core Emacs),
diff --git a/etc/themes/modus-themes.el b/etc/themes/modus-themes.el
index 7ab985c077..a0099f4aef 100644
--- a/etc/themes/modus-themes.el
+++ b/etc/themes/modus-themes.el
@@ -5,7 +5,7 @@ ;;; modus-themes.el --- Highly accessible themes (WCAG AAA) -*- lexical-binding:
 ;; Author: Protesilaos Stavrou <info@protesilaos.com>
 ;; URL: https://gitlab.com/protesilaos/modus-themes
 ;; Version: 1.6.0
-;; Last-Modified: <2021-09-29 08:47:03 +0300>
+;; Last-Modified: <2021-10-06 16:25:14 +0300>
 ;; Package-Requires: ((emacs "27.1"))
 ;; Keywords: faces, theme, accessibility
 
@@ -40,7 +40,7 @@ ;;; Commentary:
 ;;     modus-themes-bold-constructs                (boolean)
 ;;     modus-themes-inhibit-reload                 (boolean)
 ;;     modus-themes-italic-constructs              (boolean)
-;;     modus-themes-no-mixed-fonts                 (boolean)
+;;     modus-themes-mixed-fonts                    (boolean)
 ;;     modus-themes-scale-headings                 (boolean)
 ;;     modus-themes-subtle-line-numbers            (boolean)
 ;;     modus-themes-success-deuteranopia           (boolean)
@@ -1475,7 +1475,7 @@ (defface modus-themes-slant nil
 
 (defface modus-themes-variable-pitch nil
   "Generic face for applying a conditional `variable-pitch'.
-This behaves in accordance with `modus-themes-no-mixed-fonts',
+This behaves in accordance with `modus-themes-mixed-fonts',
 `modus-themes-variable-pitch-headings' for all heading levels,
 and `modus-themes-variable-pitch-ui'.
 
@@ -1484,7 +1484,7 @@ (defface modus-themes-variable-pitch nil
 
 (defface modus-themes-fixed-pitch nil
   "Generic face for applying a conditional `fixed-pitch'.
-This behaves in accordance with `modus-themes-no-mixed-fonts'.
+This behaves in accordance with `modus-themes-mixed-fonts'.
 
 The actual styling of the face is done by `modus-themes-faces'."
   :group 'modus-theme-faces)
@@ -1782,24 +1782,26 @@ (defcustom modus-themes-variable-pitch-ui nil
   :initialize #'custom-initialize-default
   :link '(info-link "(modus-themes) UI typeface"))
 
-(defcustom modus-themes-no-mixed-fonts nil
-  "Disable inheritance from `fixed-pitch' in some faces.
-
-This is done by default to allow spacing-sensitive constructs,
-such as Org tables and code blocks, to remain monospaced when
-users opt for something like the command `variable-pitch-mode'.
-The downside with the default is that users need to explicitly
-configure the font family of `fixed-pitch' in order to get a
-consistent experience.  That may be something they do not want to
-do.  Hence this option to disable any kind of technique for
-mixing fonts."
+(define-obsolete-variable-alias
+  'modus-themes-no-mixed-fonts
+  'modus-themes-mixed-fonts "1.6.0 (on 2021-10-06)")
+
+(defcustom modus-themes-mixed-fonts nil
+  "Enable inheritance from `fixed-pitch' in some faces.
+
+This is done to allow spacing-sensitive constructs, such as Org
+tables and code blocks, to remain monospaced when users opt for
+something like the command `variable-pitch-mode'.
+
+Users may need to explicitly configure the font family of
+`fixed-pitch' in order to get a consistent experience."
   :group 'modus-themes
-  :package-version '(modus-themes . "1.0.0")
+  :package-version '(modus-themes . "1.6.0")
   :version "28.1"
   :type 'boolean
   :set #'modus-themes--set-option
   :initialize #'custom-initialize-default
-  :link '(info-link "(modus-themes) No mixed fonts"))
+  :link '(info-link "(modus-themes) Mixed fonts"))
 
 (defconst modus-themes--headings-choice
   '(set :tag "Properties" :greedy t
@@ -3024,7 +3026,7 @@ (defun modus-themes--slant ()
 
 (defun modus-themes--fixed-pitch ()
   "Conditional application of `fixed-pitch' inheritance."
-  (unless modus-themes-no-mixed-fonts
+  (when modus-themes-mixed-fonts
     (list :inherit 'fixed-pitch)))
 
 (defun modus-themes--variable-pitch ()
@@ -6640,9 +6642,9 @@ ;;;;; org
                         :extend t)))
     `(org-column ((,class :background ,bg-alt)))
     `(org-column-title ((,class :inherit bold :underline t :background ,bg-alt)))
-    `(org-date ((,class :inherit ,(if modus-themes-no-mixed-fonts
-                                      'button
-                                    '(button fixed-pitch))
+    `(org-date ((,class :inherit ,(if modus-themes-mixed-fonts
+                                      '(button fixed-pitch)
+                                    'button)
                         ,@(modus-themes--link-color
                            cyan cyan-faint))))
     `(org-date-selected ((,class :inherit bold :foreground ,blue-alt :inverse-video t)))
-- 
2.33.0


^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2021-10-06 13:53 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-06 17:16 bug#46971: 28.0.50; Fontifications in Info buffers break alignment in @multitable Eli Zaretskii
2021-09-26 14:34 ` Stefan Kangas
2021-10-02  4:56   ` Protesilaos Stavrou
2021-10-06  0:43     ` Stefan Kangas
2021-10-06  4:14       ` Protesilaos Stavrou
2021-10-06 12:34         ` Eli Zaretskii
2021-10-06 13:53 ` bug#46971: 28.0.60; [PATCH] Disable modus-themes font mixing by default (bug#46971) Protesilaos Stavrou

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).