From: Stefan Kangas <stefan@marxist.se>
Date: Fri, 24 Jun 2022 11:52:51 +0000 (+0200)
Subject: Merge from origin/emacs-28
X-Git-Tag: emacs-29.0.90~1447^2~1492
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=81e58d1ce5a16fbe4cad543b1b011fe52da5d70c;p=emacs.git

Merge from origin/emacs-28

a772c0b852 ; Fix typos: prefer US spelling.

# Conflicts:
#	doc/misc/modus-themes.org
---

81e58d1ce5a16fbe4cad543b1b011fe52da5d70c
diff --cc doc/misc/modus-themes.org
index 7b566f51c26,6b1d91c396a..446bfaa422a
--- a/doc/misc/modus-themes.org
+++ b/doc/misc/modus-themes.org
@@@ -618,23 -481,17 +618,23 @@@ By default, customizing a theme-relate
  interfaces or with {{{kbd(M-x customize-set-variable)}}} will not reload the
  currently active Modus theme.
  
- Enable this behaviour by setting this variable to ~nil~.
+ Enable this behavior by setting this variable to ~nil~.
  
 -** Option for color-coding success state
 +Regardless of this option, the active theme must be reloaded for changes
 +to user options to take effect ([[#h:3f3c3728-1b34-437d-9d0c-b110f5b161a9][Enable and load]]).
 +
 +** Option for red-green color deficiency or deuteranopia
  :properties:
 -:alt_title: Success' color-code
 -:description: Toggle blue color for success or done states
 +:alt_title: Deuteranopia style
 +:description: Toggle red/blue color-coding instead of red/green
  :custom_id: h:3ed03a48-20d8-4ce7-b214-0eb7e4c79abe
  :end:
 -#+vindex: modus-themes-success-deuteranopia
 +#+vindex: modus-themes-deuteranopia
  
 -Symbol: ~modus-themes-success-deuteranopia~
 +Brief: When non-nil use red/blue color-coding instead of red/green,
 +where appropriate.
 +
 +Symbol: ~modus-themes-deuteranopia~ (=boolean= type)
  
  Possible values: