[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
feature/native-comp d5791ba: Merge remote-tracking branch 'savannah/mast
|
From: |
Andrea Corallo |
|
Subject: |
feature/native-comp d5791ba: Merge remote-tracking branch 'savannah/master' into HEAD |
|
Date: |
Sat, 17 Oct 2020 02:38:04 -0400 (EDT) |
branch: feature/native-comp
commit d5791ba5feeb5500433ca43506dda13c7c67ce14
Merge: 03dfa83 86dd9d1
Author: Andrea Corallo <akrl@sdf.org>
Commit: Andrea Corallo <akrl@sdf.org>
Merge remote-tracking branch 'savannah/master' into HEAD
---
admin/release-process | 11 +
doc/emacs/ack.texi | 11 +-
doc/emacs/building.texi | 23 +-
doc/emacs/search.texi | 5 +
doc/lispintro/emacs-lisp-intro.texi | 2 +-
doc/lispref/variables.texi | 26 +-
doc/man/emacsclient.1 | 9 +-
doc/misc/Makefile.in | 2 +-
doc/misc/efaq.texi | 46 +-
doc/misc/forms.texi | 26 -
doc/misc/gnus.texi | 5 +
doc/misc/modus-themes.texi | 2837 ++++++++++++++++++++++++++++++
etc/NEWS | 28 +-
etc/themes/modus-operandi-theme.el | 1386 +++++++++------
etc/themes/modus-vivendi-theme.el | 1376 ++++++++++-----
lisp/arc-mode.el | 3 +-
lisp/button.el | 17 +-
lisp/calc/calc-ext.el | 72 +-
lisp/calc/calc-graph.el | 1 +
lisp/calc/calc-map.el | 2 +
lisp/calc/calc-misc.el | 21 +-
lisp/calc/calc-nlfit.el | 2 +
lisp/calc/calc-sel.el | 4 +-
lisp/calc/calcalg2.el | 20 +-
lisp/calc/calcsel2.el | 1 +
lisp/cedet/semantic.el | 10 +-
lisp/cus-edit.el | 1 +
lisp/emacs-lisp/backquote.el | 2 +-
lisp/emacs-lisp/edebug.el | 1 -
lisp/emacs-lisp/ert-x.el | 40 +
lisp/emacs-lisp/package.el | 1 +
lisp/emacs-lisp/pp.el | 7 +-
lisp/emacs-lisp/warnings.el | 2 +-
lisp/epa-mail.el | 5 +
lisp/erc/erc.el | 4 +
lisp/gnus/gnus-art.el | 1 +
lisp/gnus/gnus-async.el | 1 +
lisp/gnus/gnus-fun.el | 2 +-
lisp/gnus/gnus-icalendar.el | 9 +-
lisp/gnus/gnus-util.el | 8 +-
lisp/gnus/gnus.el | 8 +
lisp/hi-lock.el | 2 +
lisp/indent.el | 3 +-
lisp/mail/rmail.el | 61 +-
lisp/net/shr.el | 11 +-
lisp/progmodes/compile.el | 34 +
lisp/progmodes/cperl-mode.el | 4 +
lisp/progmodes/elisp-mode.el | 7 +-
lisp/progmodes/project.el | 1 +
lisp/progmodes/python.el | 55 +-
lisp/replace.el | 38 +-
lisp/simple.el | 20 +-
lisp/subr.el | 4 -
lisp/type-break.el | 8 +-
lisp/vc/diff-mode.el | 5 +-
lisp/vc/vc.el | 14 +-
src/xwidget.c | 4 +-
test/lisp/bookmark-tests.el | 16 +-
test/lisp/button-tests.el | 35 +-
test/lisp/calendar/todo-mode-tests.el | 17 +-
test/lisp/custom-tests.el | 6 +-
test/lisp/emacs-lisp/cl-generic-tests.el | 2 +-
test/lisp/emacs-lisp/edebug-tests.el | 17 +-
test/lisp/emacs-lisp/package-tests.el | 37 +-
test/lisp/emacs-lisp/shadow-tests.el | 21 +-
test/lisp/emacs-lisp/testcover-tests.el | 24 +-
test/lisp/gnus/gnus-util-tests.el | 2 -
test/lisp/help-fns-tests.el | 14 +-
test/lisp/mail/uudecode-tests.el | 14 +-
test/lisp/net/dbus-tests.el | 10 +-
test/lisp/net/tramp-archive-tests.el | 63 +-
test/lisp/pcmpl-linux-tests.el | 14 +-
test/lisp/progmodes/cperl-mode-tests.el | 15 +-
test/lisp/progmodes/flymake-tests.el | 11 +-
test/lisp/progmodes/ruby-mode-tests.el | 10 +-
test/lisp/saveplace-tests.el | 16 +-
test/lisp/textmodes/css-mode-tests.el | 10 +-
test/lisp/url/url-file-tests.el | 11 +-
78 files changed, 5245 insertions(+), 1429 deletions(-)
diff --git a/admin/release-process b/admin/release-process
index 73879b1..4d973d3 100644
--- a/admin/release-process
+++ b/admin/release-process
@@ -195,6 +195,17 @@ pt-br Rodrigo Real
ru Alex Ott
sk Miroslav Vaško
+** Update some files from their upstream.
+
+Some files in Emacs are copies of data files maintained elsewhere.
+Make sure that they are reasonably up-to-date.
+
+- etc/publicsuffix.txt
+https://publicsuffix.org/list/public_suffix_list.dat
+
+- leim/SKK-DIC/SKK-JISYO.L
+https://raw.githubusercontent.com/skk-dev/dict/master/SKK-JISYO.L
+
* BUGS
** Check for modes which bind M-s that conflicts with a new global binding M-s
diff --git a/doc/emacs/ack.texi b/doc/emacs/ack.texi
index c622488..4658cd4 100644
--- a/doc/emacs/ack.texi
+++ b/doc/emacs/ack.texi
@@ -13,16 +13,15 @@ written substantial portions. Others too numerous to
mention have
reported and fixed bugs, and added features to many parts of Emacs.
We thank them for their generosity as well.
-This list is intended to mention every contributor of a major package or
-feature we currently distribute; if you know of someone we have omitted,
-please make a bug report. More comprehensive information is
-available in the @file{ChangeLog} files, summarized in the file
-@file{etc/AUTHORS} in the distribution.
+This list is intended to mention every contributor of a major package
+or feature; if you know of someone we have omitted, please make a bug
+report. More comprehensive information is available in the
+@file{ChangeLog} files, summarized in the file @file{etc/AUTHORS} in
+the distribution.
@c We should list here anyone who has contributed a new package,
@c and anyone who has made major enhancements in Emacs
@c that many users would notice and consider important.
-@c Remove things that are no longer distributed.
@c Note this file is only used ifnottex; otherwise a shorter version in
@c emacs.texi is used.
diff --git a/doc/emacs/building.texi b/doc/emacs/building.texi
index 573b7ad..3e09f24 100644
--- a/doc/emacs/building.texi
+++ b/doc/emacs/building.texi
@@ -1672,21 +1672,26 @@ abbreviation of the output according to the variables
argument of @code{-1} overrides the effect of
@code{eval-expression-print-length}.
+ @kbd{C-x C-e} (@code{eval-last-sexp}) treats @code{defvar}
+expressions specially. Normally, evaluating a @code{defvar}
+expression does nothing if the variable it defines already has a
+value. But this command unconditionally resets the variable to the
+initial value specified by the @code{defvar}; this is convenient for
+debugging Emacs Lisp programs. @code{defcustom} and @code{defface}
+expressions are treated similarly. Note the other commands documented
+in this section, except @code{eval-defun}, do not have this special
+feature.
+
@kindex C-M-x @r{(Emacs Lisp mode)}
@findex eval-defun
The @code{eval-defun} command is bound to @kbd{C-M-x} in Emacs Lisp
mode. It evaluates the top-level Lisp expression containing or
following point, and prints the value in the echo area. In this
context, a top-level expression is referred to as a ``defun'', but it
-need not be an actual @code{defun} (function definition). In
-particular, this command treats @code{defvar} expressions specially.
-Normally, evaluating a @code{defvar} expression does nothing if the
-variable it defines already has a value. But this command
-unconditionally resets the variable to the initial value specified by
-the @code{defvar}; this is convenient for debugging Emacs Lisp
-programs. @code{defcustom} and @code{defface} expressions are treated
-similarly. Note that the other commands documented in this section do
-not have this special feature.
+need not be an actual @code{defun} (function definition).
+
+ This command handles @code{defvar}/@code{defcustom}/@code{defface}
+forms the same way that @code{eval-last-sexp} does.
With a prefix argument, @kbd{C-M-x} instruments the function
definition for Edebug, the Emacs Lisp Debugger. @xref{Instrumenting,
diff --git a/doc/emacs/search.texi b/doc/emacs/search.texi
index 2169a41..91b433f 100644
--- a/doc/emacs/search.texi
+++ b/doc/emacs/search.texi
@@ -1662,6 +1662,7 @@ reused.
@cindex @code{query-replace} face
@cindex @code{lazy-highlight} face, in replace
@vindex query-replace-highlight
+@vindex query-replace-highlight-submatches
@vindex query-replace-lazy-highlight
@vindex query-replace-show-replacement
These commands highlight the current match using the face
@@ -1674,6 +1675,10 @@ other matches using @code{lazy-highlight} just like
incremental search
string for the current match in the minibuffer. If you want to keep
special sequences @samp{\&} and @samp{\@var{n}} unexpanded, customize
@code{query-replace-show-replacement} variable.
+Like @code{search-highlight-submatches} highlights subexpressions in
+incremental search (@pxref{Search Customizations}), the variable
+@code{query-replace-highlight-submatches} defines whether to highlight
+subexpressions in the regexp replacement commands.
@vindex query-replace-skip-read-only
The variable @code{query-replace-skip-read-only}, if set
diff --git a/doc/lispintro/emacs-lisp-intro.texi
b/doc/lispintro/emacs-lisp-intro.texi
index 1bd2849..b13b162 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -17523,7 +17523,7 @@ Here is the definition:
;;; Line to top of window;
;;; replace three keystroke sequence C-u 0 C-l
(defun line-to-top-of-window ()
- "Move the line point is on to top of window."
+ "Move the line that point is on to top of window."
(interactive)
(recenter 0))
@end group
diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi
index 94c8c88..acbc8df 100644
--- a/doc/lispref/variables.texi
+++ b/doc/lispref/variables.texi
@@ -934,6 +934,7 @@ Lisp programs.
* Dynamic Binding Tips:: Avoiding problems with dynamic binding.
* Lexical Binding:: A different type of local variable binding.
* Using Lexical Binding:: How to enable lexical binding.
+* Converting to Lexical Binding:: Convert existing code to lexical binding.
@end menu
@node Dynamic Binding
@@ -1242,9 +1243,10 @@ for those that are only special in the current lexical
scope.
@end defun
The use of a special variable as a formal argument in a function is
-discouraged. Doing so gives rise to unspecified behavior when lexical
-binding mode is enabled (it may use lexical binding sometimes, and
-dynamic binding other times).
+not supported.
+
+@node Converting to Lexical Binding
+@subsection Converting to Lexical Binding
Converting an Emacs Lisp program to lexical binding is easy. First,
add a file-local variable setting of @code{lexical-binding} to
@@ -1264,9 +1266,21 @@ variable. If a non-special variable is bound but not
used within a
variable. The byte-compiler will also issue a warning if you use a
special variable as a function argument.
- (To silence byte-compiler warnings about unused variables, just use
-a variable name that starts with an underscore. The byte-compiler
-interprets this as an indication that this is a variable known not to
+ A warning about a reference or an assignment to a free variable is
+usually a clear sign that that variable should be marked as
+dynamically scoped, so you need to add an appropriate @code{defvar}
+before the first use of that variable.
+
+ A warning about an unused variable may be a good hint that the
+variable was intended to be dynamically scoped (because it is actually
+used, but in another function), but it may also be an indication that
+the variable is simply really not used and could simply be removed.
+So you need to find out which case it is, and based on that, either
+add a @code{defvar} or remove the variable altogether. If removal is
+not possible or not desirable (typically because it is a formal
+argument and that we cannot or don't want to change all the callers),
+you can also add a leading underscore to the variable's name to
+indicate to the compiler that this is a variable known not to
be used.)
@node Buffer-Local Variables
diff --git a/doc/man/emacsclient.1 b/doc/man/emacsclient.1
index 9d14d0f..62f5489 100644
--- a/doc/man/emacsclient.1
+++ b/doc/man/emacsclient.1
@@ -1,5 +1,5 @@
.\" See section COPYING for conditions for redistribution.
-.TH EMACSCLIENT 1 "2019-08-02" "GNU Emacs" "GNU"
+.TH EMACSCLIENT 1 "2020-10-15" "GNU Emacs" "GNU"
.\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection
.\" other params are allowed: see man(7), man(1)
.SH NAME
@@ -12,8 +12,6 @@ This manual page documents briefly the
.BR emacsclient
command. Full documentation is available in the GNU Info format; see
below.
-This manual page was originally written for the Debian GNU/Linux
-distribution, but is not specific to that system.
.PP
.B emacsclient
works in conjunction with the built-in Emacs server.
@@ -110,8 +108,9 @@ The program is documented fully in
.IR "Using Emacs as a Server"
available via the Info system.
.SH AUTHOR
-This manual page was written by Stephane Bortzmeyer <bortzmeyer@debian.org>,
-for the Debian GNU/Linux system (but may be used by others).
+This manual page was originally written by Stephane Bortzmeyer
+<bortzmeyer@debian.org>, for the Debian GNU/Linux system, but is not
+specific to that system.
.SH COPYING
This manual page is in the public domain.
diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in
index 7f536ad..f4fb7d2 100644
--- a/doc/misc/Makefile.in
+++ b/doc/misc/Makefile.in
@@ -69,7 +69,7 @@ INFO_COMMON = auth autotype bovine calc ccmode cl \
dbus dired-x ebrowse ede ediff edt eieio \
emacs-mime epa erc ert eshell eudc efaq eww \
flymake forms gnus emacs-gnutls htmlfontify idlwave ido info.info \
- mairix-el message mh-e newsticker nxml-mode octave-mode \
+ mairix-el message mh-e modus-themes newsticker nxml-mode octave-mode \
org pcl-cvs pgg rcirc remember reftex sasl \
sc semantic ses sieve smtpmail speedbar srecode todo-mode tramp \
url vhdl-mode vip viper widget wisent woman
diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi
index 3c12441..115dd8a 100644
--- a/doc/misc/efaq.texi
+++ b/doc/misc/efaq.texi
@@ -27,7 +27,7 @@ The same conditions apply to any derivative of the FAQ as
apply to the FAQ
itself. Every copy of the FAQ must include this notice or an approved
translation, information on who is currently maintaining the FAQ and how to
contact them (including their e-mail address), and information on where the
-latest version of the FAQ is archived (including FTP information).
+latest version of the FAQ is archived.
The FAQ may be copied and redistributed under these conditions, except that
the FAQ may not be embedded in a larger literary work unless that work
@@ -1525,13 +1525,12 @@ customize, with completion.
@cindex Syntax highlighting on a TTY
@cindex Console, colors
-In Emacs 21.1 and later, colors and faces are supported in non-windowed mode,
-i.e., on Unix and GNU/Linux text-only terminals and consoles, and when
-invoked as @samp{emacs -nw} on X, and MS-Windows. (Colors and faces were
-supported in the MS-DOS port since Emacs 19.29.) Emacs automatically
-detects color support at startup and uses it if available. If you think
-that your terminal supports colors, but Emacs won't use them, check the
-@code{termcap} entry for your display type for color-related
+Colors and faces are supported in non-windowed mode, i.e., on Unix and
+GNU/Linux text-only terminals and consoles, and when invoked as
+@samp{emacs -nw} on X, MS-DOS and MS-Windows. Emacs automatically
+detects color support at startup and uses it if available. If you
+think that your terminal supports colors, but Emacs won't use them,
+check the @code{termcap} entry for your display type for color-related
capabilities.
The command @kbd{M-x list-colors-display} pops up a window which
@@ -2540,12 +2539,12 @@ To disable or change the way backups are made,
@pxref{Backup Names,,, emacs, The GNU Emacs Manual}.
@cindex Backup files in a single directory
-Beginning with Emacs 21.1, you can control where Emacs puts backup files
-by customizing the variable @code{backup-directory-alist}. This
-variable's value specifies that files whose names match specific patters
-should have their backups put in certain directories. A typical use is
-to add the element @code{("." . @var{dir})} to force Emacs to put
-@strong{all} backup files in the directory @file{dir}.
+You can control where Emacs puts backup files by customizing the
+variable @code{backup-directory-alist}. This variable's value
+specifies that files whose names match specific patters should have
+their backups put in certain directories. A typical use is to add the
+element @code{("." . @var{dir})} to force Emacs to put @strong{all}
+backup files in the directory @file{dir}.
@node Disabling auto-save-mode
@section How do I disable @code{auto-save-mode}?
@@ -3054,7 +3053,7 @@ if ("$term" == emacs) set term=dumb
@cindex Debugging @file{.emacs} file
An error occurred while loading either your @file{.emacs} file or the
-system-wide file @file{site-lisp/default.el}. Emacs 21.1 and later pops the
+system-wide file @file{site-lisp/default.el}. Emacs pops the
@file{*Messages*} buffer, and puts there some additional information
about the error, to provide some hints for debugging.
@@ -3869,12 +3868,11 @@ You may be able to get a keyboard that is completely
programmable, or a
terminal emulator that supports remapping of any key to any other key.
@item
-With Emacs 21.1 and later, you can control the effect of the
-@key{Backspace} and @key{Delete} keys, on both dumb terminals and a
-windowed displays, by customizing the option
-@code{normal-erase-is-backspace-mode}, or by invoking @kbd{M-x
-normal-erase-is-backspace}. See the documentation of these symbols
-(@pxref{Emacs Lisp documentation}) for more info.
+You can control the effect of the @key{Backspace} and @key{Delete}
+keys, on both dumb terminals and a windowed displays, by customizing
+the option @code{normal-erase-is-backspace-mode}, or by invoking
+@kbd{M-x normal-erase-is-backspace}. See the documentation of these
+symbols (@pxref{Emacs Lisp documentation}) for more info.
@item
It is possible to swap the @key{Backspace} and @key{DEL} keys inside
@@ -3925,9 +3923,9 @@ many modes that have local bindings of @key{DEL} that
will interfere.
@end itemize
-When Emacs 21 or later runs on a windowed display, it binds the
-@key{Delete} key to a command which deletes the character at point, to
-make Emacs more consistent with keyboard operation on these systems.
+When Emacs runs on a windowed display, it binds the @key{Delete} key
+to a command which deletes the character at point, to make Emacs more
+consistent with keyboard operation on these systems.
For more information about troubleshooting this problem, see @ref{DEL
Does Not Delete, , If @key{DEL} Fails to Delete, emacs, The GNU Emacs
diff --git a/doc/misc/forms.texi b/doc/misc/forms.texi
index 1b94bf9..20b0904 100644
--- a/doc/misc/forms.texi
+++ b/doc/misc/forms.texi
@@ -658,15 +658,6 @@ displayed record. You cannot delete or modify the fixed,
explanatory
text that comes from string formatting elements, but you can modify the
actual field contents.
-@ignore
-@c This is for the Emacs 18 version only.
-If the contents of the forms cannot be recognized properly, this is
-signaled using a descriptive text. @xref{Error Messages}, for more info.
-The cursor will indicate the last part of the forms which was
-successfully parsed. It's important to avoid entering field contents
-that would cause confusion with the field-separating fixed text.
-@end ignore
-
If the variable @code{forms-modified-record-filter} is non-@code{nil},
it is called as a function before the new data is written to the data
file. The function receives one argument, a vector that contains the
@@ -795,23 +786,6 @@ The first element of a list which is an element of
A list element was supplied in @code{forms-format-list} which was not a
string, number or list.
-@ignore
-@c This applies to Emacs 18 only.
-@c Error messages generated while a modified form is being analyzed.
-
-@item Parse error: not looking at `...'
-When re-parsing the contents of a forms, the text shown could not
-be found.
-
-@item Parse error: cannot find `...'
-When re-parsing the contents of a forms, the text shown, which
-separates two fields, could not be found.
-
-@item Parse error: cannot parse adjacent fields @var{xx} and @var{yy}
-Fields @var{xx} and @var{yy} were not separated by text, so could not be
-parsed again.
-@end ignore
-
@item Warning: this record has @var{xx} fields instead of @var{yy}
The number of fields in this record in the data file did not match
@code{forms-number-of-fields}. Missing fields will be made empty.
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index f356dfe..3f893e9 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -19489,6 +19489,11 @@ Variable to control whether use the locally stored
@acronym{NOV} and
articles when plugged, e.g., essentially using the Agent as a cache.
The default is non-@code{nil}, which means to use the Agent as a cache.
+@item gnus-agent-eagerly-store-articles
+@vindex gnus-agent-eagerly-store-articles
+If non-@code{nil} (which is the default), store all articles read in
+agentized groups in the Agent cache.
+
@item gnus-agent-go-online
@vindex gnus-agent-go-online
If @code{gnus-agent-go-online} is @code{nil}, the Agent will never
diff --git a/doc/misc/modus-themes.texi b/doc/misc/modus-themes.texi
new file mode 100644
index 0000000..c34ee15
--- /dev/null
+++ b/doc/misc/modus-themes.texi
@@ -0,0 +1,2837 @@
+\input texinfo @c -*- texinfo -*-
+@c %**start of header
+@setfilename ../../info/modus-themes.info
+@settitle Modus themes for GNU Emacs
+@include docstyle.texi
+@documentencoding UTF-8
+@documentlanguage en
+@c %**end of header
+
+@include emacsver.texi
+
+@dircategory Emacs misc features
+@direntry
+* Modus Themes: (modus-themes). Highly accessible themes (WCAG AAA).
+@end direntry
+
+@finalout
+@titlepage
+@title Modus themes for GNU Emacs
+@author Protesilaos Stavrou (@email{info@@protesilaos.com})
+@end titlepage
+
+@ifnottex
+@node Top
+@top Modus themes for GNU Emacs
+
+This manual, written by Protesilaos Stavrou, describes the customization
+options for the @samp{modus-operandi} and @samp{modus-vivendi} themes, and
provides
+every other piece of information pertinent to them.
+
+The documentation furnished herein corresponds to version 0.13.0,
+released on 2020-10-08. Any reference to a newer feature which does
+not yet form part of the latest tagged commit, is explicitly marked as
+such.
+
+Copyright (C) 2020 Free Software Foundation, Inc.
+
+@quotation
+Permission is granted to copy, distribute and/or modify this
+document under the terms of the GNU Free Documentation License,
+Version 1.3 or any later version published by the Free Software
+Foundation; with no Invariant Sections, with no Front-Cover Texts,
+and with no Back-Cover Texts.
+
+@end quotation
+
+@end ifnottex
+
+@menu
+* Overview::
+* Installation::
+* Enable and load::
+* Customisation Options::
+* Advanced customisation (do-it-yourself)::
+* Face coverage::
+* Notes for individual packages::
+* Contributing::
+* Acknowledgements::
+* Meta::
+* External projects (ports)::
+* GNU Free Documentation License::
+
+@detailmenu
+--- The Detailed Node Listing ---
+
+Overview
+
+* How do the themes look like::
+* Learn about the latest changes::
+
+Installation
+
+* Install from the archives::
+* Install on GNU/Linux::
+
+Install on GNU/Linux
+
+* Debian 11 Bullseye::
+* GNU Guix::
+
+Enable and load
+
+* Load automatically::
+* Load at a given time or at sunset/sunrise::
+* Toggle between the themes on demand::
+* Configure options prior to loading::
+
+Customisation Options
+
+* Bold constructs:: Toggle bold constructs in code
+* Slanted constructs:: Toggle slanted constructs (italics) in code
+* Syntax highlighting:: Toggle subtle coloration in programming modes
+* No mixed fonts:: Toggle mixing of font families
+* Link underline:: Toggle underlined text in links
+* Command prompts:: Choose among plain, subtle, or intense prompts
+* Mode line:: Choose among plain, three-dimension, or
moody-compliant styles
+* Completion UIs:: Choose among standard, moderate, or
opinionated looks
+* Fringes:: Choose among plain, subtle, or intense fringe
visibility
+* Line highlighting:: Toggle intense style for current line
highlighting
+* Matching parentheses:: Toggle intense style for matching
delimiters/parentheses
+* Diffs:: Choose among intense, desaturated, or
text-only diffs
+* Org mode blocks:: Choose among plain, greyscale, or rainbow
styles
+* Heading styles:: Choose among several styles, also per heading
level
+* Scaled headings:: Toggle scaling of headings
+* Headings' font:: Toggle proportionately spaced fonts in
headings
+
+Scaled headings
+
+* Scaled heading sizes:: Specify rate of increase for scaled headings
+
+Advanced customisation (do-it-yourself)
+
+* Tweak colors (DIY):: Declare your own palette overrides
+* Font configs (DIY):: Optimise for mixed typeface buffers
+* Org user faces (DIY):: Extend styles for org-mode keywords and
priorities
+
+Face coverage
+
+* Supported packages:: Full list of covered face groups
+* Covered indirectly::
+* Will NOT be supported::
+
+Notes for individual packages
+
+* Note on company-mode overlay pop-up::
+* Note for ERC escaped color sequences::
+* Note for powerline or spaceline::
+* Note on shr colors::
+* Note for Helm grep::
+* Note on vc-annotate-background-mode::
+
+Contributing
+
+* Sources of the themes::
+* Issues you can help with::
+* Merge requests:: Legal considerations for code patches
+
+@end detailmenu
+@end menu
+
+@node Overview
+@chapter Overview
+
+The Modus themes are designed for accessible readability. They conform
+with the highest standard for color contrast between any given
+combination of background and foreground values. This corresponds to
+the WCAG AAA standard, which specifies a minimum rate of distance in
+relative luminance of 7:1.
+
+Modus Operandi (@samp{modus-operandi}) is a light theme, while Modus Vivendi
+(@samp{modus-vivendi}) is dark. Each theme's color palette is designed to
+meet the needs of the numerous interfaces that are possible in the Emacs
+computing environment.
+
+The overarching objective of this project is to always offer accessible
+color combinations. There shall never be a compromise on this
+principle. If there arises an inescapable trade-off between readability
+and stylistic considerations, we will always opt for the former.
+
+To ensure that users have a consistently accessible experience, the
+themes strive to achieve as close to full face coverage as possible
+(see @ref{Face coverage}).
+
+Starting with version 0.12.0 and onwards, the themes are built into GNU
+Emacs (current version is 0.13.0).
+
+@menu
+* How do the themes look like::
+* Learn about the latest changes::
+@end menu
+
+@node How do the themes look like
+@section How do the themes look like
+
+Check the web page with @uref{https://protesilaos.com/modus-themes-pictures/,
the screen shots}. There are lots of scenarios on
+display that draw attention to details and important aspects in the
+design of the themes. They also showcase the numerous customization
+options.
+
+@xref{Customisation Options, , Customisation options}.
+
+@node Learn about the latest changes
+@section Learn about the latest changes
+
+Please refer to the @uref{https://protesilaos.com/modus-themes-changelog, web
page with the change log}. It is comprehensive
+and covers everything that goes into every tagged release of the themes.
+
+@node Installation
+@chapter Installation
+
+The Modus themes are distributed with Emacs starting with version 28.1.
+On older versions of Emacs, they can be installed using Emacs' package
+manager or manually from their code repository.
+
+Modus Operandi (light theme) and Modus Vivendi (dark) are normally
+distributed as standalone packages in Emacs-specific archives: GNU ELPA,
+MELPA, and MELPA Stable. There also exist packages for GNU/Linux
+distributions.
+
+@menu
+* Install from the archives::
+* Install on GNU/Linux::
+@end menu
+
+@node Install from the archives
+@section Install from the archives
+
+@samp{modus-operandi-theme} and @samp{modus-vivendi-theme} are
+available from GNU ELPA.
+
+Prior to querying any package archive, make sure to have updated the
+index, with @samp{M-x package-refresh-contents}. Then all you need to do is
+type @samp{M-x package-install} and specify the theme of your choice.
+
+GNU ELPA contains the last tagged release.
+
+@node Install on GNU/Linux
+@section Install on GNU/Linux
+
+The themes are also available from the archives of some GNU/Linux
+distributions. These should correspond to a tagged release rather than
+building directly from the latest Git commit. It all depends on the
+distro's packaging policies.
+
+@menu
+* Debian 11 Bullseye::
+* GNU Guix::
+@end menu
+
+@node Debian 11 Bullseye
+@subsection Debian 11 Bullseye
+
+The two themes are distributed as a single package for Debian and its
+derivatives. Currently in the unstable and testing suites and should be
+available in time for Debian 11 Bullseye (next stable).
+
+Get them with:
+
+@example
+sudo apt install elpa-modus-themes
+@end example
+
+@node GNU Guix
+@subsection GNU Guix
+
+Users of either the Guix System (the distro) or just Guix (the package
+manager) can get each theme as a standalone package.
+
+@example
+guix package -i modus-operandi-theme
+@end example
+
+And/or:
+
+@example
+guix package -i modus-vivendi-theme
+@end example
+
+@node Enable and load
+@chapter Enable and load
+
+This section documents how to load the theme of your
+choice and how to further control its initialization. It also includes
+some sample code snippets that could help you in the task, especially if
+you intend to use both Modus Operandi and Modus Vivendi.
+
+@menu
+* Load automatically::
+* Load at a given time or at sunset/sunrise::
+* Toggle between the themes on demand::
+* Configure options prior to loading::
+@end menu
+
+@node Load automatically
+@section Load automatically
+
+A simple way to load the theme from your Emacs initialization file is to
+include either of the following expressions:
+
+@lisp
+(load-theme 'modus-operandi t) ; Light theme
+(load-theme 'modus-vivendi t) ; Dark theme
+@end lisp
+
+Make sure to remove any other theme that is being loaded, otherwise you
+might run into unexpected issues.
+
+Note that you can always @samp{M-x disable-theme} and specify an item. The
+command does exactly what its name suggests. To deactivate all enabled
+themes at once, in case you have multiple of them enabled, you may
+evaluate the expression:
+
+@lisp
+(mapc #'disable-theme custom-enabled-themes)
+@end lisp
+
+@node Load at a given time or at sunset/sunrise
+@section Load at a given time or at sunset/sunrise
+
+It is possible to schedule a time during the day at or after which a
+given theme will be loaded.@footnote{Contributed on Reddit by user b3n
+@uref{https://www.reddit.com/r/emacs/comments/gdtqov/weekly_tipstricketc_thread/fq9186h/}.}
+
+@lisp
+;; Light for the day
+(load-theme 'modus-operandi t t)
+(run-at-time "05:00" (* 60 60 24)
+ (lambda ()
+ (enable-theme 'modus-operandi)))
+
+;; Dark for the night
+(load-theme 'modus-vivendi t t)
+(run-at-time "21:00" (* 60 60 24)
+ (lambda ()
+ (enable-theme 'modus-vivendi)))
+@end lisp
+
+A modified version of the above technique is to use the sunrise and
+sunset as references, instead of specifying a fixed hour
value.@footnote{Contributed directly by André Alexandre Gomes
@uref{https://gitlab.com/aadcg}.}
+If you set @samp{calendar-latitude} and @samp{calendar-longitude} (defined in
the
+built-in @samp{solar.el} library---read it with @samp{M-x find-library}), you
can
+automatically switch between both themes at the appropriate time-of-day.
+Note that @emph{those calendar variables need to be set before loading the
+themes}.
+
+@lisp
+;; Define coordinates
+(setq calendar-latitude 35.17
+ calendar-longitude 33.36)
+
+;; Light at sunrise
+(load-theme 'modus-operandi t t)
+(run-at-time (nth 1 (split-string (sunrise-sunset)))
+ (* 60 60 24)
+ (lambda ()
+ (enable-theme 'modus-operandi)))
+
+;; Dark at sunset
+(load-theme 'modus-vivendi t t)
+(run-at-time (nth 4 (split-string (sunrise-sunset)))
+ (* 60 60 24)
+ (lambda ()
+ (enable-theme 'modus-vivendi)))
+@end lisp
+
+For the sake of completeness, the @samp{load-theme} call in these snippets is
+slightly different than the one shown in @ref{Load automatically}, because it
+does not enable the theme directly: the subsequent @samp{enable-theme} does
+that when needed.
+
+@node Toggle between the themes on demand
+@section Toggle between the themes on demand
+
+With both themes available, it is possible to design a simple command to
+switch between them on demand.
+
+@lisp
+(defun modus-themes-toggle ()
+ "Toggle between `modus-operandi' and `modus-vivendi' themes."
+ (interactive)
+ (if (eq (car custom-enabled-themes) 'modus-operandi)
+ (progn
+ (disable-theme 'modus-operandi)
+ (load-theme 'modus-vivendi t))
+ (disable-theme 'modus-vivendi)
+ (load-theme 'modus-operandi t)))
+@end lisp
+
+You could use @samp{(mapc #'disable-theme custom-enabled-themes)} instead of
+disabling a single target, but you get the idea.
+
+@node Configure options prior to loading
+@section Configure options prior to loading
+
+If you plan to use both themes and wish to apply styles consistently
+(see @ref{Customisation Options}), you could define wrapper functions around
+the standard @samp{load-theme} command. These extend the simple function we
+presented in @ref{Toggle between the themes on demand}.
+
+Here is a comprehensive setup (the values assigned to the variables are
+just for the sake of this demonstration):@footnote{The @samp{defmacro} and
@samp{dolist}
+method were contributed on Reddit by user @samp{b3n},
+@uref{https://www.reddit.com/r/emacs/comments/gqsz8u/weekly_tipstricketc_thread/fsfakhg/}.}
+
+@lisp
+(defmacro modus-themes-format-sexp (sexp &rest objects)
+ `(eval (read (format ,(format "%S" sexp) ,@@objects))))
+
+(dolist (theme '("operandi" "vivendi"))
+ (modus-themes-format-sexp
+ (defun modus-%1$s-theme-load ()
+ (setq modus-%1$s-theme-slanted-constructs t
+ modus-%1$s-theme-bold-constructs t
+ modus-%1$s-theme-fringes 'subtle ; @{nil,'subtle,'intense@}
+ modus-%1$s-theme-mode-line '3d ; @{nil,'3d,'moody@}
+ modus-%1$s-theme-faint-syntax nil
+ modus-%1$s-theme-intense-hl-line nil
+ modus-%1$s-theme-intense-paren-match nil
+ modus-%1$s-theme-no-link-underline t
+ modus-%1$s-theme-no-mixed-fonts nil
+ modus-%1$s-theme-prompts nil ; @{nil,'subtle,'intense@}
+ modus-%1$s-theme-completions 'moderate ;
@{nil,'moderate,'opinionated@}
+ modus-%1$s-theme-diffs nil ; @{nil,'desaturated,'fg-only@}
+ modus-%1$s-theme-org-blocks 'greyscale ; @{nil,'greyscale,'rainbow@}
+ modus-%1$s-theme-headings ; Read further below in the manual for
this one
+ '((1 . section)
+ (2 . line)
+ (t . rainbow-line-no-bold))
+ modus-%1$s-theme-variable-pitch-headings nil
+ modus-%1$s-theme-scale-headings t
+ modus-%1$s-theme-scale-1 1.1
+ modus-%1$s-theme-scale-2 1.15
+ modus-%1$s-theme-scale-3 1.21
+ modus-%1$s-theme-scale-4 1.27
+ modus-%1$s-theme-scale-5 1.33)
+ (load-theme 'modus-%1$s t))
+ theme))
+
+(defun modus-themes-toggle ()
+ "Toggle between `modus-operandi' and `modus-vivendi' themes."
+ (interactive)
+ (if (eq (car custom-enabled-themes) 'modus-operandi)
+ (progn
+ (disable-theme 'modus-operandi)
+ (modus-vivendi-theme-load))
+ (disable-theme 'modus-vivendi)
+ (modus-operandi-theme-load)))
+@end lisp
+
+@node Customisation Options
+@chapter Customisation Options
+
+The Modus themes are highly configurable, though they should work well
+without any further tweaks.
+
+By default, all customization options are set to @samp{nil}.
+
+All customization options need to be evaluated before loading their
+theme (@pxref{Enable and load}).
+
+@menu
+* Bold constructs:: Toggle bold constructs in code
+* Slanted constructs:: Toggle slanted constructs (italics) in code
+* Syntax highlighting:: Toggle subtle coloration in programming modes
+* No mixed fonts:: Toggle mixing of font families
+* Link underline:: Toggle underlined text in links
+* Command prompts:: Choose among plain, subtle, or intense prompts
+* Mode line:: Choose among plain, three-dimension, or
moody-compliant styles
+* Completion UIs:: Choose among standard, moderate, or
opinionated looks
+* Fringes:: Choose among plain, subtle, or intense fringe
visibility
+* Line highlighting:: Toggle intense style for current line
highlighting
+* Matching parentheses:: Toggle intense style for matching
delimiters/parentheses
+* Diffs:: Choose among intense, desaturated, or
text-only diffs
+* Org mode blocks:: Choose among plain, greyscale, or rainbow
styles
+* Heading styles:: Choose among several styles, also per heading
level
+* Scaled headings:: Toggle scaling of headings
+* Headings' font:: Toggle proportionately spaced fonts in
headings
+@end menu
+
+@node Bold constructs
+@section Option for more bold constructs
+
+Symbol names:
+
+@itemize
+@item
+@samp{modus-operandi-theme-bold-constructs}
+@item
+@samp{modus-vivendi-theme-bold-constructs}
+@end itemize
+
+Possible values:
+
+@enumerate
+@item
+@samp{nil} (default)
+@item
+@samp{t}
+@end enumerate
+
+Display several constructs in bold weight. This concerns keywords and
+other important aspects of code syntax. It also affects certain mode
+line indicators and command-line prompts.
+
+The default is to only use a bold weight when it is required.
+
+Additionally, and while not necessary, to define the precise weight for
+bold constructs, you can change the typographic intensity of the @samp{bold}
+face. The standard is a bold weight. It requires no further
+intervention. Assuming though that your typeface of choice supports a
+``semibold'' weight, adding the following snippet to your init file should
+suffice.
+
+@lisp
+(set-face-attribute 'bold nil :weight 'semibold)
+@end lisp
+
+Note that if you are switching themes, you need to re-evaluate this
+expression after the new theme is loaded.
+
+@node Slanted constructs
+@section Option for more slanted constructs
+
+Symbol names:
+
+@itemize
+@item
+@samp{modus-operandi-theme-slanted-constructs}
+@item
+@samp{modus-vivendi-theme-slanted-constructs}
+@end itemize
+
+Possible values:
+
+@enumerate
+@item
+@samp{nil} (default)
+@item
+@samp{t}
+@end enumerate
+
+Choose to render more faces in slanted text (italics). This typically
+affects documentation strings and code comments.
+
+The default is to not use italics unless it is absolutely necessary.
+
+@node Syntax highlighting
+@section Option for faint code syntax highlighting
+
+Symbol names:
+
+@itemize
+@item
+@samp{modus-operandi-theme-faint-syntax}
+@item
+@samp{modus-vivendi-theme-faint-syntax}
+@end itemize
+
+Possible values:
+
+@enumerate
+@item
+@samp{nil} (default)
+@item
+@samp{t}
+@end enumerate
+
+Use less saturated colors in programming modes for highlighting code
+syntax. The default is to use saturated colors.
+
+This option essentially affects the font-lock faces, so it may also have
+implications in other places that are hard-wired to rely directly on
+them instead of specifying their own faces (which could inherit from
+font-lock if that is the intent). The author is aware of @samp{vc-dir} as a
+case in point.
+
+@node No mixed fonts
+@section Option for no font mixing
+
+Symbol names:
+
+@itemize
+@item
+@samp{modus-operandi-theme-no-mixed-fonts}
+@item
+@samp{modus-vivendi-theme-no-mixed-fonts}
+@end itemize
+
+Possible values:
+
+@enumerate
+@item
+@samp{nil} (default)
+@item
+@samp{t}
+@end enumerate
+
+By default, the themes configure some spacing-sensitive faces, such as
+Org tables and code blocks, to always inherit from the @samp{fixed-pitch} face.
+This is to ensure that those constructs remain monospaced when users opt
+for something like the built-in @kbd{M-x variable-pitch-mode}. Otherwise the
+layout would appear broken. To disable this behaviour, set the option
+to @samp{t}.
+
+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 @samp{org-variable-pitch} and @samp{mixed-pitch}.
+
+@node Link underline
+@section Option for no link underline
+
+Symbol names:
+
+@itemize
+@item
+@samp{modus-operandi-theme-no-link-underline}
+@item
+@samp{modus-vivendi-theme-no-link-underline}
+@end itemize
+
+Possible values:
+
+@enumerate
+@item
+@samp{nil} (default)
+@item
+@samp{t}
+@end enumerate
+
+Remove the underline effect from links, symbolic links, and buttons.
+The default is to apply an underline.
+
+@node Command prompts
+@section Option for command prompt styles
+
+Symbol names:
+
+@itemize
+@item
+@samp{modus-operandi-theme-prompts}
+@item
+@samp{modus-vivendi-theme-prompts}
+@end itemize
+
+Possible values:
+
+@enumerate
+@item
+@samp{nil} (default)
+@item
+@samp{subtle}
+@item
+@samp{intense}
+@end enumerate
+
+The symbols ``subtle'' and ``intense'' will apply a combination of accented
+background and foreground to the minibuffer and other REPL prompts (like
+@samp{M-x shell} and @samp{M-x eshell}). The difference between the two is
that the
+latter has a more pronounced/noticeable effect than the former.
+
+The default is not to use any background for such prompts, while relying
+exclusively on an accented foreground color.
+
+@node Mode line
+@section Option for mode line presentation
+
+Symbol names:
+
+@itemize
+@item
+@samp{modus-operandi-theme-mode-line}
+@item
+@samp{modus-vivendi-theme-mode-line}
+@end itemize
+
+Possible values:
+
+@enumerate
+@item
+@samp{nil} (default)
+@item
+@samp{3d}
+@item
+@samp{moody}
+@end enumerate
+
+The default value (@samp{nil}) produces a two-dimensional effect both for the
+active and inactive modelines. The differences between the two are
+limited to distinct shades of greyscale values, with the active being
+more intense than the inactive.
+
+A @samp{3d} symbol will make the active modeline look like a three-dimensional
+rectangle. Inactive modelines remain 2D, though they are slightly toned
+down relative to the default. This aesthetic is the same as what you
+get when you run Emacs without any customizations (@kbd{emacs -Q} on the
+command line).
+
+While @samp{moody} removes all box effects from the modelines and applies
+underline and overline properties instead. It also tones down a bit the
+inactive modelines. This is meant to optimize things for use with the
+@uref{https://github.com/tarsius/moody, moody package} (hereinafter referred
to as ``Moody''), though it can work
+fine even without it.
+
+Note that Moody does not expose any faces that the themes could style
+directly. Instead it re-purposes existing ones to render its tabs and
+ribbons. As such, there may be cases where the contrast ratio falls
+below the 7:1 target that the themes conform with (WCAG AAA). To hedge
+against this, we configure a fallback foreground for the @samp{moody} option,
+which will come into effect when the background of the modeline changes
+to something less accessible, such as Moody ribbons (read the doc string
+of @samp{set-face-attribute}, specifically @samp{:distant-foreground}). This
fallback
+comes into effect when Emacs determines that the background and
+foreground of the given construct are too close to each other in terms
+of color distance. In effect, users would need to experiment with the
+variable @samp{face-near-same-color-threshold} to trigger the fallback color.
+We find that a value of @samp{45000} would suffice, contrary to the default
+@samp{30000}. Do not set the value too high, because that would have the
+adverse effect of always overriding the default color (which has been
+carefully designed to be highly accessible).
+
+Furthermore, because Moody expects an underline and overline instead of
+a box style, it is recommended you also include this in your setup:
+
+@lisp
+(setq x-underline-at-descent-line t)
+@end lisp
+
+@node Completion UIs
+@section Option for completion framework aesthetics
+
+Symbol names:
+
+@itemize
+@item
+@samp{modus-operandi-theme-completions}
+@item
+@samp{modus-vivendi-theme-completions}
+@end itemize
+
+Possible values:
+
+@enumerate
+@item
+@samp{nil} (default)
+@item
+@samp{moderate}
+@item
+@samp{opinionated}
+@end enumerate
+
+This is a special option that has different effects depending on the
+completion UI@. The interfaces can be grouped in two categories, based
+on their default aesthetics: (i) those that only or mostly use
+foreground colors for their interaction model, and (ii) those that
+combine background and foreground values for some of their metaphors.
+The former category encompasses Icomplete, Ido, Selectrum as well as
+pattern matching styles like Orderless and Flx. The latter covers Helm,
+Ivy, and similar.
+
+A value of @samp{nil} will respect the metaphors of each completion framework.
+
+The symbol @samp{moderate} will apply a combination of background and
+foreground that is fairly subtle. For Icomplete and friends this
+constitutes a departure from their default aesthetics, however the
+difference is small. While Helm et al will appear slightly different
+than their original looks, as they are toned down a bit.
+
+The symbol @samp{opinionated} will apply color combinations that refashion the
+completion UI@. For the Icomplete camp this means that intense
+background and foreground combinations are used: in effect their looks
+emulate those of Ivy and co. in their original style. Whereas the other
+group of packages will revert to an even more nuanced aesthetic with
+some additional changes to the choice of hues.
+
+To appreciate the scope of this customization option, you should spend
+some time with every one of the @samp{nil} (default), @samp{moderate}, and
@samp{opinionated}
+possibilities.
+
+@node Fringes
+@section Option for fringe visibility
+
+Symbol names:
+
+@itemize
+@item
+@samp{modus-operandi-theme-fringes}
+@item
+@samp{modus-vivendi-theme-fringes}
+@end itemize
+
+Possible values:
+
+@enumerate
+@item
+@samp{nil} (default)
+@item
+@samp{subtle}
+@item
+@samp{intense}
+@end enumerate
+
+The ``subtle'' symbol will apply a greyscale background that is visible,
+yet close enough to the main background color. While the ``intense''
+symbol will use a more noticeable greyscale background.
+
+The default is to use the same color as that of the main background,
+meaning that the fringes are not obvious though they still occupy the
+space given to them by @samp{fringe-mode}.
+
+@node Line highlighting
+@section Option for line highlighting (hl-line-mode)
+
+Symbol names:
+
+@itemize
+@item
+@samp{modus-operandi-theme-intense-hl-line}
+@item
+@samp{modus-vivendi-theme-intense-hl-line}
+@end itemize
+
+Possible values:
+
+@enumerate
+@item
+@samp{nil} (default)
+@item
+@samp{t}
+@end enumerate
+
+Draw the current line of @samp{hl-line-mode} or its global equivalent in a more
+prominent background color. This would also affect several packages
+that enable @samp{hl-line-mode}, such as @samp{elfeed} and @samp{mu4e}.
+
+The default is to use a more subtle gray.
+
+@node Matching parentheses
+@section Option for parenthesis matching (show-paren-mode)
+
+Symbol names:
+
+@itemize
+@item
+@samp{modus-operandi-theme-intense-paren-match}
+@item
+@samp{modus-vivendi-theme-intense-paren-match}
+@end itemize
+
+Possible values:
+
+@enumerate
+@item
+@samp{nil} (default)
+@item
+@samp{t}
+@end enumerate
+
+Apply a more intense background to the matching parentheses (or
+delimiters). This affects tools such as the built-in @samp{show-paren-mode}.
+The default is to use a subtle warm color for the background of those
+overlays.
+
+@node Diffs
+@section Option for diff buffer looks
+
+Symbol names:
+
+@itemize
+@item
+@samp{modus-operandi-theme-diffs}
+@item
+@samp{modus-vivendi-theme-diffs}
+@end itemize
+
+Possible values:
+
+@enumerate
+@item
+@samp{nil} (default)
+@item
+@samp{desaturated}
+@item
+@samp{fg-only}
+@end enumerate
+
+By default the themes will apply richly colored backgrounds to the
+output of diffs, such as those of @samp{diff-mode}, @samp{ediff},
@samp{smerge-mode}, and
+@samp{magit}. These are color combinations of an accented background and
+foreground so that, for example, added lines have a pronounced green
+background with an appropriate shade of green for the affected text.
+Word-wise or ``refined'' changes follow this pattern but use different
+shades of those colors to remain distinct.
+
+A @samp{desaturated} value tones down all relevant color values. It still
+combines an accented background with an appropriate foreground, yet its
+overall impression is very subtle. Refined changes are a bit more
+intense to fulfil their intended function, though still less saturated
+than default.
+
+While @samp{fg-only} will remove all accented backgrounds and instead rely on
+color-coded text to denote changes. For instance, added lines use an
+intense green foreground, while their background is the same as the rest
+of the buffer. Word-wise highlights still use a background value which
+is, nonetheless, more subtle than its default equivalent.
+
+Concerning @samp{magit}, an extra set of tweaks are introduced for the effect
+of highlighting the current diff hunk, so as to remain consistent with
+the overall experience of that mode. Expect changes that are consistent
+with the overall intent of the aforementioned.
+
+@node Org mode blocks
+@section Option for org-mode block styles
+
+Symbol names:
+
+@itemize
+@item
+@samp{modus-operandi-theme-org-blocks}
+@item
+@samp{modus-vivendi-theme-org-blocks}
+@end itemize
+
+Possible values:
+
+@enumerate
+@item
+@samp{nil} (default)
+@item
+@samp{greyscale}
+@item
+@samp{rainbow}
+@end enumerate
+
+The default is to use the same background as the rest of the buffer for
+the contents of the block.
+
+A value of @samp{greyscale} will apply a subtle neutral gray background to the
+block's contents. It will also extend to the edge of the window the
+background of the ``begin'' and ``end'' block delimiter lines (only relevant
+for Emacs versions >= 27 where the 'extend' keyword is recognised by
+@samp{set-face-attribute}).
+
+While @samp{rainbow} will instead use an accented background for the contents
+of the block. The exact color will depend on the programming language
+and is controlled by the @samp{org-src-block-faces} variable (refer to the
+theme's source code for the current association list). This is most
+suitable for users who work on literate programming documents that mix
+and match several languages.
+
+Note that the ``rainbow'' blocks may require you to also reload the
+major-mode so that the colors are applied properly: use @kbd{M-x org-mode} or
+@kbd{M-x org-mode-restart} to refresh the buffer. Or start typing in each
+code block (inefficient at scale, but it still works).
+
+@node Heading styles
+@section Option for headings' overall style
+
+This is defined as an alist and, therefore, uses a different approach
+than other customization options documented in this manual.
+
+Symbol names:
+
+@itemize
+@item
+@samp{modus-operandi-theme-headings}
+@item
+@samp{modus-vivendi-theme-headings}
+@end itemize
+
+Possible values, which can be specified for each heading level (examples
+further below):
+
+@itemize
+@item
+nil (default fallback option---covers all heading levels)
+@item
+@samp{t} (default style for a single heading, when the fallback differs)
+@item
+@samp{no-bold}
+@item
+@samp{line}
+@item
+@samp{line-no-bold}
+@item
+@samp{rainbow}
+@item
+@samp{rainbow-line}
+@item
+@samp{rainbow-line-no-bold}
+@item
+@samp{highlight}
+@item
+@samp{highlight-no-bold}
+@item
+@samp{rainbow-highlight}
+@item
+@samp{rainbow-highlight-no-bold}
+@item
+@samp{section}
+@item
+@samp{section-no-bold}
+@item
+@samp{rainbow-section}
+@item
+@samp{rainbow-section-no-bold}
+@end itemize
+
+To control faces per level from 1-8, use something like this (same for
+@samp{modus-vivendi-theme-headings}):
+
+@lisp
+(setq modus-operandi-theme-headings
+ '((1 . section)
+ (2 . line)
+ (3 . highlight)
+ (t . rainbow-no-bold)))
+@end lisp
+
+The above uses the @samp{section} value for heading levels 1, the @samp{line}
for
+headings 2, @samp{highlight} for 3. All other levels fall back to
+@samp{rainbow-line-no-bold}.
+
+To set a uniform value for all heading levels, use this pattern:
+
+@lisp
+;; A given style for every heading
+(setq modus-operandi-theme-headings
+ '((t . rainbow-line-no-bold)))
+
+;; Default aesthetic for every heading
+(setq modus-operandi-theme-headings
+ '((t . nil)))
+@end lisp
+
+The default style for headings uses a fairly desaturated foreground
+value in combination with a bold typographic weight. To specify this
+style for a given level N (assuming you wish to have another fallback
+option), just specify the value @samp{t} like this:
+
+@lisp
+(setq modus-operandi-theme-headings
+ '((1 . t)
+ (2 . line)
+ (t . rainbow-line-no-bold)))
+@end lisp
+
+A description of all other possible styles:
+
+@itemize
+@item
+@samp{no-bold} retains the default text color while removing the typographic
+weight.
+
+@item
+@samp{line} is the same as the default plus an overline over the heading.
+
+@item
+@samp{line-no-bold} is the same as @samp{line} without bold weight.
+
+@item
+@samp{rainbow} uses a more colorful foreground in combination with bold
+weight.
+
+@item
+@samp{rainbow-line} is the same as @samp{rainbow} plus an overline.
+
+@item
+@samp{rainbow-line-no-bold} is the same as @samp{rainbow-line} without the bold
+weight.
+
+@item
+@samp{highlight} retains the default style of a fairly desaturated foreground
+combined with a bold weight and adds to it a subtle accented
+background.
+
+@item
+@samp{highlight-no-bold} is the same as @samp{highlight} without a bold weight.
+
+@item
+@samp{rainbow-highlight} is the same as @samp{highlight} but with a more
colorful
+foreground.
+
+@item
+@samp{rainbow-highlight-no-bold} is the same as @samp{rainbow-highlight}
without a
+bold weight.
+
+@item
+@samp{section} retains the default looks and adds to them both an overline
+and a slightly accented background. It is, in effect, a combination
+of the @samp{line} and @samp{highlight} values.
+
+@item
+@samp{section-no-bold} is the same as @samp{section} without a bold weight.
+
+@item
+@samp{rainbow-section} is the same as @samp{section} but with a more colorful
+foreground.
+
+@item
+@samp{rainbow-section-no-bold} is the same as @samp{rainbow-section} without a
bold
+weight.``
+@end itemize
+
+@node Scaled headings
+@section Option for scaled headings
+
+Symbol names:
+
+@itemize
+@item
+@samp{modus-operandi-theme-scale-headings}
+@item
+@samp{modus-vivendi-theme-scale-headings}
+@end itemize
+
+Possible values:
+
+@enumerate
+@item
+@samp{nil} (default)
+@item
+@samp{t}
+@end enumerate
+
+Make headings larger in height relative to the main text. This is
+noticeable in modes like Org. The default is to use the same size for
+headings and body copy.
+
+@menu
+* Scaled heading sizes:: Specify rate of increase for scaled headings
+@end menu
+
+@node Scaled heading sizes
+@subsection Control the scale of headings
+
+In addition to toggles for enabling scaled headings, users can also
+specify a number of their own.
+
+@itemize
+@item
+If it is a floating point, say, @samp{1.5}, it is interpreted as a multiple
+of the base font size. This is the recommended method.
+
+@item
+If it is an integer, it is read as an absolute font height. The
+number is basically the point size multiplied by ten. So if you want
+it to be @samp{18pt} you must pass @samp{180}. Please understand that setting
an
+absolute value is discouraged, as it will break the layout when you
+try to change font sizes with the built-in @samp{text-scale-adjust} command
+(see @ref{Font configs (DIY), , Font configurations}).
+@end itemize
+
+Below are the variables in their default values, using the floating
+point paradigm. The numbers are very conservative, but you are free to
+change them to your liking, such as @samp{1.2}, @samp{1.4}, @samp{1.6},
@samp{1.8}, @samp{2.0}---or use a
+resource for finding a consistent scale:
+
+@lisp
+(setq modus-operandi-theme-scale-1 1.05
+ modus-operandi-theme-scale-2 1.1
+ modus-operandi-theme-scale-3 1.15
+ modus-operandi-theme-scale-4 1.2
+ modus-operandi-theme-scale-5 1.3)
+
+(setq modus-vivendi-theme-scale-1 1.05
+ modus-vivendi-theme-scale-2 1.1
+ modus-vivendi-theme-scale-3 1.15
+ modus-vivendi-theme-scale-4 1.2
+ modus-vivendi-theme-scale-5 1.3)
+@end lisp
+
+Note that in earlier versions of Org, scaling would only increase the
+size of the heading, but not of keywords that were added to it, like
+``TODO''. The issue has been fixed upstream:
+@uref{https://protesilaos.com/codelog/2020-09-24-org-headings-adapt/}.
+
+@node Headings' font
+@section Option for variable-pitch font in headings
+
+Symbol names:
+
+@itemize
+@item
+@samp{modus-operandi-theme-variable-pitch-headings}
+@item
+@samp{modus-vivendi-theme-variable-pitch-headings}
+@end itemize
+
+Possible values:
+
+@enumerate
+@item
+@samp{nil} (default)
+@item
+@samp{t}
+@end enumerate
+
+Choose to apply a proportionately spaced, else ``variable-pitch'',
+typeface to headings (such as in Org mode). The default is to use the
+main font family.
+
+@ref{Font configs (DIY), , Font configurations for Org (and others)}.
+
+@node Advanced customisation (do-it-yourself)
+@chapter Advanced customisation (do-it-yourself)
+
+Unlike the predefined customization options which follow a
+straightforward pattern of allowing the user to quickly specify their
+preference, the themes also provide a more flexible, albeit difficult,
+mechanism to control things with precision (see @ref{Customisation Options}).
+
+This section is of interest only to users who are prepared to maintain
+their own local tweaks and who are willing to deal with any possible
+incompatibilities between versioned releases of the themes. As such,
+they are labelled as ``do-it-yourself'' or ``DIY''.
+
+@menu
+* Tweak colors (DIY):: Declare your own palette overrides
+* Font configs (DIY):: Optimise for mixed typeface buffers
+* Org user faces (DIY):: Extend styles for org-mode keywords and
priorities
+@end menu
+
+@node Tweak colors (DIY)
+@section Full access to the themes' palette
+
+The variables are:
+
+@itemize
+@item
+@samp{modus-operandi-theme-override-colors-alist}
+@item
+@samp{modus-vivendi-theme-override-colors-alist}
+@end itemize
+
+Users can specify an association list that maps the names of color
+variables to hexadecimal RGB values (in the form of @samp{#RRGGBB}). This
+means that it is possible to override the entire palette or subsets
+thereof (see the source code for the actual names and values).
+
+Example:
+
+@lisp
+;; Redefine the values of those three variables for the given theme
+(setq modus-vivendi-theme-override-colors-alist
+ '(("magenta" . "#ffaabb")
+ ("magenta-alt" . "#ee88ff")
+ ("magenta-alt-other" . "#bbaaff")))
+@end lisp
+
+If you want to be creative, you can define a minor mode that refashions
+the themes on demand. The following is a minor mode that gets activated
+on demand. We combine it with the function to switch between Modus
+Operandi and Modus Vivendi (@pxref{Toggle between the themes on demand}, for
+a basic command, and/or @pxref{Configure options prior to loading}, for a more
+comprehensive setup).
+
+@lisp
+(define-minor-mode modus-themes-alt-mode
+ "Override Modus themes' palette variables with custom values.
+
+This is intended as a proof-of-concept. It is, nonetheless, a
+perfectly accessible alternative, conforming with the design
+principles of the Modus themes. It still is not as good as the
+default colors."
+ :init-value nil
+ :global t
+ (if modus-themes-alt-mode
+ (setq modus-operandi-theme-override-colors-alist
+ '(("bg-main" . "#fefcf4")
+ ("bg-dim" . "#faf6ef")
+ ("bg-alt" . "#f7efe5")
+ ("bg-hl-line" . "#f4f0e3")
+ ("bg-active" . "#e8dfd1")
+ ("bg-inactive" . "#f6ece5")
+ ("bg-region" . "#c6bab1")
+ ("bg-header" . "#ede3e0")
+ ("bg-tab-bar" . "#dcd3d3")
+ ("bg-tab-active" . "#fdf6eb")
+ ("bg-tab-inactive" . "#c8bab8")
+ ("fg-unfocused" . "#55556f"))
+ modus-vivendi-theme-override-colors-alist
+ '(("bg-main" . "#100b17")
+ ("bg-dim" . "#161129")
+ ("bg-alt" . "#181732")
+ ("bg-hl-line" . "#191628")
+ ("bg-active" . "#282e46")
+ ("bg-inactive" . "#1a1e39")
+ ("bg-region" . "#393a53")
+ ("bg-header" . "#202037")
+ ("bg-tab-bar" . "#262b41")
+ ("bg-tab-active" . "#120f18")
+ ("bg-tab-inactive" . "#3a3a5a")
+ ("fg-unfocused" . "#9a9aab")))
+ (setq modus-operandi-theme-override-colors-alist nil
+ modus-vivendi-theme-override-colors-alist nil)))
+
+(defun modus-themes-toggle (&optional arg)
+ "Toggle between `modus-operandi' and `modus-vivendi' themes.
+
+With optional \\[universal-argument] prefix, enable
+`modus-themes-alt-mode' for the loaded theme."
+ (interactive "P")
+ (if arg
+ (modus-themes-alt-mode 1)
+ (modus-themes-alt-mode -1))
+ (if (eq (car custom-enabled-themes) 'modus-operandi)
+ (progn
+ (disable-theme 'modus-operandi)
+ (load-theme 'modus-vivendi t))
+ (disable-theme 'modus-vivendi)
+ (load-theme 'modus-operandi t)))
+@end lisp
+
+@printindex cp
+
+@node Font configs (DIY)
+@section Font configurations for Org (and others)
+
+The themes are designed to cope well with mixed font settings (@ref{No mixed
fonts, , Option
+for no font mixing}). Currently this applies to @samp{org-mode} and
+@samp{markdown-mode}.
+
+In practice it means that the user can safely opt for a more
+prose-friendly proportionately spaced typeface as their default, while
+letting spacing-sensitive elements like tables and inline code always
+use a monospaced font, by inheriting from the @samp{fixed-pitch} face.
+
+Users can try the built-in @kbd{M-x variable-pitch-mode} to see the effect in
+action.
+
+To make everything use your desired font families, you need to configure
+the @samp{variable-pitch} (proportional spacing) and @samp{fixed-pitch}
(monospaced)
+faces respectively. It may also be convenient to set your main typeface
+by configuring the @samp{default} face the same way.
+
+Put something like this in your initialization file (make sure to read
+the documentation of @samp{set-face-attribute}, with @kbd{M-x
describe-function}):
+
+@lisp
+;; Main typeface
+(set-face-attribute 'default nil :family "DejaVu Sans Mono" :height 110)
+
+;; Proportionately spaced typeface
+(set-face-attribute 'variable-pitch nil :family "DejaVu Serif" :height 1.0)
+
+;; Monospaced typeface
+(set-face-attribute 'fixed-pitch nil :family "DejaVu Sans Mono" :height 1.0)
+@end lisp
+
+Note the differences in the @samp{:height} property. The @samp{default} face
must
+specify an absolute value, which is the point size × 10. So if you want
+to use a font at point size @samp{11}, you set the height at
@samp{110}.@footnote{@samp{:height}
+values do not need to be rounded to multiples of ten: the likes of @samp{115}
+are perfectly valid—some typefaces will change to account for those
+finer increments.} Whereas every other face must have a value that is
+relative to the default, represented as a floating point (if you use an
+integer, say, @samp{15} then that means an absolute height). This is of
+paramount importantance: it ensures that all fonts can scale gracefully
+when using something like the @samp{text-scale-adjust} command which only
+operates on the base font size (i.e. the @samp{default} face's absolute
+height).
+
+An alternative syntax for the @samp{default} face, is to pass all typeface
+parameters directly to a @samp{font} property.@footnote{Has the benefit of
+accepting @samp{fontconfig} parameters (GNU/Linux), such as @samp{"DejaVu Sans
+Mono-11:hintstyle=hintslight:autohint=false"}.
+@uref{https://www.freedesktop.org/software/fontconfig/fontconfig-user.html}}
+Note that here we use a standard point size:
+
+@lisp
+(set-face-attribute 'default nil :font "DejaVu Sans Mono-11")
+@end lisp
+
+Again, remember to only ever specify an absolute height for the @samp{default}.
+
+@printindex cp
+
+@node Org user faces (DIY)
+@section Org user faces (DIY)
+
+Users of @samp{org-mode} have the option to configure various keywords and
+priority cookies to better match their workflow. User options are
+@samp{org-todo-keyword-faces} and @samp{org-priority-faces}.
+
+As those are meant to be custom faces, it would be futile to have the
+themes try to guess what each user would want to use, which keywords to
+target, and so on. Instead, we can provide guidelines on how to
+customize things to one's liking with the intent of retaining the
+overall aesthetics of the theme.
+
+Please bear in mind that the end result of those is not controlled by
+the active theme but by how Org maps faces to its constructs. Editing
+those while @samp{org-mode} is active requires @kbd{M-x org-mode-restart} for
changes
+to take effect.
+
+Let us assume you wish to visually differentiate your keywords. You
+have something like this:
+
+@lisp
+(setq org-todo-keywords
+ '((sequence "TODO(t)" "|" "DONE(D)" "CANCEL(C)")
+ (sequence "MEET(m)" "|" "MET(M)")
+ (sequence "STUDY(s)" "|" "STUDIED(S)")
+ (sequence "WRITE(w)" "|" "WROTE(W)")))
+@end lisp
+
+You could then use a variant of the following to inherit from a face
+that uses the styles you want and also to preserve the properties
+applied by the @samp{org-todo} face:
+
+@lisp
+(setq org-todo-keyword-faces
+ '(("MEET" . '(font-lock-preprocessor-face org-todo))
+ ("STUDY" . '(font-lock-variable-name-face org-todo))
+ ("WRITE" . '(font-lock-type-face org-todo))))
+@end lisp
+
+This will refashion the keywords you specify, while letting the other
+items in @samp{org-todo-keywords} use their original styles (which are defined
+in the @samp{org-todo} and @samp{org-done} faces).
+
+If you want back the defaults, try specifying just the @samp{org-todo} face:
+
+@lisp
+(setq org-todo-keyword-faces
+ '(("MEET" . org-todo)
+ ("STUDY" . org-todo)
+ ("WRITE" . org-todo)))
+@end lisp
+
+When you inherit from multiple faces, you need to quote the list as
+shown further above. The order is important: the last item is applied
+over the previous ones. If you do not want to blend multiple faces, you
+do not need a quoted list. A pattern of @samp{keyword . face} would suffice.
+
+Both approaches can be used simultaneously, as illustrated in this
+configuration of the priority cookies:
+
+@lisp
+(setq org-priority-faces
+ '((?A . '(org-scheduled-today org-priority))
+ (?B . org-priority)
+ (?C . '(shadow org-priority))))
+@end lisp
+
+To find all the faces that are loaded in your current Emacs session, use
+@kbd{M-x list-faces-display}. Also try @kbd{M-x describe-variable} and then
specify
+the name of each of those Org variables demonstrated above. Their
+documentation strings will offer you further guidance.
+
+Furthermore, consider reading the ``Notes for aspiring Emacs theme
+developers'', published on 2020-08-28 by me (Protesilaos Stavrou):
+@uref{https://protesilaos.com/codelog/2020-08-28-notes-emacs-theme-devs/}.
+
+@printindex cp
+
+@printindex cp
+
+@node Face coverage
+@chapter Face coverage
+
+Modus Operandi and Modus Vivendi try to provide as close to full face
+coverage as possible. This is necessary to ensure a consistently
+accessible reading experience across all possible interfaces.
+
+@menu
+* Supported packages:: Full list of covered face groups
+* Covered indirectly::
+* Will NOT be supported::
+@end menu
+
+@node Supported packages
+@section Full support for packages or face groups
+
+This list will always be updated to reflect the current state of the
+project. The idea is to offer an overview of the known status of all
+affected face groups. The items with an appended asterisk @samp{*} tend to
+have lots of extensions, so the ``full support'' may not be 100% true…
+
+@itemize
+@item
+ace-window
+@item
+ag
+@item
+alert
+@item
+all-the-icons
+@item
+annotate
+@item
+anzu
+@item
+apropos
+@item
+apt-sources-list
+@item
+artbollocks-mode
+@item
+auctex and @TeX{}
+@item
+auto-dim-other-buffers
+@item
+avy
+@item
+awesome-tray
+@item
+binder
+@item
+bm
+@item
+bongo
+@item
+boon
+@item
+breakpoint (provided by the built-in @samp{gdb-mi.el} library)
+@item
+buffer-expose
+@item
+calendar and diary
+@item
+calfw
+@item
+centaur-tabs
+@item
+change-log and log-view (such as @samp{vc-print-log} and
@samp{vc-print-root-log})
+@item
+cider
+@item
+circe
+@item
+color-rg
+@item
+column-enforce-mode
+@item
+company-mode*
+@item
+company-posframe
+@item
+compilation-mode
+@item
+completions
+@item
+counsel*
+@item
+counsel-css
+@item
+counsel-notmuch
+@item
+counsel-org-capture-string
+@item
+cov
+@item
+cperl-mode
+@item
+csv-mode
+@item
+ctrlf
+@item
+custom (@kbd{M-x customize})
+@item
+dap-mode
+@item
+dashboard (emacs-dashboard)
+@item
+deadgrep
+@item
+debbugs
+@item
+define-word
+@item
+deft
+@item
+dictionary
+@item
+diff-hl
+@item
+diff-mode
+@item
+dim-autoload
+@item
+dir-treeview
+@item
+dired
+@item
+dired-async
+@item
+dired-git
+@item
+dired-git-info
+@item
+dired-narrow
+@item
+dired-subtree
+@item
+diredfl
+@item
+disk-usage
+@item
+doom-modeline
+@item
+dynamic-ruler
+@item
+easy-jekyll
+@item
+easy-kill
+@item
+ebdb
+@item
+ediff
+@item
+eglot
+@item
+el-search
+@item
+eldoc-box
+@item
+elfeed
+@item
+elfeed-score
+@item
+emms
+@item
+enhanced-ruby-mode
+@item
+epa
+@item
+equake
+@item
+erc
+@item
+eros
+@item
+ert
+@item
+eshell
+@item
+eshell-fringe-status
+@item
+eshell-git-prompt
+@item
+eshell-prompt-extras (epe)
+@item
+eshell-syntax-highlighting
+@item
+evil* (evil-mode)
+@item
+evil-goggles
+@item
+evil-visual-mark-mode
+@item
+eww
+@item
+eyebrowse
+@item
+fancy-dabbrev
+@item
+flycheck
+@item
+flycheck-color-mode-line
+@item
+flycheck-indicator
+@item
+flycheck-posframe
+@item
+flymake
+@item
+flyspell
+@item
+flyspell-correct
+@item
+flx
+@item
+freeze-it
+@item
+frog-menu
+@item
+focus
+@item
+fold-this
+@item
+font-lock (generic syntax highlighting)
+@item
+forge
+@item
+fountain (fountain-mode)
+@item
+geiser
+@item
+git-commit
+@item
+git-gutter (and variants)
+@item
+git-lens
+@item
+git-rebase
+@item
+git-timemachine
+@item
+git-walktree
+@item
+gnus
+@item
+golden-ratio-scroll-screen
+@item
+helm*
+@item
+helm-ls-git
+@item
+helm-switch-shell
+@item
+helm-xref
+@item
+helpful
+@item
+highlight-blocks
+@item
+highlight-defined
+@item
+highlight-escape-sequences (@samp{hes-mode})
+@item
+highlight-indentation
+@item
+highlight-numbers
+@item
+highlight-symbol
+@item
+highlight-tail
+@item
+highlight-thing
+@item
+hl-defined
+@item
+hl-fill-column
+@item
+hl-line-mode
+@item
+hl-todo
+@item
+hydra
+@item
+hyperlist
+@item
+ibuffer
+@item
+icomplete
+@item
+icomplete-vertical
+@item
+ido-mode
+@item
+iedit
+@item
+iflipb
+@item
+imenu-list
+@item
+indium
+@item
+info
+@item
+info-colors
+@item
+interaction-log
+@item
+ioccur
+@item
+isearch, occur, etc.
+@item
+ivy*
+@item
+ivy-posframe
+@item
+jira (org-jira)
+@item
+journalctl-mode
+@item
+js2-mode
+@item
+julia
+@item
+jupyter
+@item
+kaocha-runner
+@item
+keycast
+@item
+line numbers (@samp{display-line-numbers-mode} and global variant)
+@item
+lsp-mode
+@item
+lsp-ui
+@item
+magit
+@item
+magit-imerge
+@item
+man
+@item
+markdown-mode
+@item
+markup-faces (@samp{adoc-mode})
+@item
+mentor
+@item
+messages
+@item
+minibuffer-line
+@item
+minimap
+@item
+modeline
+@item
+mood-line
+@item
+moody
+@item
+mpdel
+@item
+mu4e
+@item
+mu4e-conversation
+@item
+multiple-cursors
+@item
+neotree
+@item
+no-emoji
+@item
+notmuch
+@item
+num3-mode
+@item
+nxml-mode
+@item
+objed
+@item
+orderless
+@item
+org*
+@item
+org-journal
+@item
+org-noter
+@item
+org-pomodoro
+@item
+org-recur
+@item
+org-roam
+@item
+org-superstar
+@item
+org-table-sticky-header
+@item
+org-treescope
+@item
+origami
+@item
+outline-mode
+@item
+outline-minor-faces
+@item
+package (@kbd{M-x list-packages})
+@item
+page-break-lines
+@item
+paradox
+@item
+paren-face
+@item
+parrot
+@item
+pass
+@item
+persp-mode
+@item
+perspective
+@item
+phi-grep
+@item
+phi-search
+@item
+pkgbuild-mode
+@item
+pomidor
+@item
+powerline
+@item
+powerline-evil
+@item
+proced
+@item
+prodigy
+@item
+racket-mode
+@item
+rainbow-blocks
+@item
+rainbow-identifiers
+@item
+rainbow-delimiters
+@item
+rcirc
+@item
+regexp-builder (also known as @samp{re-builder})
+@item
+rg (rg.el)
+@item
+ripgrep
+@item
+rmail
+@item
+ruler-mode
+@item
+sallet
+@item
+selectrum
+@item
+semantic
+@item
+sesman
+@item
+shell-script-mode
+@item
+show-paren-mode
+@item
+side-notes
+@item
+skewer-mode
+@item
+smart-mode-line
+@item
+smartparens
+@item
+smerge
+@item
+spaceline
+@item
+speedbar
+@item
+spell-fu
+@item
+stripes
+@item
+suggest
+@item
+switch-window
+@item
+swiper
+@item
+swoop
+@item
+sx
+@item
+symbol-overlay
+@item
+syslog-mode
+@item
+table (built-in table.el)
+@item
+telephone-line
+@item
+term
+@item
+tomatinho
+@item
+transient (pop-up windows such as Magit's)
+@item
+trashed
+@item
+treemacs
+@item
+tty-menu
+@item
+tuareg
+@item
+typescript
+@item
+undo-tree
+@item
+vc (built-in mode line status for version control)
+@item
+vc-annotate (@kbd{C-x v g})
+@item
+vdiff
+@item
+vimish-fold
+@item
+visible-mark
+@item
+visual-regexp
+@item
+volatile-highlights
+@item
+vterm
+@item
+wcheck-mode
+@item
+web-mode
+@item
+wgrep
+@item
+which-function-mode
+@item
+which-key
+@item
+whitespace-mode
+@item
+window-divider-mode
+@item
+winum
+@item
+writegood-mode
+@item
+woman
+@item
+xah-elisp-mode
+@item
+xref
+@item
+xterm-color (and ansi-colors)
+@item
+yaml-mode
+@item
+yasnippet
+@item
+ztree
+@end itemize
+
+Plus many other miscellaneous faces that are provided by the upstream
+GNU Emacs distribution.
+
+@node Covered indirectly
+@section Covered indirectly
+
+These do not require any extra styles because they are configured to
+inherit from some basic faces. Please confirm.
+
+@itemize
+@item
+edit-indirect
+@item
+evil-owl
+@item
+perl-mode
+@item
+php-mode
+@item
+rjsx-mode
+@item
+swift-mode
+@end itemize
+
+@node Will NOT be supported
+@section Will NOT be supported
+
+I have thus far identified a single package that does fit into the
+overarching objective of this project:
@uref{https://github.com/hlissner/emacs-solaire-mode, solaire}. It basically
tries to
+cast a less intense background on the main file-visiting buffers, so
+that secondary elements like sidebars can have the default (pure
+white/black) background.
+
+I will only cover this package if it ever supports the inverse effect:
+less intense colors (but still accessible) for supportive interfaces
+and the intended styles for the content you are actually working on.
+
+@node Notes for individual packages
+@chapter Notes for individual packages
+
+This section covers information that may be of interest to users of
+individual packages.
+
+@menu
+* Note on company-mode overlay pop-up::
+* Note for ERC escaped color sequences::
+* Note for powerline or spaceline::
+* Note on shr colors::
+* Note for Helm grep::
+* Note on vc-annotate-background-mode::
+@end menu
+
+@node Note on company-mode overlay pop-up
+@section Note on company-mode overlay pop-up
+
+By default, the @samp{company-mode} pop-up that lists completion candidates is
+drawn using an overlay. This creates alignment issues every time it is
+placed above a piece of text that has a different height than the
+default.
+
+The solution recommended by the project's maintainer is to use an
+alternative front-end for drawing the pop-up which uses child frames
+instead of
overlays.@footnote{@uref{https://github.com/company-mode/company-mode/issues/1010}}@footnote{@uref{https://github.com/tumashu/company-posframe/}}
+
+@node Note for ERC escaped color sequences
+@section Note for ERC escaped color sequences
+
+The built-in IRC client @samp{erc} has the ability to colorise any text using
+escape sequences that start with @samp{^C} (inserted with @samp{C-q C-c}) and
are
+followed by a number for the foreground and background.@footnote{This page
+explains the basics, though it is not specific to Emacs:
+@uref{https://www.mirc.com/colors.html}} Possible numbers are 0-15, with the
+first entry being the foreground and the second the background,
+separated by a comma. Like this @samp{^C1,6}. The minimum setup is this:
+
+@lisp
+(add-to-list 'erc-modules 'irccontrols)
+(setq erc-interpret-controls-p t
+ erc-interpret-mirc-color t)
+@end lisp
+
+As this allows users to make arbitrary combinations, it is impossible to
+guarantee a consistently high contrast ratio. All we can we do is
+provide guidance on the combinations that satisfy the accessibility
+standard of the themes:
+
+@table @asis
+@item Modus Operandi
+Use foreground color 1 for all backgrounds from
+2-15. Like so: @samp{C-q C-c1,N} where @samp{N} is the background.
+
+@item Modus Vivendi
+Use foreground color 0 for all backgrounds from
+2-13. Use foreground @samp{1} for backgrounds 14, 15.
+@end table
+
+Colors 0 and 1 are white and black respectively. So combine them
+together, if you must.
+
+@node Note for powerline or spaceline
+@section Note for powerline or spaceline
+
+Both Powerline and Spaceline package users will likely need to use the
+command @samp{powerline-reset} whenever they make changes to their themes
+and/or modeline setup.
+
+@node Note on shr colors
+@section Note on shr colors
+
+Emacs' HTML rendering mechanism (@samp{shr}) may need explicit configuration to
+respect the theme's colors instead of whatever specifications the
+webpage provides. Consult @kbd{C-h v shr-use-colors}.
+
+@node Note for Helm grep
+@section Note for Helm grep
+
+There is one face from the Helm package that is meant to highlight the
+matches of a grep or grep-like command (@samp{ag} or @samp{ripgrep}). It is
+@samp{helm-grep-match}. However, this face can only apply when the user does
+not pass @samp{--color=always} as a command-line option for their command.
+
+Here is the docstring for that face, which is defined in the
+@samp{helm-grep.el} library (view a library with @samp{M-x find-library}).
+
+@quotation
+Face used to highlight grep matches. Have no effect when grep backend
+use ``--color=''
+
+@end quotation
+
+The user must either remove @samp{--color} from the flags passed to the grep
+function, or explicitly use @samp{--color=never} (or equivalent). Helm
+provides user-facing customization options for controlling the grep
+function's parameters, such as @samp{helm-grep-default-command} and
+@samp{helm-grep-git-grep-command}.
+
+When @samp{--color=always} is in effect, the grep output will use red text in
+bold letter forms to present the matching part in the list of
+candidates. That style still meets the contrast ratio target of >= 7:1
+(accessibility standard WCAG AAA), because it draws the reference to
+ANSI color number 1 (red) from the already-supported array of
+@samp{ansi-color-names-vector}.
+
+@node Note on vc-annotate-background-mode
+@section Note on vc-annotate-background-mode
+
+Due to the unique way @samp{vc-annotate} (@kbd{C-x v g}) applies colors,
support for
+its background mode (@samp{vc-annotate-background-mode}) is disabled at the
+theme level.
+
+Normally, such a drastic measure should not belong in a theme: assuming
+the user's preferences is bad practice. However, it has been deemed
+necessary in the interest of preserving color contrast accessibility
+while still supporting a useful built-in tool.
+
+If there actually is a way to avoid such a course of action, without
+prejudice to the accessibility standard of this project, then please
+report as much or send patches (see @ref{Contributing}).
+
+@node Contributing
+@chapter Contributing
+
+This section documents the canonical sources of the themes and the ways
+in which you can contribute to their ongoing development.
+
+@menu
+* Sources of the themes::
+* Issues you can help with::
+* Merge requests:: Legal considerations for code patches
+@end menu
+
+@node Sources of the themes
+@section Sources of the themes
+
+The @samp{modus-operandi} and @samp{modus-vivendi} themes are built into Emacs.
+Currently they are in the project's @samp{master} branch, which is tracking the
+next development release target.
+
+The source code of the themes is
@uref{https://gitlab.com/protesilaos/modus-themes/, available on Gitlab}, for
the time
+being. A @uref{https://github.com/protesilaos/modus-themes/, mirror on
Github} is also on offer.
+
+An HTML version of this manual is available as an extension to the
+@uref{https://protesilaos.com/modus-themes/, author's personal website} (does
not rely on any non-free code).
+
+@node Issues you can help with
+@section Issues you can help with
+
+A few tasks you can help with:
+
+@itemize
+@item
+Suggest refinements to packages that are covered.
+@item
+Report packages not covered thus far.
+@item
+Report bugs, inconsistencies, shortcomings.
+@item
+Help expand the documentation of covered-but-not-styled packages.
+@item
+Suggest refinements to the color palette.
+@item
+Help expand this document or any other piece of documentation.
+@item
+Merge requests for code refinements.
+@end itemize
+
+@xref{Merge requests, , Patches require copyright assignment to the FSF}.
+
+It would be great if your feedback also includes some screenshots, GIFs,
+or short videos, as well as further instructions to reproduce a given
+setup. Though this is not a requirement.
+
+Whatever you do, bear in mind the overarching objective of the Modus
+themes: to keep a contrast ratio that is greater or equal to 7:1 between
+background and foreground colors. If a compromise is ever necessary
+between aesthetics and accessibility, it shall always be made in the
+interest of the latter.
+
+@node Merge requests
+@section Patches require copyright assignment to the FSF
+
+Code contributions are most welcome. For any major edit (more than 15
+lines, or so, in aggregate per person), you need to make a copyright
+assignment to the Free Software Foundation. This is necessary because
+the themes are part of the upstream Emacs distribution: the FSF must at
+all times be in a position to enforce the GNU General Public License.
+
+Copyright assignment is a simple process. Check the request form below
+(please adapt it accordingly). You must write an email to the address
+mentioned in the form and then wait for the FSF to send you a legal
+agreement. Sign the document and file it back to them. This could all
+happen via email and take about a week. You are encouraged to go
+through this process. You only need to do it once. It will allow you
+to make contributions to Emacs in general.
+
+@example
+Please email the following information to assign@@gnu.org, and we
+will send you the assignment form for your past and future changes.
+
+Please use your full legal name (in ASCII characters) as the subject
+line of the message.
+----------------------------------------------------------------------
+REQUEST: SEND FORM FOR PAST AND FUTURE CHANGES
+
+[What is the name of the program or package you're contributing to?]
+
+GNU Emacs
+
+[Did you copy any files or text written by someone else in these changes?
+Even if that material is free software, we need to know about it.]
+
+Copied a few snippets from the same files I edited. Their author,
+Protesilaos Stavrou, has already assigned copyright to the Free Software
+Foundation.
+
+[Do you have an employer who might have a basis to claim to own
+your changes? Do you attend a school which might make such a claim?]
+
+
+[For the copyright registration, what country are you a citizen of?]
+
+
+[What year were you born?]
+
+
+[Please write your email address here.]
+
+
+[Please write your postal address here.]
+
+
+
+
+
+[Which files have you changed so far, and which new files have you written
+so far?]
+
+Changed a couple of themes that are part of the Emacs source code:
+
+./etc/themes/modus-operandi-theme.el
+./etc/themes/modus-vivendi-theme.el
+@end example
+
+@node Acknowledgements
+@chapter Acknowledgements
+
+The Modus themes are a collective effort. Every contribution counts.
+
+@table @asis
+@item Author/maintainer
+Protesilaos Stavrou.
+
+@item Code contributions
+Anders Johansson, Basil L@. Contovounisios,
+Markus Beppler, Matthew Stevenson.
+
+@item Ideas and user feedback
+Aaron Jensen, Adam Spiers, Alex Griffin,
+Alex Peitsinis, Alexey Shmalko, Anders Johansson, André Alexandre
+Gomes, Arif Rezai, Basil L@. Contovounisios, Damien Cassou, Dario
+Gjorgjevski, David Edmondson, Davor Rotim, Divan Santana, Gerry
+Agbobada, Gianluca Recchia, Iris Garcia, Len Trigg, Manuel Uberti,
+Mark Burton, Markus Beppler, Michael Goldenberg, Murilo Pereira,
+Nicolas De Jaeghere, Pierre Téchoueyres, Roman Rudakov, Ryan Phillips,
+Shreyas Ragavan, Tassilo Horn, Thibaut Verron, Trey Merkley, Uri
+Sharf, Utkarsh Singh, Vincent Foley. As well as users: Ben,
+Fourchaux, Fredrik, Moesasji, Nick, TheBlob42, dinko, doolio, jixiuf,
+okamsn, tycho garen.
+
+@item Packaging
+Dhavan Vaidya (Debian), Stefan Kangas (core Emacs),
+Stefan Monnier (GNU Elpa).
+
+@item Inspiration for certain features
+Fabrice Niessen (leuven-theme),
+Bozhidar Batsov (zenburn-theme).
+@end table
+
+@node Meta
+@chapter Meta
+
+If you are curious about the principles that govern the development of
+this project read the essay
@uref{https://protesilaos.com/codelog/2020-03-17-design-modus-themes-emacs/, On
the design of the Modus themes}
+(2020-03-17).
+
+Here are some more publications for those interested in the kind of work
+that goes into this project (sometimes the commits also include details
+of this sort):
+
+@itemize
+@item
+@uref{https://protesilaos.com/codelog/2020-05-10-modus-operandi-palette-review/,
Modus Operandi theme subtle palette review} (2020-05-10)
+@item
+@uref{https://protesilaos.com/codelog/2020-06-13-modus-vivendi-palette-review/,
Modus Vivendi theme subtle palette review} (2020-06-13)
+@item
+@uref{https://protesilaos.com/codelog/2020-07-04-modus-themes-faint-colours/,
Modus themes: new ``faint syntax'' option} (2020-07-04)
+@item
+@uref{https://protesilaos.com/codelog/2020-07-08-modus-themes-nuanced-colours/,
Modus themes: major review of ``nuanced'' colours} (2020-07-08)
+@item
+@uref{https://protesilaos.com/codelog/2020-09-14-modus-themes-review-blues/,
Modus themes: review of blue colours} (2020-09-14)
+@end itemize
+
+And here are the canonical sources for this project's documentation:
+
+@table @asis
+@item Manual
+@uref{https://protesilaos.com/modus-themes}
+@item Change Log
+@uref{https://protesilaos.com/modus-themes-changelog}
+@item Screenshots
+@uref{https://protesilaos.com/modus-themes-pictures}
+@end table
+
+@node External projects (ports)
+@chapter External projects (ports)
+
+The present section documents projects that extend the scope of the
+Modus themes. The following list will be updated whenever relevant
+information is brought to my attention. If you already have or intend
+to produce such a port, feel welcome @uref{https://protesilaos.com/contact, to
contact me}.
+
+@table @asis
+@item Modus exporter
+This is @uref{https://github.com/polaris64/modus-exporter, an Elisp library
written by Simon Pugnet}.
+Licensed under the terms of the GNU General Public License. It is
+meant to capture the color values of the active Modus theme (Operandi
+or Vivendi) and output it as a valid theme for some other application.
+@end table
+
+@node GNU Free Documentation License
+@appendix GNU Free Documentation License
+
+@example
+ GNU Free Documentation License
+ Version 1.3, 3 November 2008
+
+
+ Copyright (C) 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc.
+ <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+0. PREAMBLE
+
+The purpose of this License is to make a manual, textbook, or other
+functional and useful document "free" in the sense of freedom: to
+assure everyone the effective freedom to copy and redistribute it,
+with or without modifying it, either commercially or noncommercially.
+Secondarily, this License preserves for the author and publisher a way
+to get credit for their work, while not being considered responsible
+for modifications made by others.
+
+This License is a kind of "copyleft", which means that derivative
+works of the document must themselves be free in the same sense. It
+complements the GNU General Public License, which is a copyleft
+license designed for free software.
+
+We have designed this License in order to use it for manuals for free
+software, because free software needs free documentation: a free
+program should come with manuals providing the same freedoms that the
+software does. But this License is not limited to software manuals;
+it can be used for any textual work, regardless of subject matter or
+whether it is published as a printed book. We recommend this License
+principally for works whose purpose is instruction or reference.
+
+
+1. APPLICABILITY AND DEFINITIONS
+
+This License applies to any manual or other work, in any medium, that
+contains a notice placed by the copyright holder saying it can be
+distributed under the terms of this License. Such a notice grants a
+world-wide, royalty-free license, unlimited in duration, to use that
+work under the conditions stated herein. The "Document", below,
+refers to any such manual or work. Any member of the public is a
+licensee, and is addressed as "you". You accept the license if you
+copy, modify or distribute the work in a way requiring permission
+under copyright law.
+
+A "Modified Version" of the Document means any work containing the
+Document or a portion of it, either copied verbatim, or with
+modifications and/or translated into another language.
+
+A "Secondary Section" is a named appendix or a front-matter section of
+the Document that deals exclusively with the relationship of the
+publishers or authors of the Document to the Document's overall
+subject (or to related matters) and contains nothing that could fall
+directly within that overall subject. (Thus, if the Document is in
+part a textbook of mathematics, a Secondary Section may not explain
+any mathematics.) The relationship could be a matter of historical
+connection with the subject or with related matters, or of legal,
+commercial, philosophical, ethical or political position regarding
+them.
+
+The "Invariant Sections" are certain Secondary Sections whose titles
+are designated, as being those of Invariant Sections, in the notice
+that says that the Document is released under this License. If a
+section does not fit the above definition of Secondary then it is not
+allowed to be designated as Invariant. The Document may contain zero
+Invariant Sections. If the Document does not identify any Invariant
+Sections then there are none.
+
+The "Cover Texts" are certain short passages of text that are listed,
+as Front-Cover Texts or Back-Cover Texts, in the notice that says that
+the Document is released under this License. A Front-Cover Text may
+be at most 5 words, and a Back-Cover Text may be at most 25 words.
+
+A "Transparent" copy of the Document means a machine-readable copy,
+represented in a format whose specification is available to the
+general public, that is suitable for revising the document
+straightforwardly with generic text editors or (for images composed of
+pixels) generic paint programs or (for drawings) some widely available
+drawing editor, and that is suitable for input to text formatters or
+for automatic translation to a variety of formats suitable for input
+to text formatters. A copy made in an otherwise Transparent file
+format whose markup, or absence of markup, has been arranged to thwart
+or discourage subsequent modification by readers is not Transparent.
+An image format is not Transparent if used for any substantial amount
+of text. A copy that is not "Transparent" is called "Opaque".
+
+Examples of suitable formats for Transparent copies include plain
+ASCII without markup, Texinfo input format, LaTeX input format, SGML
+or XML using a publicly available DTD, and standard-conforming simple
+HTML, PostScript or PDF designed for human modification. Examples of
+transparent image formats include PNG, XCF and JPG. Opaque formats
+include proprietary formats that can be read and edited only by
+proprietary word processors, SGML or XML for which the DTD and/or
+processing tools are not generally available, and the
+machine-generated HTML, PostScript or PDF produced by some word
+processors for output purposes only.
+
+The "Title Page" means, for a printed book, the title page itself,
+plus such following pages as are needed to hold, legibly, the material
+this License requires to appear in the title page. For works in
+formats which do not have any title page as such, "Title Page" means
+the text near the most prominent appearance of the work's title,
+preceding the beginning of the body of the text.
+
+The "publisher" means any person or entity that distributes copies of
+the Document to the public.
+
+A section "Entitled XYZ" means a named subunit of the Document whose
+title either is precisely XYZ or contains XYZ in parentheses following
+text that translates XYZ in another language. (Here XYZ stands for a
+specific section name mentioned below, such as "Acknowledgements",
+"Dedications", "Endorsements", or "History".) To "Preserve the Title"
+of such a section when you modify the Document means that it remains a
+section "Entitled XYZ" according to this definition.
+
+The Document may include Warranty Disclaimers next to the notice which
+states that this License applies to the Document. These Warranty
+Disclaimers are considered to be included by reference in this
+License, but only as regards disclaiming warranties: any other
+implication that these Warranty Disclaimers may have is void and has
+no effect on the meaning of this License.
+
+2. VERBATIM COPYING
+
+You may copy and distribute the Document in any medium, either
+commercially or noncommercially, provided that this License, the
+copyright notices, and the license notice saying this License applies
+to the Document are reproduced in all copies, and that you add no
+other conditions whatsoever to those of this License. You may not use
+technical measures to obstruct or control the reading or further
+copying of the copies you make or distribute. However, you may accept
+compensation in exchange for copies. If you distribute a large enough
+number of copies you must also follow the conditions in section 3.
+
+You may also lend copies, under the same conditions stated above, and
+you may publicly display copies.
+
+
+3. COPYING IN QUANTITY
+
+If you publish printed copies (or copies in media that commonly have
+printed covers) of the Document, numbering more than 100, and the
+Document's license notice requires Cover Texts, you must enclose the
+copies in covers that carry, clearly and legibly, all these Cover
+Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
+the back cover. Both covers must also clearly and legibly identify
+you as the publisher of these copies. The front cover must present
+the full title with all words of the title equally prominent and
+visible. You may add other material on the covers in addition.
+Copying with changes limited to the covers, as long as they preserve
+the title of the Document and satisfy these conditions, can be treated
+as verbatim copying in other respects.
+
+If the required texts for either cover are too voluminous to fit
+legibly, you should put the first ones listed (as many as fit
+reasonably) on the actual cover, and continue the rest onto adjacent
+pages.
+
+If you publish or distribute Opaque copies of the Document numbering
+more than 100, you must either include a machine-readable Transparent
+copy along with each Opaque copy, or state in or with each Opaque copy
+a computer-network location from which the general network-using
+public has access to download using public-standard network protocols
+a complete Transparent copy of the Document, free of added material.
+If you use the latter option, you must take reasonably prudent steps,
+when you begin distribution of Opaque copies in quantity, to ensure
+that this Transparent copy will remain thus accessible at the stated
+location until at least one year after the last time you distribute an
+Opaque copy (directly or through your agents or retailers) of that
+edition to the public.
+
+It is requested, but not required, that you contact the authors of the
+Document well before redistributing any large number of copies, to
+give them a chance to provide you with an updated version of the
+Document.
+
+
+4. MODIFICATIONS
+
+You may copy and distribute a Modified Version of the Document under
+the conditions of sections 2 and 3 above, provided that you release
+the Modified Version under precisely this License, with the Modified
+Version filling the role of the Document, thus licensing distribution
+and modification of the Modified Version to whoever possesses a copy
+of it. In addition, you must do these things in the Modified Version:
+
+A. Use in the Title Page (and on the covers, if any) a title distinct
+ from that of the Document, and from those of previous versions
+ (which should, if there were any, be listed in the History section
+ of the Document). You may use the same title as a previous version
+ if the original publisher of that version gives permission.
+B. List on the Title Page, as authors, one or more persons or entities
+ responsible for authorship of the modifications in the Modified
+ Version, together with at least five of the principal authors of the
+ Document (all of its principal authors, if it has fewer than five),
+ unless they release you from this requirement.
+C. State on the Title page the name of the publisher of the
+ Modified Version, as the publisher.
+D. Preserve all the copyright notices of the Document.
+E. Add an appropriate copyright notice for your modifications
+ adjacent to the other copyright notices.
+F. Include, immediately after the copyright notices, a license notice
+ giving the public permission to use the Modified Version under the
+ terms of this License, in the form shown in the Addendum below.
+G. Preserve in that license notice the full lists of Invariant Sections
+ and required Cover Texts given in the Document's license notice.
+H. Include an unaltered copy of this License.
+I. Preserve the section Entitled "History", Preserve its Title, and add
+ to it an item stating at least the title, year, new authors, and
+ publisher of the Modified Version as given on the Title Page. If
+ there is no section Entitled "History" in the Document, create one
+ stating the title, year, authors, and publisher of the Document as
+ given on its Title Page, then add an item describing the Modified
+ Version as stated in the previous sentence.
+J. Preserve the network location, if any, given in the Document for
+ public access to a Transparent copy of the Document, and likewise
+ the network locations given in the Document for previous versions
+ it was based on. These may be placed in the "History" section.
+ You may omit a network location for a work that was published at
+ least four years before the Document itself, or if the original
+ publisher of the version it refers to gives permission.
+K. For any section Entitled "Acknowledgements" or "Dedications",
+ Preserve the Title of the section, and preserve in the section all
+ the substance and tone of each of the contributor acknowledgements
+ and/or dedications given therein.
+L. Preserve all the Invariant Sections of the Document,
+ unaltered in their text and in their titles. Section numbers
+ or the equivalent are not considered part of the section titles.
+M. Delete any section Entitled "Endorsements". Such a section
+ may not be included in the Modified Version.
+N. Do not retitle any existing section to be Entitled "Endorsements"
+ or to conflict in title with any Invariant Section.
+O. Preserve any Warranty Disclaimers.
+
+If the Modified Version includes new front-matter sections or
+appendices that qualify as Secondary Sections and contain no material
+copied from the Document, you may at your option designate some or all
+of these sections as invariant. To do this, add their titles to the
+list of Invariant Sections in the Modified Version's license notice.
+These titles must be distinct from any other section titles.
+
+You may add a section Entitled "Endorsements", provided it contains
+nothing but endorsements of your Modified Version by various
+parties--for example, statements of peer review or that the text has
+been approved by an organization as the authoritative definition of a
+standard.
+
+You may add a passage of up to five words as a Front-Cover Text, and a
+passage of up to 25 words as a Back-Cover Text, to the end of the list
+of Cover Texts in the Modified Version. Only one passage of
+Front-Cover Text and one of Back-Cover Text may be added by (or
+through arrangements made by) any one entity. If the Document already
+includes a cover text for the same cover, previously added by you or
+by arrangement made by the same entity you are acting on behalf of,
+you may not add another; but you may replace the old one, on explicit
+permission from the previous publisher that added the old one.
+
+The author(s) and publisher(s) of the Document do not by this License
+give permission to use their names for publicity for or to assert or
+imply endorsement of any Modified Version.
+
+
+5. COMBINING DOCUMENTS
+
+You may combine the Document with other documents released under this
+License, under the terms defined in section 4 above for modified
+versions, provided that you include in the combination all of the
+Invariant Sections of all of the original documents, unmodified, and
+list them all as Invariant Sections of your combined work in its
+license notice, and that you preserve all their Warranty Disclaimers.
+
+The combined work need only contain one copy of this License, and
+multiple identical Invariant Sections may be replaced with a single
+copy. If there are multiple Invariant Sections with the same name but
+different contents, make the title of each such section unique by
+adding at the end of it, in parentheses, the name of the original
+author or publisher of that section if known, or else a unique number.
+Make the same adjustment to the section titles in the list of
+Invariant Sections in the license notice of the combined work.
+
+In the combination, you must combine any sections Entitled "History"
+in the various original documents, forming one section Entitled
+"History"; likewise combine any sections Entitled "Acknowledgements",
+and any sections Entitled "Dedications". You must delete all sections
+Entitled "Endorsements".
+
+
+6. COLLECTIONS OF DOCUMENTS
+
+You may make a collection consisting of the Document and other
+documents released under this License, and replace the individual
+copies of this License in the various documents with a single copy
+that is included in the collection, provided that you follow the rules
+of this License for verbatim copying of each of the documents in all
+other respects.
+
+You may extract a single document from such a collection, and
+distribute it individually under this License, provided you insert a
+copy of this License into the extracted document, and follow this
+License in all other respects regarding verbatim copying of that
+document.
+
+
+7. AGGREGATION WITH INDEPENDENT WORKS
+
+A compilation of the Document or its derivatives with other separate
+and independent documents or works, in or on a volume of a storage or
+distribution medium, is called an "aggregate" if the copyright
+resulting from the compilation is not used to limit the legal rights
+of the compilation's users beyond what the individual works permit.
+When the Document is included in an aggregate, this License does not
+apply to the other works in the aggregate which are not themselves
+derivative works of the Document.
+
+If the Cover Text requirement of section 3 is applicable to these
+copies of the Document, then if the Document is less than one half of
+the entire aggregate, the Document's Cover Texts may be placed on
+covers that bracket the Document within the aggregate, or the
+electronic equivalent of covers if the Document is in electronic form.
+Otherwise they must appear on printed covers that bracket the whole
+aggregate.
+
+
+8. TRANSLATION
+
+Translation is considered a kind of modification, so you may
+distribute translations of the Document under the terms of section 4.
+Replacing Invariant Sections with translations requires special
+permission from their copyright holders, but you may include
+translations of some or all Invariant Sections in addition to the
+original versions of these Invariant Sections. You may include a
+translation of this License, and all the license notices in the
+Document, and any Warranty Disclaimers, provided that you also include
+the original English version of this License and the original versions
+of those notices and disclaimers. In case of a disagreement between
+the translation and the original version of this License or a notice
+or disclaimer, the original version will prevail.
+
+If a section in the Document is Entitled "Acknowledgements",
+"Dedications", or "History", the requirement (section 4) to Preserve
+its Title (section 1) will typically require changing the actual
+title.
+
+
+9. TERMINATION
+
+You may not copy, modify, sublicense, or distribute the Document
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense, or distribute it is void, and
+will automatically terminate your rights under this License.
+
+However, if you cease all violation of this License, then your license
+from a particular copyright holder is reinstated (a) provisionally,
+unless and until the copyright holder explicitly and finally
+terminates your license, and (b) permanently, if the copyright holder
+fails to notify you of the violation by some reasonable means prior to
+60 days after the cessation.
+
+Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, receipt of a copy of some or all of the same material does
+not give you any rights to use it.
+
+
+10. FUTURE REVISIONS OF THIS LICENSE
+
+The Free Software Foundation may publish new, revised versions of the
+GNU Free Documentation License from time to time. Such new versions
+will be similar in spirit to the present version, but may differ in
+detail to address new problems or concerns. See
+https://www.gnu.org/licenses/.
+
+Each version of the License is given a distinguishing version number.
+If the Document specifies that a particular numbered version of this
+License "or any later version" applies to it, you have the option of
+following the terms and conditions either of that specified version or
+of any later version that has been published (not as a draft) by the
+Free Software Foundation. If the Document does not specify a version
+number of this License, you may choose any version ever published (not
+as a draft) by the Free Software Foundation. If the Document
+specifies that a proxy can decide which future versions of this
+License can be used, that proxy's public statement of acceptance of a
+version permanently authorizes you to choose that version for the
+Document.
+
+11. RELICENSING
+
+"Massive Multiauthor Collaboration Site" (or "MMC Site") means any
+World Wide Web server that publishes copyrightable works and also
+provides prominent facilities for anybody to edit those works. A
+public wiki that anybody can edit is an example of such a server. A
+"Massive Multiauthor Collaboration" (or "MMC") contained in the site
+means any set of copyrightable works thus published on the MMC site.
+
+"CC-BY-SA" means the Creative Commons Attribution-Share Alike 3.0
+license published by Creative Commons Corporation, a not-for-profit
+corporation with a principal place of business in San Francisco,
+California, as well as future copyleft versions of that license
+published by that same organization.
+
+"Incorporate" means to publish or republish a Document, in whole or in
+part, as part of another Document.
+
+An MMC is "eligible for relicensing" if it is licensed under this
+License, and if all works that were first published under this License
+somewhere other than this MMC, and subsequently incorporated in whole or
+in part into the MMC, (1) had no cover texts or invariant sections, and
+(2) were thus incorporated prior to November 1, 2008.
+
+The operator of an MMC Site may republish an MMC contained in the site
+under CC-BY-SA on the same site at any time before August 1, 2009,
+provided the MMC is eligible for relicensing.
+
+
+ADDENDUM: How to use this License for your documents
+
+To use this License in a document you have written, include a copy of
+the License in the document and put the following copyright and
+license notices just after the title page:
+
+ Copyright (c) YEAR YOUR NAME.
+ Permission is granted to copy, distribute and/or modify this document
+ under the terms of the GNU Free Documentation License, Version 1.3
+ or any later version published by the Free Software Foundation;
+ with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+ A copy of the license is included in the section entitled "GNU
+ Free Documentation License".
+
+If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
+replace the "with...Texts." line with this:
+
+ with the Invariant Sections being LIST THEIR TITLES, with the
+ Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
+
+If you have Invariant Sections without Cover Texts, or some other
+combination of the three, merge those two alternatives to suit the
+situation.
+
+If your document contains nontrivial examples of program code, we
+recommend releasing these examples in parallel under your choice of
+free software license, such as the GNU General Public License,
+to permit their use in free software.
+@end example
+
+@bye
diff --git a/etc/NEWS b/etc/NEWS
index 0ee69d9..1838b6b 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -181,6 +181,12 @@ would have to type 'M-: M-p' to edit and redo the
expression. Now
Emacs will echo the message and allow the user to continue editing.
+++
+** 'eval-last-sexp' now handles 'defvar'/'defcustom'/'defface' specially.
+This command would previously not redefine values defined by these
+forms, but this command has now been changed to work more like
+'eval-defun', and reset the values as specified.
+
++++
** New command 'undo-redo'.
It undoes previous undo commands, but doesn't record itself as an
undoable command.
@@ -429,6 +435,11 @@ tags to be considered as well.
** Gnus
+++
+*** New user option 'gnus-agent-eagerly-store-articles'.
+If non-nil (which is the default), the Gnus Agent will store all read
+articles in the Agent cache.
+
++++
*** New user option 'gnus-global-groups'.
Gnus handles private groups differently from public (i.e., NNTP-like)
groups. Most importantly, Gnus doesn't download external images from
@@ -572,9 +583,7 @@ skipped.
*** New command 'describe-keymap' describes keybindings in a keymap.
---
-*** New keybinding in 'help-for-help' to display a manual.
-The 'R' keybinding after 'C-h C-h' will prompt for a manual name and
-then display it.
+*** New keybinding 'C-h R' prompts for a manual to display and displays it.
+++
** New command 'lossage-size'.
@@ -1134,6 +1143,14 @@ window after starting). This variable defaults to nil.
** Miscellaneous
+---
+*** New user option 'compilation-search-all-directories'.
+When doing parallel builds, directories and compilation errors may
+arrive in the *compilation* buffer out-of-order. If this variable is
+non-nil (the default), Emacs will now search backwards in the buffer
+for any directory the file with errors may be in. If nil, this won't
+be done (and this restores how this previously worked).
+
+++
*** New user option 'next-error-message-highlight'.
In addition to a fringe arrow, 'next-error' error may now optionally
@@ -1163,6 +1180,11 @@ This is controlled by the 'search-highlight-submatches'
user option.
This feature is available only on terminals that have enough colors to
distinguish between sub-expression highlighting.
++++
+*** Interactive regular expression replace now uses faces for sub-groups.
+Like 'search-highlight-submatches', this is controlled by the new user option
+'query-replace-highlight-submatches'.
+
---
*** New user option 'reveal-auto-hide'.
If non-nil (the default), revealed text is automatically hidden when
diff --git a/etc/themes/modus-operandi-theme.el
b/etc/themes/modus-operandi-theme.el
index c1090ee..db61c97 100644
--- a/etc/themes/modus-operandi-theme.el
+++ b/etc/themes/modus-operandi-theme.el
@@ -1,10 +1,10 @@
;;; modus-operandi-theme.el --- Accessible light theme (WCAG AAA) -*-
lexical-binding:t -*-
-;; Copyright (c) 2019-2020 Free Software Foundation, Inc.
+;; Copyright (C) 2019-2020 Free Software Foundation, Inc.
;; Author: Protesilaos Stavrou <info@protesilaos.com>
;; URL: https://gitlab.com/protesilaos/modus-themes
-;; Version: 0.12.0
+;; Version: 0.13.0
;; Package-Requires: ((emacs "26.1"))
;; Keywords: faces, theme, accessibility
@@ -42,17 +42,18 @@
;; modus-operandi-theme-slanted-constructs (boolean)
;; modus-operandi-theme-bold-constructs (boolean)
;; modus-operandi-theme-variable-pitch-headings (boolean)
-;; modus-operandi-theme-rainbow-headings (boolean)
-;; modus-operandi-theme-section-headings (boolean)
+;; modus-operandi-theme-no-mixed-fonts (boolean)
+;; modus-operandi-theme-headings (alist)
;; modus-operandi-theme-scale-headings (boolean)
;; modus-operandi-theme-fringes (choice)
;; modus-operandi-theme-org-blocks (choice)
;; modus-operandi-theme-prompts (choice)
-;; modus-operandi-theme-3d-modeline (boolean)
-;; modus-operandi-theme-subtle-diffs (boolean)
+;; modus-operandi-theme-mode-line (choice)
+;; modus-operandi-theme-diffs (choice)
;; modus-operandi-theme-faint-syntax (boolean)
;; modus-operandi-theme-intense-hl-line (boolean)
;; modus-operandi-theme-intense-paren-match (boolean)
+;; modus-operandi-theme-no-link-underline (boolean)
;; modus-operandi-theme-completions (choice)
;; modus-operandi-theme-override-colors-alist (alist)
;;
@@ -81,6 +82,8 @@
;; auctex and TeX
;; auto-dim-other-buffers
;; avy
+;; awesome-tray
+;; binder
;; bm
;; bongo
;; boon
@@ -103,6 +106,7 @@
;; counsel-notmuch
;; counsel-org-capture-string
;; cov
+;; cperl-mode
;; csv-mode
;; ctrlf
;; custom (M-x customize)
@@ -116,6 +120,7 @@
;; diff-hl
;; diff-mode
;; dim-autoload
+;; dir-treeview
;; dired
;; dired-async
;; dired-git
@@ -132,6 +137,7 @@
;; ediff
;; eglot
;; el-search
+;; eldoc
;; eldoc-box
;; elfeed
;; elfeed-score
@@ -146,6 +152,7 @@
;; eshell-fringe-status
;; eshell-git-prompt
;; eshell-prompt-extras (epe)
+;; eshell-syntax-highlighting
;; evil (evil-mode)
;; evil-goggles
;; evil-visual-mark-mode
@@ -153,6 +160,7 @@
;; eyebrowse
;; fancy-dabbrev
;; flycheck
+;; flycheck-color-mode-line
;; flycheck-indicator
;; flycheck-posframe
;; flymake
@@ -229,6 +237,7 @@
;; minimap
;; modeline
;; mood-line
+;; mpdel
;; mu4e
;; mu4e-conversation
;; multiple-cursors
@@ -237,6 +246,7 @@
;; notmuch
;; num3-mode
;; nxml-mode
+;; objed
;; orderless
;; org
;; org-journal
@@ -266,6 +276,7 @@
;; powerline-evil
;; proced
;; prodigy
+;; racket-mode
;; rainbow-blocks
;; rainbow-identifiers
;; rainbow-delimiters
@@ -308,6 +319,7 @@
;; treemacs
;; tty-menu
;; tuareg
+;; typescript
;; undo-tree
;; vc (built-in mode line status for version control)
;; vc-annotate (C-x v g)
@@ -411,11 +423,19 @@ between foreground and background is >= 7:1)."
(defface modus-theme-diff-focus-changed nil nil)
(defface modus-theme-diff-focus-removed nil nil)
(defface modus-theme-diff-heading nil nil)
-(defface modus-theme-header nil nil) ; Name is tentative
+(defface modus-theme-pseudo-header nil nil)
(defface modus-theme-mark-alt nil nil)
(defface modus-theme-mark-del nil nil)
(defface modus-theme-mark-sel nil nil)
(defface modus-theme-mark-symbol nil nil)
+(defface modus-theme-heading-1 nil nil)
+(defface modus-theme-heading-2 nil nil)
+(defface modus-theme-heading-3 nil nil)
+(defface modus-theme-heading-4 nil nil)
+(defface modus-theme-heading-5 nil nil)
+(defface modus-theme-heading-6 nil nil)
+(defface modus-theme-heading-7 nil nil)
+(defface modus-theme-heading-8 nil nil)
(defface modus-theme-hl-line nil nil)
;;; Customisation options
@@ -441,14 +461,125 @@ between foreground and background is >= 7:1)."
"Use proportional fonts (variable-pitch) in headings."
:type 'boolean)
+(defcustom modus-operandi-theme-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."
+ :type 'boolean)
+
+(make-obsolete 'modus-operandi-theme-rainbow-headings
+ 'modus-operandi-theme-headings
+ "`modus-operandi-theme' 0.13.0")
+
(defcustom modus-operandi-theme-rainbow-headings nil
"Use more saturated colours for headings."
:type 'boolean)
+(make-obsolete 'modus-operandi-theme-section-headings
+ 'modus-operandi-theme-headings
+ "`modus-operandi-theme' 0.13.0")
+
(defcustom modus-operandi-theme-section-headings nil
"Use a background and an overline in headings."
:type 'boolean)
+(defcustom modus-operandi-theme-headings
+ '((t . nil))
+ "Alist of styles for headings, with optional value per level.
+
+To control faces per level from 1-8, use something like this:
+
+ (setq modus-operandi-theme-headings
+ '((1 . highlight)
+ (2 . line)
+ (t . rainbow-line-no-bold)))
+
+To set a uniform value for all heading levels, use this pattern:
+
+ (setq modus-operandi-theme-headings
+ '((t . rainbow-line-no-bold)))
+
+The default uses a fairly desaturated foreground value in
+combination with a bold typographic weight. To specify this
+style for a given level N (assuming you wish to have another
+fallback option), just specify the value t like this:
+
+ (setq modus-operandi-theme-headings
+ '((1 . t)
+ (2 . line)
+ (t . rainbow-line-no-bold)))
+
+A description of all possible values:
+
++ `no-bold' retains the default text colour while removing
+ the typographic weight.
+
++ `line' is the same as the default plus an overline over the
+ heading.
+
++ `line-no-bold' is the same as `line' without bold weight.
+
++ `rainbow' uses a more colourful foreground in combination
+ with bold weight.
+
++ `rainbow-line' is the same as `rainbow' plus an overline.
+
++ `rainbow-line-no-bold' is the same as `rainbow-line' without
+ the bold weight.
+
++ `highlight' retains the default style of a fairly desaturated
+ foreground combined with a bold weight and add to it a subtle
+ accented background.
+
++ `highlight-no-bold' is the same as `highlight' without a bold
+ weight.
+
++ `rainbow-highlight' is the same as `highlight' but with a more
+ colourful foreground.
+
++ `rainbow-highlight-no-bold' is the same as `rainbow-highlight'
+ without a bold weight.
+
++ `section' retains the default looks and adds to them both an
+ overline and a slightly accented background. It is, in effect,
+ a combination of the `line' and `highlight' values.
+
++ `section-no-bold' is the same as `section' without a bold
+ weight.
+
++ `rainbow-section' is the same as `section' but with a more
+ colourful foreground.
+
++ `rainbow-section-no-bold' is the same as `rainbow-section'
+ without a bold weight."
+ :type
+ '(alist
+ :key-type symbol
+ :value-type
+ (choice (const :tag "Fairly desaturated foreground with bold weight
(default)" t)
+ (const :tag "Like the default without bold weight" no-bold)
+ (const :tag "Like the default plus overline" line)
+ (const :tag "Like `line' without bold weight" line-no-bold)
+ (const :tag "Like the default but with more colourful foreground"
rainbow)
+ (const :tag "Like `rainbow' plus overline" rainbow-line)
+ (const :tag "Like `rainbow' without bold weight" rainbow-no-bold)
+ (const :tag "Like `rainbow-line' without bold weight"
rainbow-line-no-bold)
+ (const :tag "Like the default plus subtle background" highlight)
+ (const :tag "Like `highlight' without bold weight"
highlight-no-bold)
+ (const :tag "Like `highlight' with more colourful foreground"
rainbow-highlight)
+ (const :tag "Like `rainbow-highlight' without bold weight"
rainbow-highlight-no-bold)
+ (const :tag "Like `highlight' plus overline" section)
+ (const :tag "Like `section' without bold weight" section-no-bold)
+ (const :tag "Like `section' with more colourful foreground"
rainbow-section)
+ (const :tag "Like `rainbow-section' without bold weight"
rainbow-section-no-bold))))
+
(defcustom modus-operandi-theme-scale-headings nil
"Use font scaling for headings."
:type 'boolean)
@@ -508,8 +639,9 @@ For more on the matter, read the documentation of
`set-face-attribute', specifically the ':height' section."
:type 'number)
-(define-obsolete-variable-alias 'modus-operandi-theme-visible-fringes
- 'modus-operandi-theme-fringes "`modus-operandi-theme' 0.12.0")
+(make-obsolete 'modus-operandi-theme-visible-fringes
+ 'modus-operandi-theme-fringes
+ "`modus-operandi-theme' 0.12.0")
(defcustom modus-operandi-theme-visible-fringes nil
"Use a visible style for fringes."
@@ -527,15 +659,17 @@ pronounced greyscale value."
(const :tag "Subtle greyscale background" subtle)
(const :tag "Intense greyscale background" intense)))
-(define-obsolete-variable-alias 'modus-operandi-theme-distinct-org-blocks
- 'modus-operandi-theme-org-blocks "`modus-operandi-theme' 0.11.0")
+(make-obsolete 'modus-operandi-theme-distinct-org-blocks
+ 'modus-operandi-theme-org-blocks
+ "`modus-operandi-theme' 0.11.0")
(defcustom modus-operandi-theme-distinct-org-blocks nil
"Use a distinct neutral background for `org-mode' blocks."
:type 'boolean)
-(define-obsolete-variable-alias 'modus-operandi-theme-rainbow-org-src-blocks
- 'modus-operandi-theme-org-blocks "`modus-operandi-theme' 0.11.0")
+(make-obsolete 'modus-operandi-theme-rainbow-org-src-blocks
+ 'modus-operandi-theme-org-blocks
+ "`modus-operandi-theme' 0.11.0")
(defcustom modus-operandi-theme-rainbow-org-src-blocks nil
"Use colour-coded backgrounds for `org-mode' source blocks.
@@ -565,16 +699,69 @@ association list)."
(const :tag "Subtle grey block background" greyscale)
(const :tag "Colour-coded background per programming language"
rainbow)))
+(make-obsolete 'modus-operandi-theme-3d-modeline
+ 'modus-operandi-theme-mode-line
+ "`modus-operandi-theme' 0.13.0")
+
(defcustom modus-operandi-theme-3d-modeline nil
"Use a three-dimensional style for the active mode line."
:type 'boolean)
+(defcustom modus-operandi-theme-mode-line nil
+ "Adjust the overall style of the mode line.
+
+Nil is a two-dimensional rectangle with a border around it. The
+active and the inactive modelines use different shades of
+greyscale values for the background and foreground.
+
+A `3d' value will apply a three-dimensional effect to the active
+modeline. The inactive modelines remain two-dimensional and are
+toned down a bit, relative to the nil value.
+
+The `moody' option is meant to optimise the modeline for use with
+the library of the same name. This practically means to remove
+the box effect and rely on underline and overline properties
+instead. It also tones down the inactive modelines. Despite its
+intended purpose, this option can also be used without the
+`moody' library."
+ :type '(choice
+ (const :tag "Two-dimensional box (default)" nil)
+ (const :tag "Three-dimensional style for the active mode line" 3d)
+ (const :tag "No box effects, which are optimal for use with the
`moody' library" moody)))
+
+(make-obsolete 'modus-operandi-theme-subtle-diffs
+ 'modus-operandi-theme-diffs
+ "`modus-operandi-theme' 0.13.0")
+
(defcustom modus-operandi-theme-subtle-diffs nil
"Use fewer/dim backgrounds in `diff-mode', `ediff',`magit'."
:type 'boolean)
-(define-obsolete-variable-alias
'modus-operandi-theme-intense-standard-completions
- 'modus-operandi-theme-completions "`modus-operandi-theme' 0.12.0")
+(defcustom modus-operandi-theme-diffs nil
+ "Adjust the overall styles of diffs.
+
+Nil means to use fairly intense colour combinations for diffs.
+For example, you get a rich green background with a green
+foreground for added lines. Word-wise or 'refined' diffs follow
+the same pattern but use different shades of those colours to
+remain distinct.
+
+A `desaturated' value follows the same principles as with the nil
+option, while it tones down all relevant colours.
+
+Option `fg-only' will remove all accented backgrounds, except
+from word-wise changes. It instead uses colour-coded foreground
+values to differentiate between added/removed/changed lines. If
+a background is necessary, such as with `ediff', then a subtle
+greyscale value is used."
+ :type '(choice
+ (const :tag "Intensely coloured backgrounds (default)" nil)
+ (const :tag "Slightly accented backgrounds with tinted text"
desaturated)
+ (const :tag "No backgrounds, except for refined diffs" fg-only)))
+
+(make-obsolete 'modus-operandi-theme-intense-standard-completions
+ 'modus-operandi-theme-completions
+ "`modus-operandi-theme' 0.12.0")
(defcustom modus-operandi-theme-intense-standard-completions nil
"Use prominent backgrounds for Icomplete, Ido, or similar."
@@ -582,6 +769,7 @@ association list)."
(defcustom modus-operandi-theme-completions nil
"Apply special styles to the UI of completion frameworks.
+
This concerns Icomplete, Ivy, Helm, Selectrum, Ido, as well as
any other tool meant to enhance their experience. The effect
will vary depending on the completion framework.
@@ -621,7 +809,7 @@ effect than the former."
(const :tag "Intense background and foreground for the prompt"
intense)))
(defcustom modus-operandi-theme-intense-hl-line nil
- "Use more prominent background for `hl-line-mode'."
+ "Use more prominent background for command `hl-line-mode'."
:type 'boolean)
(defcustom modus-operandi-theme-intense-paren-match nil
@@ -632,6 +820,10 @@ effect than the former."
"Use less saturated colours for code syntax highlighting."
:type 'boolean)
+(defcustom modus-operandi-theme-no-link-underline nil
+ "Do not underline links."
+ :type 'boolean)
+
;;; Internal functions
;; Helper functions that are meant to ease the implementation of the
@@ -641,6 +833,11 @@ effect than the former."
(when modus-operandi-theme-bold-constructs
(list :inherit 'bold)))
+(defun modus-operandi-theme-mixed-fonts ()
+ "Conditional application of `fixed-pitch' inheritance."
+ (unless modus-operandi-theme-no-mixed-fonts
+ (list :inherit 'fixed-pitch)))
+
(defun modus-operandi-theme-fringe (subtlebg intensebg)
"Conditional use of background colours for fringes.
SUBTLEBG should be a subtle greyscale value. INTENSEBG must be a
@@ -679,29 +876,65 @@ FAINT is the less saturated colour."
(list :foreground faint)
(list :foreground normal)))
-(defun modus-operandi-theme-heading-foreground (subtle rainbow)
- "Apply foreground value to headings.
-SUBTLE is the default aesthetic. RAINBOW is the saturated one."
- (if modus-operandi-theme-rainbow-headings
- (list :foreground rainbow)
- (list :foreground subtle)))
-
-(defun modus-operandi-theme-heading-block (bg fg)
- "Conditionally extend heading styles.
-Apply BG to background and FG to overline."
- (if modus-operandi-theme-section-headings
- (append
- (and (>= emacs-major-version 27) '(:extend t))
- (list :background bg :overline fg))
- (list :background nil :overline nil)))
+(defun modus-operandi-theme-heading-p (key)
+ "Query style of KEY in `modus-operandi-theme-headings'."
+ (cdr (assoc key modus-operandi-theme-headings)))
-(defun modus-operandi-theme-org-todo-block (bgbox fgbox fg)
- "Conditionally extend the styles of Org keywords.
-BGBOX applies to the background. FGBOX applies to the foreground
-and the border. FG is used when no block style is in effect."
- (if modus-operandi-theme-section-headings
- (list :background bgbox :foreground fgbox :box (list :color fgbox))
- (list :foreground fg)))
+(defun modus-operandi-theme-heading (level fg fg-alt bg border)
+ "Conditional styles for `modus-operandi-theme-headings'.
+
+LEVEL is the heading's position in their order. FG is the
+default text colour. FG-ALT is an accented, more saturated value
+than the default. BG is a nuanced, typically accented,
+background that can work well with either of the foreground
+values. BORDER is a colour value that combines well with the
+background and alternative foreground."
+ (let* ((key (modus-operandi-theme-heading-p `,level))
+ (style (or key (modus-operandi-theme-heading-p t)))
+ (var (if modus-operandi-theme-variable-pitch-headings
+ 'variable-pitch
+ 'default)))
+ (pcase style
+ ('no-bold
+ (list :inherit `,var :foreground fg))
+ ('line
+ (list :inherit `(bold ,var) :foreground fg :overline border))
+ ('line-no-bold
+ (list :inherit `,var :foreground fg :overline border))
+ ('rainbow
+ (list :inherit `(bold ,var) :foreground fg-alt))
+ ('rainbow-no-bold
+ (list :inherit `,var :foreground fg-alt))
+ ('rainbow-line
+ (list :inherit `(bold ,var) :foreground fg-alt :overline border))
+ ('rainbow-line-no-bold
+ (list :inherit `,var :foreground fg-alt :overline border))
+ ('highlight
+ (list :inherit `(bold ,var) :background bg :foreground fg))
+ ('highlight-no-bold
+ (list :inherit `,var :background bg :foreground fg))
+ ('rainbow-highlight
+ (list :inherit `(bold ,var) :background bg :foreground fg-alt))
+ ('rainbow-highlight-no-bold
+ (list :inherit `,var :background bg :foreground fg-alt))
+ ('section
+ (append
+ (and (>= emacs-major-version 27) '(:extend t))
+ (list :inherit `(bold ,var) :background bg :foreground fg :overline
border)))
+ ('section-no-bold
+ (append
+ (and (>= emacs-major-version 27) '(:extend t))
+ (list :inherit `,var :background bg :foreground fg :overline border)))
+ ('rainbow-section
+ (append
+ (and (>= emacs-major-version 27) '(:extend t))
+ (list :inherit `(bold ,var) :background bg :foreground fg-alt
:overline border)))
+ ('rainbow-section-no-bold
+ (append
+ (and (>= emacs-major-version 27) '(:extend t))
+ (list :inherit `,var :background bg :foreground fg-alt :overline
border)))
+ (_
+ (list :inherit `(bold ,var) :foreground fg)))))
(defun modus-operandi-theme-org-block (bgblk)
"Conditionally set the background of Org blocks.
@@ -737,46 +970,64 @@ set to `rainbow'."
('rainbow (list :background bgaccent :foreground fgaccent))
(_ (list :background bg :foreground fg))))
-(defun modus-operandi-theme-modeline-box (col3d col &optional btn int)
- "Control the box properties of the mode line.
-COL3D is the border that is intended for the three-dimensional
-modeline. COL applies to the two-dimensional modeline. Optional
-BTN provides the 3d button style. Optional INT defines a border
-width."
- (let* ((style (if btn 'released-button nil))
- (int (if int int 1)))
- (if modus-operandi-theme-3d-modeline
- (list :line-width int :color col3d :style style)
- (list :line-width 1 :color col :style nil))))
-
-(defun modus-operandi-theme-modeline-props (bg3d fg3d &optional bg fg)
- "Control the background and foreground of the mode line.
-BG is the modeline's background. FG is the modeline's
-foreground. BG3D and FG3D apply to the three-dimensional
-modeline style."
- (if modus-operandi-theme-3d-modeline
- (list :background bg3d :foreground fg3d)
- (list :background bg :foreground fg)))
-
-(defun modus-operandi-theme-diffs (subtle-bg subtle-fg intense-bg intense-fg)
- "Colour combinations for `modus-operandi-theme-subtle-diffs'.
-
-SUBTLE-BG should be similar or the same as the main background.
-SUBTLE-FG should be an appropriate accent value. INTENSE-BG
-should be one of the dedicated backgrounds for diffs. INTENSE-FG
-should be one of the dedicated foregrounds for diffs"
- (if modus-operandi-theme-subtle-diffs
- (list :background subtle-bg :foreground subtle-fg)
- (list :background intense-bg :foreground intense-fg)))
+(defun modus-operandi-theme-mode-line-attrs
+ (fg bg fg-alt bg-alt border border-3d &optional alt-style border-width
fg-distant)
+ "Colour combinations for `modus-operandi-theme-mode-line'.
+
+FG and BG are the default colours. FG-ALT and BG-ALT are meant
+to accommodate the options for a 3D modeline or a `moody'
+compliant one. BORDER applies to all permutations of the
+modeline, except the three-dimensional effect, where BORDER-3D is
+used instead.
+
+Optional ALT-STYLE applies an appropriate style to the mode
+line's box property.
+
+Optional BORDER-WIDTH specifies an integer for the width of the
+rectangle that produces the box effect.
+
+Optional FG-DISTANT should be close to the main background
+values. It is intended to be used as a distant-foreground
+property."
+ (pcase modus-operandi-theme-mode-line
+ ('3d
+ `(:background ,bg-alt :foreground ,fg-alt
+ :box (:line-width ,(or border-width 1)
+ :color ,border-3d
+ :style ,(and alt-style
'released-button))))
+ ('moody
+ `(:background ,bg-alt :foreground ,fg-alt :underline ,border :overline
,border
+ :distant-foreground ,fg-distant))
+ (_
+ `(:foreground ,fg :background ,bg :box ,border))))
+
+(defun modus-operandi-theme-diff (fg-only-bg fg-only-fg mainbg mainfg altbg
altfg)
+ "Colour combinations for `modus-operandi-theme-diffs'.
+
+FG-ONLY-BG should be similar or the same as the main background.
+FG-ONLY-FG should be a saturated accent value that can be
+combined with the former.
+
+MAINBG must be one of the dedicated backgrounds for diffs while
+MAINFG must be the same for the foreground.
+
+ALTBG needs to be a slightly accented background that is meant to
+be combined with ALTFG. Both must be less intense than MAINBG
+and MAINFG respectively."
+ (pcase modus-operandi-theme-diffs
+ ('fg-only (list :background fg-only-bg :foreground fg-only-fg))
+ ('desaturated (list :background altbg :foreground altfg))
+ (_ (list :background mainbg :foreground mainfg))))
(defun modus-operandi-theme-standard-completions (mainfg subtlebg intensebg
intensefg)
"Combinations for `modus-operandi-theme-completions'.
-These are intended for Icomplete, Ido, and related.
MAINFG is an accented foreground value. SUBTLEBG is an accented
background value that can be combined with MAINFG. INTENSEBG and
INTENSEFG are accented colours that are designed to be used in
-tandem."
+tandem.
+
+These are intended for Icomplete, Ido, and related."
(pcase modus-operandi-theme-completions
('opinionated (list :background intensebg :foreground intensefg))
('moderate (list :background subtlebg :foreground mainfg))
@@ -784,7 +1035,6 @@ tandem."
(defun modus-operandi-theme-extra-completions (subtleface intenseface altface
&optional altfg bold)
"Combinations for `modus-operandi-theme-completions'.
-These are intended for Helm, Ivy, Selectrum, etc.
SUBTLEFACE and INTENSEFACE are custom theme faces that combine a
background and foreground value. The difference between the two
@@ -794,10 +1044,12 @@ ALTFACE is a combination of colours that represents a
departure
from the UI's default aesthetics. Optional ALTFG is meant to be
used in tandem with it.
-Optional BOLD will apply a heavier weight to the text."
+Optional BOLD will apply a heavier weight to the text.
+
+These are intended for Helm, Ivy, etc."
(pcase modus-operandi-theme-completions
('opinionated (list :inherit (list altface bold)
- :foreground (if altfg altfg 'unspecified)))
+ :foreground (or altfg 'unspecified)))
('moderate (list :inherit (list subtleface bold)))
(_ (list :inherit (list intenseface bold)))))
@@ -826,8 +1078,8 @@ AMOUNT is a customisation option."
;; specifically for on/off states (e.g. `mode-line')
;;
;; must be combined with themselves
- ("bg-active" . "#e0e0e0") ("fg-active" . "#191919")
- ("bg-inactive" . "#efedef") ("fg-inactive" . "#424242")
+ ("bg-active" . "#d7d7d7") ("fg-active" . "#0a0a0a")
+ ("bg-inactive" . "#efefef") ("fg-inactive" . "#404148")
;; special base values, used only for cases where the above
;; fg-* or bg-* cannot or should not be used (to avoid confusion)
;; must be combined with: {fg,bg}-{main,alt,dim}
@@ -839,19 +1091,19 @@ AMOUNT is a customisation option."
;;
;; must be combined with: `bg-main', `bg-alt', `bg-dim'
("red" . "#a60000") ("green" . "#005e00")
- ("yellow" . "#813e00") ("blue" . "#0030a6")
+ ("yellow" . "#813e00") ("blue" . "#0031a9")
("magenta" . "#721045") ("cyan" . "#00538b")
;; styles for common, but still specialised constructs
;;
;; must be combined with: `bg-main', `bg-alt', `bg-dim'
("red-alt" . "#972500") ("green-alt" . "#315b00")
- ("yellow-alt" . "#70480f") ("blue-alt" . "#223fbf")
+ ("yellow-alt" . "#70480f") ("blue-alt" . "#2544bb")
("magenta-alt" . "#8f0075") ("cyan-alt" . "#30517f")
;; same purpose as above, just slight differences
;;
;; must be combined with: `bg-main', `bg-alt', `bg-dim'
("red-alt-other" . "#a0132f") ("green-alt-other" . "#145c33")
- ("yellow-alt-other" . "#863927") ("blue-alt-other" . "#0000bb")
+ ("yellow-alt-other" . "#863927") ("blue-alt-other" . "#0000c0")
("magenta-alt-other" . "#5317ac") ("cyan-alt-other" . "#005a5f")
;; styles for desaturated foreground text, intended for use with
;; the `modus-operandi-theme-faint-syntax' option
@@ -915,21 +1167,24 @@ AMOUNT is a customisation option."
;; styles that are meant exclusively for the mode line
;;
;; must be combined with: `bg-active', `bg-inactive'
- ("red-active" . "#930000") ("green-active" . "#005300")
- ("yellow-active" . "#703700") ("blue-active" . "#0033c0")
- ("magenta-active" . "#6320a0") ("cyan-active" . "#004882")
+ ("red-active" . "#8a0000") ("green-active" . "#004c2e")
+ ("yellow-active" . "#702d1f") ("blue-active" . "#0030b4")
+ ("magenta-active" . "#5c2092") ("cyan-active" . "#003f8a")
;; styles that are meant exclusively for the fringes
;;
- ;; must have a minimum contrast ratio of 1.5:1 with `bg-inactive'
- ;; and be combined with `fg-main' or `fg-dim'
- ("red-fringe-bg" . "#ff9a9a") ("green-fringe-bg" . "#86cf86")
- ("yellow-fringe-bg" . "#e0c050") ("blue-fringe-bg" . "#82afff")
- ("magenta-fringe-bg" . "#f0a3ff") ("cyan-fringe-bg" . "#00d6e0")
+ ;; must be combined with `fg-main'
+ ("red-fringe-bg" . "#f08290") ("green-fringe-bg" . "#62c86a")
+ ("yellow-fringe-bg" . "#dbba3f") ("blue-fringe-bg" . "#82afff")
+ ("magenta-fringe-bg" . "#e0a3ff") ("cyan-fringe-bg" . "#2fcddf")
;; styles reserved for specific faces
;;
;; `bg-hl-line' is between `bg-dim' and `bg-alt', so it should
;; work with all accents that cover those two, plus `bg-main'
;;
+ ;; `bg-hl-alt' and `bg-hl-alt-intense' should only be used when no
+ ;; other greyscale or fairly neutral background is available to
+ ;; properly draw attention to a given construct
+ ;;
;; `bg-header' is between `bg-active' and `bg-inactive', so it
;; can be combined with any of the "active" values, plus the
;; "special" and base foreground colours
@@ -960,8 +1215,11 @@ AMOUNT is a customisation option."
;;
;; all pairs are combinable with themselves
("bg-hl-line" . "#f2eff3")
+ ("bg-hl-line-intense" . "#e0e0e0")
+ ("bg-hl-alt" . "#fbeee0")
+ ("bg-hl-alt-intense" . "#e8dfd1")
("bg-paren-match" . "#e0af82")
- ("bg-paren-match-intense" . "#70af9f")
+ ("bg-paren-match-intense" . "#c488ff")
("bg-region" . "#bcbcbc")
("bg-tab-bar" . "#d5d5d5")
@@ -1094,12 +1352,12 @@ Also bind `class' to ((class color) (min-colors 89))."
`(modus-theme-nuanced-cyan ((,class :background ,cyan-nuanced-bg
,@(and (>= emacs-major-version 27)
'(:extend t)))))
;;;;; fringe-specific combinations
- `(modus-theme-fringe-red ((,class :background ,red-fringe-bg :foreground
,fg-dim)))
- `(modus-theme-fringe-green ((,class :background ,green-fringe-bg
:foreground ,fg-dim)))
- `(modus-theme-fringe-yellow ((,class :background ,yellow-fringe-bg
:foreground ,fg-dim)))
- `(modus-theme-fringe-blue ((,class :background ,blue-fringe-bg :foreground
,fg-dim)))
- `(modus-theme-fringe-magenta ((,class :background ,magenta-fringe-bg
:foreground ,fg-dim)))
- `(modus-theme-fringe-cyan ((,class :background ,cyan-fringe-bg :foreground
,fg-dim)))
+ `(modus-theme-fringe-red ((,class :background ,red-fringe-bg :foreground
,fg-main)))
+ `(modus-theme-fringe-green ((,class :background ,green-fringe-bg
:foreground ,fg-main)))
+ `(modus-theme-fringe-yellow ((,class :background ,yellow-fringe-bg
:foreground ,fg-main)))
+ `(modus-theme-fringe-blue ((,class :background ,blue-fringe-bg :foreground
,fg-main)))
+ `(modus-theme-fringe-magenta ((,class :background ,magenta-fringe-bg
:foreground ,fg-main)))
+ `(modus-theme-fringe-cyan ((,class :background ,cyan-fringe-bg :foreground
,fg-main)))
;;;;; special base values
;; these are closer to the grayscale than the accents defined above
;; and should only be used when the next closest alternative would be
@@ -1110,26 +1368,96 @@ Also bind `class' to ((class color) (min-colors 89))."
`(modus-theme-special-calm ((,class :background ,bg-special-calm
:foreground ,fg-special-calm)))
;;;;; diff-specific combinations
;; intended for `diff-mode' or equivalent
- `(modus-theme-diff-added ((,class :background ,bg-diff-added :foreground
,fg-diff-added)))
- `(modus-theme-diff-changed ((,class :background ,bg-diff-changed
:foreground ,fg-diff-changed)))
- `(modus-theme-diff-removed ((,class :background ,bg-diff-removed
:foreground ,fg-diff-removed)))
- `(modus-theme-diff-refine-added ((,class :background ,bg-diff-refine-added
:foreground ,fg-diff-refine-added)))
- `(modus-theme-diff-refine-changed ((,class :background
,bg-diff-refine-changed :foreground ,fg-diff-refine-changed)))
- `(modus-theme-diff-refine-removed ((,class :background
,bg-diff-refine-removed :foreground ,fg-diff-refine-removed)))
- `(modus-theme-diff-focus-added ((,class :background ,bg-diff-focus-added
:foreground ,fg-diff-focus-added)))
- `(modus-theme-diff-focus-changed ((,class :background
,bg-diff-focus-changed :foreground ,fg-diff-focus-changed)))
- `(modus-theme-diff-focus-removed ((,class :background
,bg-diff-focus-removed :foreground ,fg-diff-focus-removed)))
- `(modus-theme-diff-heading ((,class :background ,bg-diff-heading
:foreground ,fg-diff-heading)))
+ `(modus-theme-diff-added
+ ((,class ,@(modus-operandi-theme-diff
+ bg-main green
+ bg-diff-focus-added fg-diff-focus-added
+ green-nuanced-bg fg-diff-added))))
+ `(modus-theme-diff-changed
+ ((,class ,@(modus-operandi-theme-diff
+ bg-main yellow
+ bg-diff-focus-changed fg-diff-focus-changed
+ yellow-nuanced-bg fg-diff-changed))))
+ `(modus-theme-diff-removed
+ ((,class ,@(modus-operandi-theme-diff
+ bg-main red
+ bg-diff-focus-removed fg-diff-focus-removed
+ red-nuanced-bg fg-diff-removed))))
+ `(modus-theme-diff-refine-added
+ ((,class ,@(modus-operandi-theme-diff
+ bg-diff-added fg-diff-added
+ bg-diff-refine-added fg-diff-refine-added
+ bg-diff-focus-added fg-diff-focus-added))))
+ `(modus-theme-diff-refine-changed
+ ((,class ,@(modus-operandi-theme-diff
+ bg-diff-changed fg-diff-changed
+ bg-diff-refine-changed fg-diff-refine-changed
+ bg-diff-focus-changed fg-diff-focus-changed))))
+ `(modus-theme-diff-refine-removed
+ ((,class ,@(modus-operandi-theme-diff
+ bg-diff-removed fg-diff-removed
+ bg-diff-refine-removed fg-diff-refine-removed
+ bg-diff-focus-removed fg-diff-focus-removed))))
+ `(modus-theme-diff-focus-added
+ ((,class ,@(modus-operandi-theme-diff
+ bg-dim green
+ bg-diff-focus-added fg-diff-focus-added
+ bg-diff-added fg-diff-added))))
+ `(modus-theme-diff-focus-changed
+ ((,class ,@(modus-operandi-theme-diff
+ bg-dim yellow
+ bg-diff-focus-changed fg-diff-focus-changed
+ bg-diff-changed fg-diff-changed))))
+ `(modus-theme-diff-focus-removed
+ ((,class ,@(modus-operandi-theme-diff
+ bg-dim red
+ bg-diff-focus-removed fg-diff-focus-removed
+ bg-diff-removed fg-diff-removed))))
+ `(modus-theme-diff-heading
+ ((,class ,@(modus-operandi-theme-diff
+ bg-alt blue-alt
+ bg-diff-heading fg-diff-heading
+ blue-nuanced-bg blue))))
;;;;; mark indicators
;; colour combinations intended for Dired, Ibuffer, or equivalent
- `(modus-theme-header ((,class :inherit bold :foreground ,fg-main)))
+ `(modus-theme-pseudo-header ((,class :inherit bold :foreground ,fg-main)))
`(modus-theme-mark-alt ((,class :inherit bold :background ,bg-mark-alt
:foreground ,fg-mark-alt)))
`(modus-theme-mark-del ((,class :inherit bold :background ,bg-mark-del
:foreground ,fg-mark-del)))
`(modus-theme-mark-sel ((,class :inherit bold :background ,bg-mark-sel
:foreground ,fg-mark-sel)))
`(modus-theme-mark-symbol ((,class :inherit bold :foreground ,blue-alt)))
+;;;;; heading levels
+ ;; styles for regular headings used in Org, Markdown, Info, etc.
+ `(modus-theme-heading-1
+ ((,class ,@(modus-operandi-theme-heading
+ 1 fg-main magenta-alt-other magenta-nuanced-bg bg-region)
+ ,@(modus-operandi-theme-scale modus-operandi-theme-scale-4))))
+ `(modus-theme-heading-2
+ ((,class ,@(modus-operandi-theme-heading
+ 2 fg-special-warm magenta-alt red-nuanced-bg bg-region)
+ ,@(modus-operandi-theme-scale modus-operandi-theme-scale-3))))
+ `(modus-theme-heading-3
+ ((,class ,@(modus-operandi-theme-heading
+ 3 fg-special-cold blue blue-nuanced-bg bg-region)
+ ,@(modus-operandi-theme-scale modus-operandi-theme-scale-2))))
+ `(modus-theme-heading-4
+ ((,class ,@(modus-operandi-theme-heading
+ 4 fg-special-mild cyan cyan-nuanced-bg bg-region)
+ ,@(modus-operandi-theme-scale modus-operandi-theme-scale-1))))
+ `(modus-theme-heading-5
+ ((,class ,@(modus-operandi-theme-heading
+ 5 fg-special-calm green-alt-other green-nuanced-bg
bg-region))))
+ `(modus-theme-heading-6
+ ((,class ,@(modus-operandi-theme-heading
+ 6 yellow-nuanced yellow-alt-other yellow-nuanced-bg
bg-region))))
+ `(modus-theme-heading-7
+ ((,class ,@(modus-operandi-theme-heading
+ 7 red-nuanced red-alt red-nuanced-bg bg-region))))
+ `(modus-theme-heading-8
+ ((,class ,@(modus-operandi-theme-heading
+ 8 fg-dim magenta bg-alt bg-region))))
;;;;; other custom faces
`(modus-theme-hl-line ((,class :background ,(if
modus-operandi-theme-intense-hl-line
- bg-active bg-hl-line)
+ bg-hl-line-intense
bg-hl-line)
(and (>= emacs-major-version 27) '(:extend
t)))))
;;;; standard faces
;;;;; absolute essentials
@@ -1149,26 +1477,25 @@ Also bind `class' to ((class color) (min-colors 89))."
`(bold ((,class :weight bold)))
`(comint-highlight-input ((,class :inherit bold)))
`(comint-highlight-prompt ((,class ,@(modus-operandi-theme-bold-weight)
- ,@(modus-operandi-theme-prompt cyan
-
blue-nuanced-bg
- blue-alt
-
blue-refine-bg
-
fg-main))))
+ ,@(modus-operandi-theme-prompt
+ cyan
+ blue-nuanced-bg blue-alt
+ blue-refine-bg fg-main))))
`(error ((,class :inherit bold :foreground ,red)))
`(escape-glyph ((,class :foreground ,fg-escape-char-construct)))
`(file-name-shadow ((,class :foreground ,fg-unfocused)))
`(header-line ((,class :background ,bg-header :foreground ,fg-header)))
`(header-line-highlight ((,class :inherit modus-theme-active-blue)))
+ `(help-argument-name ((,class :foreground ,cyan :slant ,modus-theme-slant)))
`(homoglyph ((,class :foreground ,fg-escape-char-construct)))
`(ibuffer-locked-buffer ((,class :foreground ,yellow-alt-other)))
`(italic ((,class :slant italic)))
`(nobreak-hyphen ((,class :foreground ,fg-escape-char-construct)))
`(nobreak-space ((,class :foreground ,fg-escape-char-construct :underline
t)))
- `(minibuffer-prompt ((,class ,@(modus-operandi-theme-prompt cyan-alt-other
- cyan-nuanced-bg
- cyan
- cyan-refine-bg
- fg-main))))
+ `(minibuffer-prompt ((,class ,@(modus-operandi-theme-prompt
+ cyan-alt-other
+ cyan-nuanced-bg cyan
+ cyan-refine-bg fg-main))))
`(mm-command-output ((,class :foreground ,red-alt-other)))
`(mm-uu-extract ((,class :background ,bg-dim :foreground ,fg-special-mild)))
`(next-error ((,class :inherit modus-theme-subtle-red)))
@@ -1180,9 +1507,11 @@ Also bind `class' to ((class color) (min-colors 89))."
`(trailing-whitespace ((,class :background ,red-intense-bg)))
`(warning ((,class :inherit bold :foreground ,yellow)))
;;;;; buttons, links, widgets
- `(button ((,class :foreground ,blue-alt-other :underline t)))
- `(link ((,class :foreground ,blue-alt-other :underline t)))
- `(link-visited ((,class :foreground ,magenta-alt-other :underline t)))
+ `(button ((,class :foreground ,blue-alt-other
+ ,@(unless modus-operandi-theme-no-link-underline
+ (list :underline t)))))
+ `(link ((,class :inherit button)))
+ `(link-visited ((,class :inherit link :foreground ,magenta-alt-other)))
`(tooltip ((,class :background ,bg-special-cold :foreground ,fg-main)))
`(widget-button ((,class :inherit button)))
`(widget-button-pressed ((,class :inherit button :foreground ,magenta)))
@@ -1249,13 +1578,13 @@ Also bind `class' to ((class color) (min-colors 89))."
`(anzu-replace-highlight ((,class :inherit modus-theme-refine-yellow
:underline t)))
`(anzu-replace-to ((,class :inherit (modus-theme-intense-green bold))))
;;;;; apropos
- `(apropos-function-button ((,class :foreground ,magenta-alt-other
:underline t)))
+ `(apropos-function-button ((,class :inherit button :foreground
,magenta-alt-other)))
`(apropos-keybinding ((,class :inherit bold :foreground ,cyan)))
- `(apropos-misc-button ((,class :foreground ,cyan-alt-other :underline t)))
+ `(apropos-misc-button ((,class :inherit button :foreground
,cyan-alt-other)))
`(apropos-property ((,class ,@(modus-operandi-theme-bold-weight)
:foreground ,magenta-alt)))
- `(apropos-symbol ((,class ,@(modus-operandi-theme-bold-weight) :foreground
,blue-nuanced :underline t)))
- `(apropos-user-option-button ((,class :foreground ,green-alt-other
:underline t)))
- `(apropos-variable-button ((,class :foreground ,blue :underline t)))
+ `(apropos-symbol ((,class ,@(modus-operandi-theme-bold-weight) :foreground
,blue-alt-other)))
+ `(apropos-user-option-button ((,class :inherit button :foreground
,green-alt-other)))
+ `(apropos-variable-button ((,class :inherit button :foreground ,blue)))
;;;;; apt-sources-list
`(apt-sources-list-components ((,class :foreground ,cyan)))
`(apt-sources-list-options ((,class :foreground ,yellow)))
@@ -1310,6 +1639,24 @@ Also bind `class' to ((class color) (min-colors 89))."
`(aw-leading-char-face ((,class :inherit bold :height 1.5 :background
,bg-main :foreground ,red-intense)))
`(aw-minibuffer-leading-char-face ((,class :foreground ,magenta-active)))
`(aw-mode-line-face ((,class :inherit bold)))
+;;;;; awesome-tray
+ `(awesome-tray-module-awesome-tab-face ((,class :inherit bold :foreground
,red-alt-other)))
+ `(awesome-tray-module-battery-face ((,class :inherit bold :foreground
,cyan-alt-other)))
+ `(awesome-tray-module-buffer-name-face ((,class :inherit bold :foreground
,yellow-alt-other)))
+ `(awesome-tray-module-circe-face ((,class :inherit bold :foreground
,blue-alt)))
+ `(awesome-tray-module-date-face ((,class :inherit bold :foreground
,fg-dim)))
+ `(awesome-tray-module-evil-face ((,class :inherit bold :foreground
,green-alt)))
+ `(awesome-tray-module-git-face ((,class :inherit bold :foreground
,magenta)))
+ `(awesome-tray-module-last-command-face ((,class :inherit bold :foreground
,blue-alt-other)))
+ `(awesome-tray-module-location-face ((,class :inherit bold :foreground
,yellow)))
+ `(awesome-tray-module-mode-name-face ((,class :inherit bold :foreground
,green)))
+ `(awesome-tray-module-parent-dir-face ((,class :inherit bold :foreground
,cyan)))
+ `(awesome-tray-module-rvm-face ((,class :inherit bold :foreground
,magenta-alt-other)))
+;;;;; binder
+ `(binder-sidebar-highlight ((,class :inherit modus-theme-subtle-cyan)))
+ `(binder-sidebar-marked ((,class :inherit modus-theme-mark-sel)))
+ `(binder-sidebar-missing ((,class :inherit modus-theme-subtle-red)))
+ `(binder-sidebar-tags ((,class :foreground ,cyan)))
;;;;; bm
`(bm-face ((,class :inherit modus-theme-subtle-yellow
,@(and (>= emacs-major-version 27) '(:extend t)))))
@@ -1351,26 +1698,27 @@ Also bind `class' to ((class color) (min-colors 89))."
`(diary-time ((,class :foreground ,blue-alt)))
`(holiday ((,class :foreground ,magenta-alt)))
;;;;; calfw
- `(cfw:face-annotation ((,class :background ,bg-alt :foreground ,fg-alt)))
- `(cfw:face-day-title ((,class :background ,bg-alt :foreground ,fg-main)))
+ `(cfw:face-annotation ((,class :foreground ,fg-special-warm)))
+ `(cfw:face-day-title ((,class :foreground ,fg-main)))
`(cfw:face-default-content ((,class :foreground ,green-alt)))
`(cfw:face-default-day ((,class :inherit (cfw:face-day-title bold))))
- `(cfw:face-disable ((,class :background ,bg-inactive :foreground
,fg-inactive)))
- `(cfw:face-grid ((,class :foreground ,fg-inactive)))
- `(cfw:face-header ((,class :inherit bold ::foreground ,fg-main)))
- `(cfw:face-holiday ((,class :inherit bold :background ,bg-alt :foreground
,magenta)))
+ `(cfw:face-disable ((,class :foreground ,fg-unfocused)))
+ `(cfw:face-grid ((,class :foreground ,fg-window-divider-outer)))
+ `(cfw:face-header ((,class :inherit bold :foreground ,fg-main)))
+ `(cfw:face-holiday ((,class :foreground ,magenta-alt-other)))
`(cfw:face-periods ((,class :foreground ,cyan-alt-other)))
- `(cfw:face-saturday ((,class :inherit bold :background ,bg-alt :foreground
,magenta-alt)))
+ `(cfw:face-saturday ((,class :inherit bold :foreground ,cyan-alt-other)))
`(cfw:face-select ((,class :inherit modus-theme-intense-blue)))
- `(cfw:face-sunday ((,class :inherit bold :background ,bg-alt :foreground
,magenta-alt-other)))
+ `(cfw:face-sunday ((,class :inherit bold :foreground ,cyan-alt-other)))
`(cfw:face-title ((,class :inherit ,modus-theme-variable-pitch
- :foreground ,fg-special-warm
- ,@(modus-operandi-theme-scale
modus-operandi-theme-scale-4))))
- `(cfw:face-today ((,class :inherit bold :foreground ,blue)))
- `(cfw:face-today-title ((,class :inherit modus-theme-special-mild :box t)))
- `(cfw:face-toolbar ((,class :background ,bg-active :foreground ,bg-active)))
- `(cfw:face-toolbar-button-off ((,class :background ,bg-alt :foreground
,cyan)))
- `(cfw:face-toolbar-button-on ((,class :inherit bold :background ,bg-main
:foreground ,blue-intense)))
+ :foreground ,fg-special-cold
+ ,@(modus-operandi-theme-scale
modus-operandi-theme-scale-5))))
+ `(cfw:face-today ((,class :background ,bg-inactive)))
+ `(cfw:face-today-title ((,class :background ,bg-active)))
+ `(cfw:face-toolbar ((,class :background ,bg-alt :foreground ,bg-alt)))
+ `(cfw:face-toolbar-button-off ((,class :foreground ,fg-alt)))
+ `(cfw:face-toolbar-button-on ((,class :inherit bold :background
,blue-nuanced-bg
+ :foreground ,blue-alt)))
;;;;; centaur-tabs
`(centaur-tabs-active-bar-face ((,class :background ,fg-tab-active)))
`(centaur-tabs-close-mouse-face ((,class :inherit bold :foreground
,red-active :underline t)))
@@ -1392,8 +1740,8 @@ Also bind `class' to ((class color) (min-colors 89))."
`(change-log-function ((,class :foreground ,green-alt-other)))
`(change-log-list ((,class :foreground ,magenta-alt-other)))
`(change-log-name ((,class :foreground ,cyan)))
- `(log-edit-header ((,class :inherit bold :foreground ,green-alt-other)))
- `(log-edit-summary ((,class :foreground ,magenta-alt-other)))
+ `(log-edit-header ((,class :foreground ,fg-special-warm)))
+ `(log-edit-summary ((,class :inherit bold :foreground ,cyan)))
`(log-edit-unknown-header ((,class :foreground ,fg-alt)))
`(log-view-file ((,class :inherit bold :foreground ,fg-special-cold)))
`(log-view-message ((,class :foreground ,fg-alt)))
@@ -1437,7 +1785,7 @@ Also bind `class' to ((class color) (min-colors 89))."
`(circe-highlight-nick-face ((,class :inherit bold :foreground ,blue)))
`(circe-prompt-face ((,class :inherit bold :foreground ,cyan-alt-other)))
`(circe-server-face ((,class :foreground ,fg-unfocused)))
- `(lui-button-face ((,class :foreground ,blue :underline t)))
+ `(lui-button-face ((,class :inherit button :foreground ,blue)))
`(lui-highlight-face ((,class :foreground ,magenta-alt)))
`(lui-time-stamp-face ((,class :foreground ,blue-nuanced)))
;;;;; color-rg
@@ -1490,12 +1838,12 @@ Also bind `class' to ((class color) (min-colors 89))."
;;;;; completions
`(completions-annotations ((,class :foreground ,fg-special-cold :slant
,modus-theme-slant)))
`(completions-common-part ((,class
,@(modus-operandi-theme-standard-completions
- cyan-alt-other cyan-nuanced-bg
- yellow-refine-bg yellow-refine-fg))))
+ blue-alt blue-nuanced-bg
+ cyan-refine-bg cyan-refine-fg))))
`(completions-first-difference ((,class :inherit bold
,@(modus-operandi-theme-standard-completions
- blue-alt-other blue-nuanced-bg
- cyan-subtle-bg fg-dim))))
+ magenta-alt blue-nuanced-bg
+ magenta-intense-bg fg-main))))
;;;;; counsel
`(counsel-active-mode ((,class :foreground ,magenta-alt-other)))
`(counsel-application-name ((,class :foreground ,red-alt-other)))
@@ -1531,6 +1879,10 @@ Also bind `class' to ((class color) (min-colors 89))."
`(cov-light-face ((,class :foreground ,blue-intense)))
`(cov-med-face ((,class :foreground ,yellow-intense)))
`(cov-none-face ((,class :foreground ,cyan-intense)))
+;;;;; cperl-mode
+ `(cperl-nonoverridable-face ((,class :foreground ,yellow-alt-other)))
+ `(cperl-array-face ((,class :inherit bold :background ,bg-alt :foreground
,magenta-alt)))
+ `(cperl-hash-face ((,class :inherit bold :background ,bg-alt :foreground
,red-alt :slant ,modus-theme-slant)))
;;;;; csv-mode
`(csv-separator-face ((,class :background ,bg-special-cold :foreground
,fg-main)))
;;;;; ctrlf
@@ -1609,7 +1961,7 @@ Also bind `class' to ((class color) (min-colors 89))."
`(deft-title-face ((,class :inherit bold :foreground ,fg-main)))
;;;;; dictionary
`(dictionary-button-face ((,class :inherit bold :foreground
,fg-special-cold)))
- `(dictionary-reference-face ((,class :foreground ,blue-alt-other :underline
t)))
+ `(dictionary-reference-face ((,class :inherit :foreground ,blue-alt-other)))
`(dictionary-word-definition-face ((,class :foreground ,fg-main)))
`(dictionary-word-entry-face ((,class :foreground ,fg-special-cold :slant
,modus-theme-slant)))
;;;;; diff-hl
@@ -1623,47 +1975,54 @@ Also bind `class' to ((class color) (min-colors 89))."
`(diff-hl-insert ((,class :inherit modus-theme-fringe-green)))
`(diff-hl-reverted-hunk-highlight ((,class :inherit
(modus-theme-active-magenta bold))))
;;;;; diff-mode
- `(diff-added ((,class ,@(modus-operandi-theme-diffs
- bg-main green
- bg-diff-focus-added fg-diff-focus-added))))
- `(diff-changed ((,class ,@(modus-operandi-theme-diffs
- bg-main yellow
- bg-diff-focus-changed fg-diff-focus-changed))))
+ `(diff-added ((,class :inherit modus-theme-diff-added)))
+ `(diff-changed ((,class :inherit modus-theme-diff-changed)))
`(diff-context ((,class :foreground ,fg-unfocused)))
`(diff-file-header ((,class :inherit bold :foreground ,blue)))
`(diff-function ((,class :foreground ,fg-special-cold)))
`(diff-header ((,class :foreground ,blue-nuanced)))
- `(diff-hunk-header ((,class ,@(modus-operandi-theme-diffs
- bg-alt blue-alt
- bg-diff-heading fg-diff-heading))))
+ `(diff-hunk-header ((,class :inherit modus-theme-diff-heading)))
`(diff-index ((,class :inherit bold :foreground ,blue-alt)))
`(diff-indicator-added ((,class :inherit diff-added)))
`(diff-indicator-changed ((,class :inherit diff-changed)))
`(diff-indicator-removed ((,class :inherit diff-removed)))
`(diff-nonexistent ((,class :inherit (modus-theme-neutral bold))))
- `(diff-refine-added ((,class ,@(modus-operandi-theme-diffs
- bg-diff-added fg-diff-added
- bg-diff-refine-added
fg-diff-refine-added))))
- `(diff-refine-changed ((,class ,@(modus-operandi-theme-diffs
- bg-diff-changed fg-diff-changed
- bg-diff-refine-changed
fg-diff-refine-changed))))
- `(diff-refine-removed ((,class ,@(modus-operandi-theme-diffs
- bg-diff-removed fg-diff-removed
- bg-diff-refine-removed
fg-diff-refine-removed))))
- `(diff-removed ((,class ,@(modus-operandi-theme-diffs
- bg-main red
- bg-diff-focus-removed fg-diff-focus-removed))))
+ `(diff-refine-added ((,class :inherit modus-theme-diff-refine-added)))
+ `(diff-refine-changed ((,class :inherit modus-theme-diff-refine-changed)))
+ `(diff-refine-removed ((,class :inherit modus-theme-diff-refine-removed)))
+ `(diff-removed ((,class :inherit modus-theme-diff-removed)))
;;;;; dim-autoload
`(dim-autoload-cookie-line ((,class :foreground ,fg-alt :slant
,modus-theme-slant)))
+;;;;; dir-treeview
+ `(dir-treeview-archive-face ((,class :foreground ,fg-special-warm)))
+ `(dir-treeview-archive-icon-face ((,class :inherit
dir-treeview-default-icon-face :foreground ,yellow)))
+ `(dir-treeview-audio-face ((,class :foreground ,magenta)))
+ `(dir-treeview-audio-icon-face ((,class :inherit
dir-treeview-default-icon-face :foreground ,magenta-alt)))
+ `(dir-treeview-control-face ((,class :foreground ,fg-alt)))
+ `(dir-treeview-control-mouse-face ((,class :inherit highlight)))
+ `(dir-treeview-default-icon-face ((,class :inherit bold :family "Font
Awesome" :foreground ,fg-alt)))
+ `(dir-treeview-default-filename-face ((,class :foreground ,fg-main)))
+ `(dir-treeview-directory-face ((,class :foreground ,blue)))
+ `(dir-treeview-directory-icon-face ((,class :inherit
dir-treeview-default-icon-face :foreground ,blue-alt)))
+ `(dir-treeview-executable-face ((,class :foreground ,red-alt)))
+ `(dir-treeview-executable-icon-face ((,class :inherit
dir-treeview-default-icon-face :foreground ,red-alt-other)))
+ `(dir-treeview-image-face ((,class :foreground ,green-alt-other)))
+ `(dir-treeview-image-icon-face ((,class :inherit
dir-treeview-default-icon-face :foreground ,green-alt)))
+ `(dir-treeview-indent-face ((,class :foreground ,fg-alt)))
+ `(dir-treeview-label-mouse-face ((,class :inherit highlight)))
+ `(dir-treeview-start-dir-face ((,class :inherit modus-theme-pseudo-header)))
+ `(dir-treeview-symlink-face ((,class :inherit button :foreground ,cyan)))
+ `(dir-treeview-video-face ((,class :foreground ,magenta-alt-other)))
+ `(dir-treeview-video-icon-face ((,class :inherit
dir-treeview-default-icon-face :foreground ,magenta-alt-other)))
;;;;; dired
`(dired-directory ((,class :foreground ,blue)))
`(dired-flagged ((,class :inherit modus-theme-mark-del)))
- `(dired-header ((,class :inherit modus-theme-header)))
+ `(dired-header ((,class :inherit modus-theme-pseudo-header)))
`(dired-ignored ((,class :foreground ,fg-alt)))
`(dired-mark ((,class :inherit modus-theme-mark-symbol)))
`(dired-marked ((,class :inherit modus-theme-mark-sel)))
`(dired-perm-write ((,class :foreground ,fg-special-warm)))
- `(dired-symlink ((,class :foreground ,cyan-alt :underline t)))
+ `(dired-symlink ((,class :inherit button :foreground ,cyan-alt)))
`(dired-warning ((,class :inherit bold :foreground ,yellow)))
;;;;; dired-async
`(dired-async-failures ((,class ,@(modus-operandi-theme-bold-weight)
:foreground ,red-active)))
@@ -1688,43 +2047,44 @@ Also bind `class' to ((class color) (min-colors 89))."
`(dired-subtree-depth-6-face ((,class :background nil)))
;;;;; diredfl
`(diredfl-autofile-name ((,class :inherit modus-theme-special-cold)))
- `(diredfl-compressed-file-name ((,class :foreground ,green-alt-other)))
- `(diredfl-compressed-file-suffix ((,class :foreground ,green-alt)))
- `(diredfl-date-time ((,class :foreground ,fg-special-cold)))
+ `(diredfl-compressed-file-name ((,class :foreground ,fg-special-warm)))
+ `(diredfl-compressed-file-suffix ((,class :foreground ,red-alt)))
+ `(diredfl-date-time ((,class :foreground ,cyan-alt-other)))
`(diredfl-deletion ((,class :inherit modus-theme-mark-del)))
`(diredfl-deletion-file-name ((,class :inherit modus-theme-mark-del)))
- `(diredfl-dir-heading ((,class :inherit modus-theme-header)))
+ `(diredfl-dir-heading ((,class :inherit modus-theme-pseudo-header)))
`(diredfl-dir-name ((,class :inherit dired-directory)))
- `(diredfl-dir-priv ((,class :foreground ,blue)))
- `(diredfl-exec-priv ((,class :foreground ,red-alt-other)))
- `(diredfl-executable-tag ((,class :foreground ,red-alt)))
+ `(diredfl-dir-priv ((,class :foreground ,blue-alt)))
+ `(diredfl-exec-priv ((,class :foreground ,magenta)))
+ `(diredfl-executable-tag ((,class :foreground ,magenta-alt)))
`(diredfl-file-name ((,class :foreground ,fg-main)))
- `(diredfl-file-suffix ((,class :foreground ,fg-special-warm)))
+ `(diredfl-file-suffix ((,class :foreground ,cyan)))
`(diredfl-flag-mark ((,class :inherit modus-theme-mark-sel)))
`(diredfl-flag-mark-line ((,class :inherit modus-theme-mark-sel)))
- `(diredfl-ignored-file-name ((,class :foreground ,fg-inactive)))
+ `(diredfl-ignored-file-name ((,class :foreground ,fg-alt)))
`(diredfl-link-priv ((,class :foreground ,blue-alt-other)))
- `(diredfl-no-priv ((,class :foreground ,fg-inactive)))
- `(diredfl-number ((,class :foreground ,cyan)))
+ `(diredfl-no-priv ((,class :foreground ,fg-alt)))
+ `(diredfl-number ((,class :foreground ,cyan-alt)))
`(diredfl-other-priv ((,class :foreground ,yellow)))
- `(diredfl-rare-priv ((,class :foreground ,magenta-alt-other)))
- `(diredfl-read-priv ((,class :foreground ,magenta)))
- `(diredfl-symlink ((,class :foreground ,cyan-alt :underline t)))
+ `(diredfl-rare-priv ((,class :foreground ,red-alt)))
+ `(diredfl-read-priv ((,class :foreground ,fg-main)))
+ `(diredfl-symlink ((,class :inherit dired-symlink)))
`(diredfl-tagged-autofile-name ((,class :inherit
modus-theme-refine-magenta)))
- `(diredfl-write-priv ((,class :foreground ,cyan-alt-other)))
+ `(diredfl-write-priv ((,class :foreground ,cyan)))
;;;;; disk-usage
`(disk-usage-children ((,class :foreground ,yellow)))
`(disk-usage-inaccessible ((,class :inherit bold :foreground ,red)))
`(disk-usage-percent ((,class :foreground ,green)))
`(disk-usage-size ((,class :foreground ,cyan)))
- `(disk-usage-symlink ((,class :foreground ,blue :underline t)))
+ `(disk-usage-symlink ((,class :inherit button :foreground ,blue)))
`(disk-usage-symlink-directory ((,class :inherit bold :foreground
,blue-alt)))
;;;;; doom-modeline
`(doom-modeline-bar ((,class :inherit modus-theme-active-blue)))
`(doom-modeline-bar-inactive ((,class :background ,fg-inactive :foreground
,bg-main)))
`(doom-modeline-battery-charging ((,class :foreground ,green-active)))
`(doom-modeline-battery-critical ((,class :inherit bold :foreground
,red-active)))
- `(doom-modeline-battery-error ((,class :inherit modus-theme-active-red)))
+ `(doom-modeline-battery-error ((,class :inherit bold :box (:line-width -2)
+ :foreground ,red-active)))
`(doom-modeline-battery-full ((,class :foreground ,blue-active)))
`(doom-modeline-battery-normal ((,class :foreground ,fg-active)))
`(doom-modeline-battery-warning ((,class :inherit bold :foreground
,yellow-active)))
@@ -1781,18 +2141,24 @@ Also bind `class' to ((class color) (min-colors 89))."
`(ebdb-role-defunct ((,class :foreground ,fg-alt)))
`(eieio-custom-slot-tag-face ((,class :foreground ,red-alt)))
;;;;; ediff
- `(ediff-current-diff-A ((,class ,@(modus-operandi-theme-diffs
- bg-alt red
- bg-diff-removed fg-diff-removed))))
- `(ediff-current-diff-Ancestor ((,class ,@(modus-operandi-theme-diffs
- bg-alt fg-special-cold
- bg-special-cold
fg-special-cold))))
- `(ediff-current-diff-B ((,class ,@(modus-operandi-theme-diffs
- bg-alt green
- bg-diff-added fg-diff-added))))
- `(ediff-current-diff-C ((,class ,@(modus-operandi-theme-diffs
- bg-alt yellow
- bg-diff-changed fg-diff-changed))))
+ ;; NOTE: here we break from the pattern of inheriting from the
+ ;; modus-theme-diff-* faces.
+ `(ediff-current-diff-A ((,class ,@(modus-operandi-theme-diff
+ bg-dim red
+ bg-diff-removed fg-diff-removed
+ red-nuanced-bg red-faint))))
+ `(ediff-current-diff-Ancestor ((,class ,@(modus-operandi-theme-diff
+ bg-dim fg-special-cold
+ bg-special-cold fg-special-cold
+ blue-nuanced-bg blue))))
+ `(ediff-current-diff-B ((,class ,@(modus-operandi-theme-diff
+ bg-dim green
+ bg-diff-added fg-diff-added
+ green-nuanced-bg green-faint))))
+ `(ediff-current-diff-C ((,class ,@(modus-operandi-theme-diff
+ bg-dim yellow
+ bg-diff-changed fg-diff-changed
+ yellow-nuanced-bg yellow-faint))))
`(ediff-even-diff-A ((,class :background ,bg-diff-neutral-1 :foreground
,fg-diff-neutral-1)))
`(ediff-even-diff-Ancestor ((,class :background ,bg-diff-neutral-2
:foreground ,fg-diff-neutral-1)))
`(ediff-even-diff-B ((,class :background ,bg-diff-neutral-1 :foreground
,fg-diff-neutral-1)))
@@ -1812,6 +2178,9 @@ Also bind `class' to ((class color) (min-colors 89))."
`(el-search-match ((,class :inherit modus-theme-intense-green)))
`(el-search-other-match ((,class :inherit modus-theme-special-mild)))
`(el-search-occur-match ((,class :inherit modus-theme-special-calm)))
+;;;;; eldoc
+ ;; NOTE: see https://github.com/purcell/package-lint/issues/187
+ (list 'eldoc-highlight-function-argument `((,class :inherit bold
:foreground ,blue-alt-other)))
;;;;; eldoc-box
`(eldoc-box-body ((,class :background ,bg-alt :foreground ,fg-main)))
`(eldoc-box-border ((,class :background ,fg-alt)))
@@ -1821,14 +2190,14 @@ Also bind `class' to ((class color) (min-colors 89))."
`(elfeed-log-error-level-face ((,class :foreground ,red)))
`(elfeed-log-info-level-face ((,class :foreground ,green)))
`(elfeed-log-warn-level-face ((,class :foreground ,yellow)))
- `(elfeed-search-date-face ((,class :foreground ,cyan)))
- `(elfeed-search-feed-face ((,class :foreground ,blue)))
- `(elfeed-search-filter-face ((,class :foreground ,magenta-active)))
- `(elfeed-search-last-update-face ((,class :foreground ,green-active)))
- `(elfeed-search-tag-face ((,class :foreground ,cyan-alt-other)))
- `(elfeed-search-title-face ((,class :foreground ,fg-main)))
- `(elfeed-search-unread-count-face ((,class :foreground ,blue-active)))
- `(elfeed-search-unread-title-face ((,class :inherit bold)))
+ `(elfeed-search-date-face ((,class :foreground ,blue-nuanced)))
+ `(elfeed-search-feed-face ((,class :foreground ,cyan)))
+ `(elfeed-search-filter-face ((,class :inherit bold :foreground
,magenta-active)))
+ `(elfeed-search-last-update-face ((,class :foreground ,cyan-active)))
+ `(elfeed-search-tag-face ((,class :foreground ,blue-nuanced)))
+ `(elfeed-search-title-face ((,class :foreground ,fg-dim)))
+ `(elfeed-search-unread-count-face ((,class :foreground ,green-active)))
+ `(elfeed-search-unread-title-face ((,class :inherit bold :foreground
,fg-main)))
;;;;; elfeed-score
`(elfeed-score-date-face ((,class :foreground ,blue)))
`(elfeed-score-debug-level-face ((,class :foreground ,magenta-alt-other)))
@@ -1888,6 +2257,38 @@ Also bind `class' to ((class color) (min-colors 89))."
`(erc-prompt-face ((,class :inherit bold :foreground ,cyan-alt-other)))
`(erc-timestamp-face ((,class :foreground ,blue-nuanced)))
`(erc-underline-face ((,class :underline t)))
+ `(bg:erc-color-face0 ((,class :background "white")))
+ `(bg:erc-color-face1 ((,class :background "black")))
+ `(bg:erc-color-face10 ((,class :background ,cyan-subtle-bg)))
+ `(bg:erc-color-face11 ((,class :background ,cyan-intense-bg)))
+ `(bg:erc-color-face12 ((,class :background ,blue-subtle-bg)))
+ `(bg:erc-color-face13 ((,class :background ,magenta-subtle-bg)))
+ `(bg:erc-color-face14 ((,class :background "gray60")))
+ `(bg:erc-color-face15 ((,class :background "gray80")))
+ `(bg:erc-color-face2 ((,class :background ,blue-intense-bg)))
+ `(bg:erc-color-face3 ((,class :background ,green-intense-bg)))
+ `(bg:erc-color-face4 ((,class :background ,red-subtle-bg)))
+ `(bg:erc-color-face5 ((,class :background ,red-intense-bg)))
+ `(bg:erc-color-face6 ((,class :background ,magenta-refine-bg)))
+ `(bg:erc-color-face7 ((,class :background ,yellow-subtle-bg)))
+ `(bg:erc-color-face8 ((,class :background ,yellow-refine-bg)))
+ `(bg:erc-color-face9 ((,class :background ,green-subtle-bg)))
+ `(fg:erc-color-face0 ((,class :foreground "white")))
+ `(fg:erc-color-face1 ((,class :foreground "black")))
+ `(fg:erc-color-face10 ((,class :foreground ,cyan)))
+ `(fg:erc-color-face11 ((,class :foreground ,cyan-alt-other)))
+ `(fg:erc-color-face12 ((,class :foreground ,blue)))
+ `(fg:erc-color-face13 ((,class :foreground ,magenta-alt)))
+ `(fg:erc-color-face14 ((,class :foreground "gray60")))
+ `(fg:erc-color-face15 ((,class :foreground "gray80")))
+ `(fg:erc-color-face2 ((,class :foreground ,blue-alt-other)))
+ `(fg:erc-color-face3 ((,class :foreground ,green)))
+ `(fg:erc-color-face4 ((,class :foreground ,red)))
+ `(fg:erc-color-face5 ((,class :foreground ,red-alt)))
+ `(fg:erc-color-face6 ((,class :foreground ,magenta-alt-other)))
+ `(fg:erc-color-face7 ((,class :foreground ,yellow-alt-other)))
+ `(fg:erc-color-face8 ((,class :foreground ,yellow-alt)))
+ `(fg:erc-color-face9 ((,class :foreground ,green-alt-other)))
;;;;; eros
`(eros-result-overlay-face ((,class :box (:line-width -1 :color ,blue)
:background ,bg-dim :foreground
,fg-dim)))
@@ -1904,14 +2305,13 @@ Also bind `class' to ((class color) (min-colors 89))."
`(eshell-ls-product ((,class :foreground ,fg-special-warm)))
`(eshell-ls-readonly ((,class :foreground ,fg-special-cold)))
`(eshell-ls-special ((,class :inherit bold :foreground ,magenta)))
- `(eshell-ls-symlink ((,class :foreground ,cyan :underline t)))
+ `(eshell-ls-symlink ((,class :inherit button :foreground ,cyan)))
`(eshell-ls-unreadable ((,class :background ,bg-inactive :foreground
,fg-inactive)))
`(eshell-prompt ((,class ,@(modus-operandi-theme-bold-weight)
- ,@(modus-operandi-theme-prompt green-alt-other
- green-nuanced-bg
- green-alt
- green-refine-bg
- fg-main))))
+ ,@(modus-operandi-theme-prompt
+ green-alt-other
+ green-nuanced-bg green-alt
+ green-refine-bg fg-main))))
;;;;; eshell-fringe-status
`(eshell-fringe-status-failure ((,class :foreground ,red)))
`(eshell-fringe-status-success ((,class :foreground ,green)))
@@ -1939,6 +2339,15 @@ Also bind `class' to ((class color) (min-colors 89))."
`(epe-remote-face ((,class :foreground ,fg-alt :slant ,modus-theme-slant)))
`(epe-status-face ((,class :foreground ,magenta-alt-other)))
`(epe-venv-face ((,class :foreground ,fg-alt :slant ,modus-theme-slant)))
+;;;;; eshell-syntax-highlighting
+ `(eshell-syntax-highlighting-alias-face ((,class :foreground ,cyan)))
+ `(eshell-syntax-highlighting-comment-face ((,class :foreground ,fg-alt)))
+ `(eshell-syntax-highlighting-directory-face ((,class :foreground ,blue)))
+ `(eshell-syntax-highlighting-envvar-face ((,class :foreground
,magenta-alt)))
+ `(eshell-syntax-highlighting-invalid-face ((,class :foreground ,red)))
+ `(eshell-syntax-highlighting-lisp-function-face ((,class :foreground
,magenta)))
+ `(eshell-syntax-highlighting-shell-command-face ((,class :foreground
,cyan-alt-other)))
+ `(eshell-syntax-highlighting-string-face ((,class :foreground ,blue-alt)))
;;;;; evil-mode
`(evil-ex-commands ((,class :foreground ,magenta-alt-other)))
`(evil-ex-info ((,class :foreground ,cyan-alt-other)))
@@ -2006,6 +2415,11 @@ Also bind `class' to ((class color) (min-colors 89))."
((,(append '((supports :underline (:style wave))) class)
:underline (:color ,fg-lang-warning :style wave))
(,class :foreground ,fg-lang-warning :underline t)))
+;;;;; flycheck-color-mode-line
+ `(flycheck-color-mode-line-error-face ((,class :inherit
flycheck-fringe-error)))
+ `(flycheck-color-mode-line-info-face ((,class :inherit
flycheck-fringe-info)))
+ `(flycheck-color-mode-line-running-face ((,class :foreground ,fg-inactive
:slant italic)))
+ `(flycheck-color-mode-line-info-face ((,class :inherit
flycheck-fringe-warning)))
;;;;; flycheck-indicator
`(flycheck-indicator-disabled ((,class :foreground ,fg-inactive :slant
,modus-theme-slant)))
`(flycheck-indicator-error ((,class ,@(modus-operandi-theme-bold-weight)
:foreground ,red-active)))
@@ -2049,7 +2463,7 @@ Also bind `class' to ((class color) (min-colors 89))."
'modus-theme-subtle-magenta
'modus-theme-intense-magenta
'modus-theme-nuanced-magenta
- magenta-alt-other
+ magenta-alt
'bold))))
;;;;; freeze-it
`(freeze-it-show ((,class :background ,bg-dim :foreground
,fg-special-warm)))
@@ -2157,18 +2571,13 @@ Also bind `class' to ((class color) (min-colors 89))."
`(git-commit-comment-branch-remote ((,class :foreground ,magenta-alt :slant
,modus-theme-slant)))
`(git-commit-comment-detached ((,class :foreground ,cyan-alt :slant
,modus-theme-slant)))
`(git-commit-comment-file ((,class :foreground ,fg-special-cold :slant
,modus-theme-slant)))
- `(git-commit-comment-heading ((,class :inherit bold :foreground ,fg-alt
:slant ,modus-theme-slant)))
+ `(git-commit-comment-heading ((,class :inherit bold :foreground ,fg-dim
:slant ,modus-theme-slant)))
`(git-commit-keyword ((,class :foreground ,magenta)))
- `(git-commit-known-pseudo-header ((,class :inherit bold :foreground
,fg-special-warm)))
+ `(git-commit-known-pseudo-header ((,class :foreground ,cyan-alt-other)))
`(git-commit-nonempty-second-line ((,class :inherit
modus-theme-refine-yellow)))
`(git-commit-overlong-summary ((,class :inherit modus-theme-refine-yellow)))
- `(git-commit-pseudo-header ((,class :inherit bold :foreground ,fg-alt)))
- `(git-commit-summary ((,class :foreground ,magenta-alt-other)))
-;;;;; git-rebase
- `(git-rebase-comment-hash ((,class :foreground ,fg-special-cold :slant
,modus-theme-slant)))
- `(git-rebase-comment-heading ((,class :inherit bold :foreground ,fg-dim
:slant ,modus-theme-slant)))
- `(git-rebase-description ((,class :foreground ,fg-main)))
- `(git-rebase-hash ((,class :foreground ,cyan-alt-other)))
+ `(git-commit-pseudo-header ((,class :foreground ,blue)))
+ `(git-commit-summary ((,class :inherit bold :foreground ,cyan)))
;;;;; git-gutter
`(git-gutter:added ((,class :inherit modus-theme-fringe-green)))
`(git-gutter:deleted ((,class :inherit modus-theme-fringe-red)))
@@ -2194,13 +2603,18 @@ Also bind `class' to ((class color) (min-colors 89))."
`(git-lens-header ((,class :inherit bold :height 1.1 :foreground ,cyan)))
`(git-lens-modified ((,class :inherit bold :foreground ,yellow)))
`(git-lens-renamed ((,class :inherit bold :foreground ,magenta)))
+;;;;; git-rebase
+ `(git-rebase-comment-hash ((,class :foreground ,fg-special-cold :slant
,modus-theme-slant)))
+ `(git-rebase-comment-heading ((,class :inherit bold :foreground ,fg-dim
:slant ,modus-theme-slant)))
+ `(git-rebase-description ((,class :foreground ,fg-main)))
+ `(git-rebase-hash ((,class :foreground ,cyan-alt-other)))
;;;;; git-timemachine
`(git-timemachine-commit ((,class :inherit bold :foreground
,yellow-active)))
`(git-timemachine-minibuffer-author-face ((,class :foreground
,fg-special-warm)))
`(git-timemachine-minibuffer-detail-face ((,class :foreground ,red-alt)))
;;;;; git-walktree
`(git-walktree-commit-face ((,class :foreground ,yellow)))
- `(git-walktree-symlink-face ((,class :foreground ,cyan :underline t)))
+ `(git-walktree-symlink-face ((,class :inherit button :foreground ,cyan)))
`(git-walktree-tree-face ((,class :foreground ,magenta)))
;;;;; gnus
`(gnus-button ((,class :inherit button)))
@@ -2239,9 +2653,9 @@ Also bind `class' to ((class color) (min-colors 89))."
`(gnus-group-news-6-empty ((,class :foreground ,fg-alt)))
`(gnus-group-news-low ((,class :inherit bold :foreground ,green-nuanced)))
`(gnus-group-news-low-empty ((,class :foreground ,green-nuanced)))
- `(gnus-header-content ((,class :foreground ,fg-special-calm)))
- `(gnus-header-from ((,class :inherit bold :foreground ,cyan-alt :underline
nil)))
- `(gnus-header-name ((,class :foreground ,cyan-alt-other)))
+ `(gnus-header-content ((,class :foreground ,cyan)))
+ `(gnus-header-from ((,class :inherit bold :foreground ,cyan-alt-other
:underline nil)))
+ `(gnus-header-name ((,class :foreground ,green)))
`(gnus-header-newsgroups ((,class :inherit bold :foreground ,blue-alt)))
`(gnus-header-subject ((,class :inherit bold :foreground
,magenta-alt-other)))
`(gnus-server-agent ((,class :inherit bold :foreground ,cyan)))
@@ -2260,12 +2674,12 @@ Also bind `class' to ((class color) (min-colors 89))."
`(gnus-summary-high-undownloaded ((,class :inherit bold :foreground
,yellow)))
`(gnus-summary-high-unread ((,class :inherit bold :foreground ,fg-main)))
`(gnus-summary-low-ancient ((,class :foreground ,fg-alt :slant italic)))
- `(gnus-summary-low-read ((,class :foreground ,fg-special-cold :slant
italic)))
+ `(gnus-summary-low-read ((,class :foreground ,fg-alt :slant italic)))
`(gnus-summary-low-ticked ((,class :foreground ,red-refine-fg :slant
italic)))
`(gnus-summary-low-undownloaded ((,class :foreground ,yellow-refine-fg
:slant italic)))
`(gnus-summary-low-unread ((,class :inherit bold :foreground
,fg-special-cold)))
`(gnus-summary-normal-ancient ((,class :foreground ,fg-special-calm)))
- `(gnus-summary-normal-read ((,class :foreground ,fg-special-cold)))
+ `(gnus-summary-normal-read ((,class :foreground ,fg-alt)))
`(gnus-summary-normal-ticked ((,class :foreground ,red-alt-other)))
`(gnus-summary-normal-undownloaded ((,class :foreground ,yellow)))
`(gnus-summary-normal-unread ((,class :foreground ,fg-main)))
@@ -2309,11 +2723,11 @@ Also bind `class' to ((class color) (min-colors 89))."
`(helm-ff-directory ((,class :inherit helm-buffer-directory)))
`(helm-ff-dirs ((,class :inherit bold :foreground ,blue-alt-other)))
`(helm-ff-dotted-directory ((,class :inherit bold :background ,bg-alt
:foreground ,fg-alt)))
- `(helm-ff-dotted-symlink-directory ((,class :inherit
helm-ff-dotted-directory :underline t)))
+ `(helm-ff-dotted-symlink-directory ((,class :inherit (button
helm-ff-dotted-directory))))
`(helm-ff-executable ((,class :foreground ,magenta-alt)))
`(helm-ff-file ((,class :foreground ,fg-main)))
`(helm-ff-file-extension ((,class :foreground ,fg-special-warm)))
- `(helm-ff-invalid-symlink ((,class :foreground ,red :underline t)))
+ `(helm-ff-invalid-symlink ((,class :inherit button :foreground ,red)))
`(helm-ff-pipe ((,class ,@(modus-operandi-theme-extra-completions
'modus-theme-refine-magenta
'modus-theme-subtle-magenta
@@ -2330,7 +2744,7 @@ Also bind `class' to ((class color) (min-colors 89))."
'modus-theme-refine-red
'modus-theme-nuanced-yellow
red-alt))))
- `(helm-ff-symlink ((,class :foreground ,cyan :underline t)))
+ `(helm-ff-symlink ((,class :inherit button :foreground ,cyan)))
`(helm-ff-truename ((,class :foreground ,blue-alt-other)))
`(helm-grep-cmd-line ((,class :foreground ,yellow-alt-other)))
`(helm-grep-file ((,class :inherit bold :foreground ,fg-special-cold)))
@@ -2366,7 +2780,7 @@ Also bind `class' to ((class color) (min-colors 89))."
'modus-theme-nuanced-cyan
cyan-alt-other))))
`(helm-minibuffer-prompt ((,class :inherit minibuffer-prompt)))
- `(helm-moccur-buffer ((,class :foreground ,cyan-alt-other :underline t)))
+ `(helm-moccur-buffer ((,class :inherit button :foreground ,cyan-alt-other)))
`(helm-mode-prefix ((,class ,@(modus-operandi-theme-extra-completions
'modus-theme-subtle-magenta
'modus-theme-intense-magenta
@@ -2416,8 +2830,7 @@ Also bind `class' to ((class color) (min-colors 89))."
`(helm-xref-file-name ((,class :inherit bold :foreground ,fg-special-cold)))
`(helm-xref-file-name ((,class :foreground ,fg-special-warm)))
;;;;; helpful
- `(helpful-heading ((,class :inherit (bold ,modus-theme-variable-pitch)
:foreground ,fg-main
- ,@(modus-operandi-theme-scale
modus-operandi-theme-scale-4))))
+ `(helpful-heading ((,class :inherit modus-theme-heading-1)))
;;;;; highlight region or ad-hoc regexp
`(hi-black-b ((,class :background ,fg-main :foreground ,bg-main)))
`(hi-blue ((,class :background ,bg-alt :foreground ,blue :underline t)))
@@ -2487,23 +2900,23 @@ Also bind `class' to ((class color) (min-colors 89))."
;;;;; icomplete
`(icomplete-first-match ((,class :inherit bold
,@(modus-operandi-theme-standard-completions
- magenta magenta-nuanced-bg
- magenta-intense-bg fg-main))))
+ magenta bg-alt
+ bg-active fg-main))))
;;;;; icomplete-vertical
`(icomplete-vertical-separator ((,class :foreground ,fg-alt)))
;;;;; ido-mode
`(ido-first-match ((,class :inherit bold
,@(modus-operandi-theme-standard-completions
- magenta magenta-nuanced-bg
- magenta-subtle-bg fg-main))))
+ magenta bg-alt
+ bg-active fg-main))))
`(ido-incomplete-regexp ((,class :inherit error)))
`(ido-indicator ((,class :inherit modus-theme-subtle-yellow)))
`(ido-only-match ((,class :inherit bold
,@(modus-operandi-theme-standard-completions
- magenta-intense red-nuanced-bg
- magenta-intense-bg fg-main))))
- `(ido-subdir ((,class :foreground ,blue-alt-other)))
- `(ido-virtual ((,class :foreground ,yellow-alt-other)))
+ green green-nuanced-bg
+ green-intense-bg fg-main))))
+ `(ido-subdir ((,class :foreground ,blue)))
+ `(ido-virtual ((,class :foreground ,fg-special-warm)))
;;;;; iedit
`(iedit-occurrence ((,class :inherit modus-theme-refine-blue)))
`(iedit-read-only-occurrence ((,class :inherit modus-theme-intense-yellow)))
@@ -2521,29 +2934,25 @@ Also bind `class' to ((class color) (min-colors 89))."
`(imenu-list-entry-subalist-face-3 ((,class :inherit bold :foreground
,red-alt-other :underline t)))
;;;;; indium
`(indium-breakpoint-face ((,class :foreground ,red-active)))
- `(indium-frame-url-face ((,class :foreground ,fg-alt :underline t)))
+ `(indium-frame-url-face ((,class :inherit button :foreground ,fg-alt)))
`(indium-keyword-face ((,class :foreground ,magenta-alt-other)))
`(indium-litable-face ((,class :foreground ,fg-special-warm :slant
,modus-theme-slant)))
`(indium-repl-error-face ((,class :inherit bold :foreground ,red)))
`(indium-repl-prompt-face ((,class :foreground ,cyan-alt-other)))
`(indium-repl-stdout-face ((,class :foreground ,fg-main)))
;;;;; info
- `(Info-quoted ((,class :foreground ,magenta))) ; the capitalisation is
canonical
+ `(Info-quoted ((,class ,@(modus-operandi-theme-mixed-fonts)
+ :foreground ,magenta))) ; the capitalisation is
canonical
`(info-header-node ((,class :inherit bold :foreground ,fg-alt)))
`(info-header-xref ((,class :foreground ,blue-active)))
`(info-index-match ((,class :inherit match)))
- `(info-menu-header ((,class :inherit (bold ,modus-theme-variable-pitch)
:foreground ,fg-main
- ,@(modus-operandi-theme-scale
modus-operandi-theme-scale-2))))
- `(info-menu-star ((,class :foreground ,fg-main)))
+ `(info-menu-header ((,class :inherit modus-theme-heading-3)))
+ `(info-menu-star ((,class :foreground ,red)))
`(info-node ((,class :inherit bold)))
- `(info-title-1 ((,class :inherit (bold ,modus-theme-variable-pitch)
:foreground ,fg-main
- ,@(modus-operandi-theme-scale
modus-operandi-theme-scale-4))))
- `(info-title-2 ((,class :inherit (bold ,modus-theme-variable-pitch)
:foreground ,fg-special-warm
- ,@(modus-operandi-theme-scale
modus-operandi-theme-scale-3))))
- `(info-title-3 ((,class :inherit (bold ,modus-theme-variable-pitch)
:foreground ,fg-special-cold
- ,@(modus-operandi-theme-scale
modus-operandi-theme-scale-2))))
- `(info-title-4 ((,class :inherit (bold ,modus-theme-variable-pitch)
:foreground ,fg-special-mild
- ,@(modus-operandi-theme-scale
modus-operandi-theme-scale-1))))
+ `(info-title-1 ((,class :inherit modus-theme-heading-1)))
+ `(info-title-2 ((,class :inherit modus-theme-heading-2)))
+ `(info-title-3 ((,class :inherit modus-theme-heading-3)))
+ `(info-title-4 ((,class :inherit modus-theme-heading-4)))
;;;;; info-colors
`(info-colors-lisp-code-block ((,class :inherit fixed-pitch)))
`(info-colors-ref-item-command ((,class :foreground ,magenta)))
@@ -2689,13 +3098,14 @@ Also bind `class' to ((class color) (min-colors 89))."
`(kaocha-runner-warning-face ((,class :foreground ,yellow)))
;;;;; keycast
`(keycast-command ((,class :inherit bold :foreground ,blue-active)))
- `(keycast-key ((,class :box ,(modus-operandi-theme-modeline-box blue-alt
blue-active t -3)
- ,@(modus-operandi-theme-modeline-props
- blue-active bg-main
- blue-active bg-active))))
+ `(keycast-key ((,class ,@(modus-operandi-theme-mode-line-attrs
+ bg-main blue-active
+ bg-main blue-active
+ blue-active blue-intense
+ 'alt-style -3))))
;;;;; line numbers (display-line-numbers-mode and global variant)
- `(line-number ((,class :background ,bg-dim :foreground ,fg-alt)))
- `(line-number-current-line ((,class :inherit bold :background ,bg-active
:foreground ,fg-active)))
+ `(line-number ((,class :inherit default :background ,bg-dim :foreground
,fg-alt)))
+ `(line-number-current-line ((,class :inherit default :background ,bg-active
:foreground ,fg-main)))
;;;;; lsp-mode
`(lsp-face-highlight-read ((,class :inherit modus-theme-subtle-blue
:underline t)))
`(lsp-face-highlight-textual ((,class :inherit modus-theme-subtle-blue)))
@@ -2725,7 +3135,7 @@ Also bind `class' to ((class color) (min-colors 89))."
`(lsp-lens-mouse-face ((,class :height 0.8 :foreground ,blue-alt-other
:underline t)))
`(lsp-ui-doc-background ((,class :background ,bg-alt)))
`(lsp-ui-doc-header ((,class :background ,bg-header :foreground
,fg-header)))
- `(lsp-ui-doc-url ((,class :foreground ,blue-alt-other :underline t)))
+ `(lsp-ui-doc-url ((,class :inherit button :foreground ,blue-alt-other)))
`(lsp-ui-peek-filename ((,class :foreground ,fg-special-warm)))
`(lsp-ui-peek-footer ((,class :background ,bg-header :foreground
,fg-header)))
`(lsp-ui-peek-header ((,class :background ,bg-header :foreground
,fg-header)))
@@ -2757,37 +3167,43 @@ Also bind `class' to ((class color) (min-colors 89))."
`(magit-branch-upstream ((,class :slant italic)))
`(magit-cherry-equivalent ((,class :background ,bg-main :foreground
,magenta-intense)))
`(magit-cherry-unmatched ((,class :background ,bg-main :foreground
,cyan-intense)))
- `(magit-diff-added ((,class ,@(modus-operandi-theme-diffs
+ ;; NOTE: here we break from the pattern of inheriting from the
+ ;; modus-theme-diff-* faces, though only for the standard actions,
+ ;; not the highlighted ones. This is because Magit's interaction
+ ;; model relies on highlighting the current diff hunk.
+ `(magit-diff-added ((,class ,@(modus-operandi-theme-diff
bg-main green
- bg-diff-added fg-diff-added))))
- `(magit-diff-added-highlight ((,class ,@(modus-operandi-theme-diffs
- bg-dim green
- bg-diff-focus-added
fg-diff-focus-added))))
- `(magit-diff-base ((,class ,@(modus-operandi-theme-diffs
+ bg-diff-added fg-diff-added
+ green-nuanced-bg fg-diff-added))))
+ `(magit-diff-added-highlight ((,class :inherit
modus-theme-diff-focus-added)))
+ `(magit-diff-base ((,class ,@(modus-operandi-theme-diff
bg-main yellow
- bg-diff-changed fg-diff-changed))))
- `(magit-diff-base-highlight ((,class ,@(modus-operandi-theme-diffs
- bg-dim yellow
- bg-diff-focus-changed
fg-diff-focus-changed))))
+ bg-diff-changed fg-diff-changed
+ yellow-nuanced-bg fg-diff-changed))))
+ `(magit-diff-base-highlight ((,class :inherit
modus-theme-diff-focus-changed)))
`(magit-diff-context ((,class :foreground ,fg-unfocused)))
- `(magit-diff-context-highlight ((,class ,@(modus-operandi-theme-diffs
+ `(magit-diff-context-highlight ((,class ,@(modus-operandi-theme-diff
bg-dim fg-dim
- bg-inactive fg-inactive))))
+ bg-inactive fg-inactive
+ bg-dim fg-alt))))
`(magit-diff-file-heading ((,class :inherit bold :foreground
,fg-special-cold)))
`(magit-diff-file-heading-highlight ((,class :inherit
(modus-theme-special-cold bold))))
- `(magit-diff-file-heading-selection ((,class :background ,bg-alt
:foreground ,cyan)))
- `(magit-diff-hunk-heading ((,class :inherit bold :background ,bg-active
:foreground ,fg-inactive)))
- `(magit-diff-hunk-heading-highlight ((,class :inherit
(modus-theme-diff-heading bold))))
- `(magit-diff-hunk-heading-selection ((,class :inherit
modus-theme-intense-cyan)))
+ `(magit-diff-file-heading-selection ((,class :inherit
modus-theme-refine-cyan)))
+ ;; NOTE: here we break from the pattern of inheriting from the
+ ;; modus-theme-diff-* faces.
+ `(magit-diff-hunk-heading ((,class :inherit bold :background ,bg-active
+ :foreground ,fg-inactive)))
+ `(magit-diff-hunk-heading-highlight ((,class :inherit bold :background
,bg-diff-heading
+ :foreground ,fg-diff-heading)))
+ `(magit-diff-hunk-heading-selection ((,class :inherit
modus-theme-refine-blue)))
`(magit-diff-hunk-region ((,class :inherit bold)))
`(magit-diff-lines-boundary ((,class :background ,fg-main)))
`(magit-diff-lines-heading ((,class :inherit modus-theme-refine-magenta)))
- `(magit-diff-removed ((,class ,@(modus-operandi-theme-diffs
+ `(magit-diff-removed ((,class ,@(modus-operandi-theme-diff
bg-main red
- bg-diff-removed fg-diff-removed))))
- `(magit-diff-removed-highlight ((,class ,@(modus-operandi-theme-diffs
- bg-dim red
- bg-diff-focus-removed
fg-diff-focus-removed))))
+ bg-diff-removed fg-diff-removed
+ red-nuanced-bg fg-diff-removed))))
+ `(magit-diff-removed-highlight ((,class :inherit
modus-theme-diff-focus-removed)))
`(magit-diffstat-added ((,class :foreground ,green)))
`(magit-diffstat-removed ((,class :foreground ,red)))
`(magit-dimmed ((,class :foreground ,fg-unfocused)))
@@ -2846,26 +3262,40 @@ Also bind `class' to ((class color) (min-colors 89))."
`(Man-reverse ((,class :inherit modus-theme-subtle-magenta)))
`(Man-underline ((,class :foreground ,cyan :underline t)))
;;;;; markdown-mode
- `(markdown-blockquote-face ((,class :foreground ,fg-special-warm :slant
,modus-theme-slant)))
+ `(markdown-blockquote-face ((,class :foreground ,fg-special-cold :slant
,modus-theme-slant)))
`(markdown-bold-face ((,class :inherit bold)))
- `(markdown-code-face ((,class :inherit fixed-pitch)))
+ `(markdown-code-face ((,class ,@(modus-operandi-theme-mixed-fonts))))
`(markdown-comment-face ((,class :foreground ,fg-alt :slant
,modus-theme-slant)))
`(markdown-footnote-marker-face ((,class :inherit bold :foreground
,cyan-alt)))
`(markdown-footnote-text-face ((,class :foreground ,fg-main :slant
,modus-theme-slant)))
`(markdown-gfm-checkbox-face ((,class :foreground ,cyan-alt-other)))
`(markdown-header-delimiter-face ((,class
,@(modus-operandi-theme-bold-weight) :foreground ,fg-dim)))
- `(markdown-header-face ((,class :inherit bold)))
+ `(markdown-header-face ((t nil)))
+ `(markdown-header-face-1 ((,class :inherit modus-theme-heading-1)))
+ `(markdown-header-face-2 ((,class :inherit modus-theme-heading-2)))
+ `(markdown-header-face-3 ((,class :inherit modus-theme-heading-3)))
+ `(markdown-header-face-4 ((,class :inherit modus-theme-heading-4)))
+ `(markdown-header-face-5 ((,class :inherit modus-theme-heading-5)))
+ `(markdown-header-face-6 ((,class :inherit modus-theme-heading-6)))
`(markdown-header-rule-face ((,class :inherit bold :foreground
,fg-special-warm)))
`(markdown-hr-face ((,class :inherit bold :foreground ,fg-special-warm)))
- `(markdown-html-attr-name-face ((,class :inherit fixed-pitch :foreground
,cyan)))
- `(markdown-html-attr-value-face ((,class :inherit fixed-pitch :foreground
,blue)))
- `(markdown-html-entity-face ((,class :inherit fixed-pitch :foreground
,cyan)))
- `(markdown-html-tag-delimiter-face ((,class :inherit fixed-pitch
:foreground ,fg-special-mild)))
- `(markdown-html-tag-name-face ((,class :inherit fixed-pitch :foreground
,magenta-alt)))
- `(markdown-inline-code-face ((,class :inherit fixed-pitch :foreground
,magenta)))
+ `(markdown-html-attr-name-face ((,class ,@(modus-operandi-theme-mixed-fonts)
+ :foreground ,cyan)))
+ `(markdown-html-attr-value-face ((,class
,@(modus-operandi-theme-mixed-fonts)
+ :foreground ,blue)))
+ `(markdown-html-entity-face ((,class ,@(modus-operandi-theme-mixed-fonts)
+ :foreground ,cyan)))
+ `(markdown-html-tag-delimiter-face ((,class
,@(modus-operandi-theme-mixed-fonts)
+ :foreground ,fg-special-mild)))
+ `(markdown-html-tag-name-face ((,class ,@(modus-operandi-theme-mixed-fonts)
+ :foreground ,magenta-alt)))
+ `(markdown-inline-code-face ((,class ,@(modus-operandi-theme-mixed-fonts)
+ :foreground ,magenta)))
`(markdown-italic-face ((,class :foreground ,fg-special-cold :slant
italic)))
- `(markdown-language-info-face ((,class :inherit fixed-pitch :foreground
,fg-special-cold)))
- `(markdown-language-keyword-face ((,class :inherit fixed-pitch :foreground
,green-alt-other)))
+ `(markdown-language-info-face ((,class ,@(modus-operandi-theme-mixed-fonts)
+ :foreground ,fg-special-cold)))
+ `(markdown-language-keyword-face ((,class
,@(modus-operandi-theme-mixed-fonts)
+ :foreground ,green-alt-other)))
`(markdown-line-break-face ((,class :inherit modus-theme-refine-cyan
:underline t)))
`(markdown-link-face ((,class :inherit link)))
`(markdown-link-title-face ((,class :foreground ,fg-special-cold :slant
,modus-theme-slant)))
@@ -2877,12 +3307,14 @@ Also bind `class' to ((class color) (min-colors 89))."
`(markdown-missing-link-face ((,class :inherit bold :foreground ,yellow)))
`(markdown-plain-url-face ((,class :inherit markdown-link-face)))
`(markdown-pre-face ((,class ,@(and (>= emacs-major-version 27) '(:extend
t))
- :inherit fixed-pitch :background ,bg-dim
+ ,@(modus-operandi-theme-mixed-fonts)
+ :background ,bg-dim
:foreground ,fg-special-mild)))
`(markdown-reference-face ((,class :inherit markdown-markup-face)))
`(markdown-strike-through-face ((,class :strike-through t)))
- `(markdown-table-face ((,class :inherit fixed-pitch :foreground
,fg-special-cold)))
- `(markdown-url-face ((,class :foreground ,blue)))
+ `(markdown-table-face ((,class ,@(modus-operandi-theme-mixed-fonts)
+ :foreground ,fg-special-cold)))
+ `(markdown-url-face ((,class :foreground ,blue-alt)))
;;;;; markup-faces (`adoc-mode')
`(markup-anchor-face ((,class :foreground ,fg-inactive)))
`(markup-attribute-face ((,class :foreground ,fg-inactive :slant italic)))
@@ -2896,7 +3328,7 @@ Also bind `class' to ((class color) (min-colors 89))."
`(markup-emphasis-face ((,class :foreground ,fg-special-cold :slant
italic)))
`(markup-error-face ((,class :inherit bold :foreground ,red)))
`(markup-gen-face ((,class :foreground ,magenta-alt)))
- `(markup-internal-reference-face ((,class :foreground ,fg-inactive
:underline t)))
+ `(markup-internal-reference-face ((,class :inherit button :foreground
,fg-inactive)))
`(markup-italic-face ((,class :foreground ,fg-special-cold :slant italic)))
`(markup-list-face ((,class :inherit modus-theme-special-calm)))
`(markup-meta-face ((,class :foreground ,fg-inactive)))
@@ -2935,32 +3367,30 @@ Also bind `class' to ((class color) (min-colors 89))."
`(message-cited-text-2 ((,class :foreground ,red-alt)))
`(message-cited-text-3 ((,class :foreground ,green-alt)))
`(message-cited-text-4 ((,class :foreground ,magenta-alt)))
- `(message-header-cc ((,class :foreground ,blue-alt)))
+ `(message-header-cc ((,class :inherit bold :foreground ,cyan-alt)))
`(message-header-name ((,class :foreground ,green-alt-other)))
- `(message-header-newsgroups ((,class :inherit bold :foreground ,blue)))
+ `(message-header-newsgroups ((,class :inherit bold :foreground ,green-alt)))
`(message-header-other ((,class :inherit bold :foreground ,cyan-alt-other)))
`(message-header-subject ((,class :inherit bold :foreground
,magenta-alt-other)))
- `(message-header-to ((,class :inherit bold :foreground ,magenta-alt)))
- `(message-header-xheader ((,class :foreground ,blue-alt-other)))
- `(message-mml ((,class :foreground ,green-alt)))
- `(message-separator ((,class :background ,bg-active :foreground
,fg-special-warm)))
+ `(message-header-to ((,class :inherit bold :foreground ,blue)))
+ `(message-header-xheader ((,class :foreground ,cyan)))
+ `(message-mml ((,class :foreground ,fg-special-warm)))
+ `(message-separator ((,class :inherit modus-theme-intense-neutral)))
;;;;; minibuffer-line
`(minibuffer-line ((,class :foreground ,fg-main)))
;;;;; minimap
`(minimap-active-region-background ((,class :background ,bg-active)))
`(minimap-current-line-face ((,class :background ,cyan-intense-bg
:foreground ,fg-main)))
;;;;; modeline
- `(mode-line ((,class :box ,(modus-operandi-theme-modeline-box bg-active
fg-alt t)
- ,@(modus-operandi-theme-modeline-props
- bg-active fg-dim
- bg-active fg-active))))
+ `(mode-line ((,class ,@(modus-operandi-theme-mode-line-attrs
+ fg-active bg-active fg-dim bg-active
+ fg-alt bg-active 'alt-style nil bg-main))))
`(mode-line-buffer-id ((,class :inherit bold)))
`(mode-line-emphasis ((,class :inherit bold :foreground ,blue-active)))
`(mode-line-highlight ((,class :inherit modus-theme-active-blue :box
(:line-width -1 :style pressed-button))))
- `(mode-line-inactive ((,class :box ,(modus-operandi-theme-modeline-box
bg-active bg-region)
- ,@(modus-operandi-theme-modeline-props
- bg-dim fg-inactive
- bg-inactive fg-inactive))))
+ `(mode-line-inactive ((,class ,@(modus-operandi-theme-mode-line-attrs
+ fg-inactive bg-inactive fg-alt bg-dim
+ bg-region bg-active))))
;;;;; mood-line
`(mood-line-modified ((,class :foreground ,magenta-active)))
`(mood-line-status-error ((,class :inherit bold :foreground ,red-active)))
@@ -2969,6 +3399,9 @@ Also bind `class' to ((class color) (min-colors 89))."
`(mood-line-status-success ((,class :foreground ,green-active)))
`(mood-line-status-warning ((,class :inherit bold :foreground
,yellow-active)))
`(mood-line-unimportant ((,class :foreground ,fg-inactive)))
+;;;;; mpdel
+ `(mpdel-browser-directory-face ((,class :foreground ,blue)))
+ `(mpdel-playlist-current-song-face ((,class :inherit bold :foreground
,blue-alt-other)))
;;;;; mu4e
`(mu4e-attach-number-face ((,class :inherit bold :foreground ,cyan-alt)))
`(mu4e-cited-1-face ((,class :foreground ,blue-alt)))
@@ -2979,7 +3412,7 @@ Also bind `class' to ((class color) (min-colors 89))."
`(mu4e-cited-6-face ((,class :foreground ,cyan-alt)))
`(mu4e-cited-7-face ((,class :foreground ,magenta)))
`(mu4e-compose-header-face ((,class :inherit mu4e-compose-separator-face)))
- `(mu4e-compose-separator-face ((,class :background ,bg-active :foreground
,fg-special-warm)))
+ `(mu4e-compose-separator-face ((,class :inherit
modus-theme-intense-neutral)))
`(mu4e-contact-face ((,class :inherit bold :foreground ,cyan-alt-other)))
`(mu4e-context-face ((,class :foreground ,blue-active)))
`(mu4e-draft-face ((,class :foreground ,magenta-alt)))
@@ -2998,7 +3431,7 @@ Also bind `class' to ((class color) (min-colors 89))."
`(mu4e-moved-face ((,class :foreground ,yellow :slant ,modus-theme-slant)))
`(mu4e-ok-face ((,class :inherit bold :foreground ,green)))
`(mu4e-region-code ((,class :inherit modus-theme-special-calm)))
- `(mu4e-replied-face ((,class :foreground ,cyan-active)))
+ `(mu4e-replied-face ((,class :foreground ,blue-faint)))
`(mu4e-special-header-value-face ((,class :inherit bold :foreground
,blue-alt-other)))
`(mu4e-system-face ((,class :foreground ,fg-mark-del :slant
,modus-theme-slant)))
`(mu4e-title-face ((,class :foreground ,fg-main)))
@@ -3129,10 +3562,15 @@ Also bind `class' to ((class color) (min-colors 89))."
`(nxml-ref ((,class ,@(modus-operandi-theme-syntax-foreground
green-alt-other green-alt-other-faint)
,@(modus-operandi-theme-bold-weight))))
+;;;;; objed
+ `(objed-hl ((,class :background ,(if modus-operandi-theme-intense-hl-line
+ bg-hl-alt-intense bg-hl-alt))))
+ `(objed-mark ((,class :background ,bg-active)))
+ `(objed-mode-line ((,class :foreground ,cyan-active)))
;;;;; orderless
`(orderless-match-face-0 ((,class :inherit bold
,@(modus-operandi-theme-standard-completions
- blue-alt blue-nuanced-bg
+ blue-alt-other blue-nuanced-bg
blue-refine-bg blue-refine-fg))))
`(orderless-match-face-1 ((,class :inherit bold
,@(modus-operandi-theme-standard-completions
@@ -3140,70 +3578,62 @@ Also bind `class' to ((class color) (min-colors 89))."
magenta-refine-bg magenta-refine-fg))))
`(orderless-match-face-2 ((,class :inherit bold
,@(modus-operandi-theme-standard-completions
- green-alt-other green-nuanced-bg
+ green green-nuanced-bg
green-refine-bg green-refine-fg))))
`(orderless-match-face-3 ((,class :inherit bold
,@(modus-operandi-theme-standard-completions
- yellow-alt-other yellow-nuanced-bg
+ yellow yellow-nuanced-bg
yellow-refine-bg yellow-refine-fg))))
;;;;; org
`(org-agenda-calendar-event ((,class :foreground ,fg-main)))
`(org-agenda-calendar-sexp ((,class :foreground ,cyan-alt)))
- `(org-agenda-clocking ((,class :inherit modus-theme-special-cold)))
+ `(org-agenda-clocking ((,class :inherit modus-theme-special-cold
+ ,@(and (>= emacs-major-version 27) '(:extend
t)))))
`(org-agenda-column-dateline ((,class :background ,bg-alt)))
- `(org-agenda-current-time ((,class :inherit modus-theme-subtle-cyan)))
- `(org-agenda-date ((,class :inherit ,modus-theme-variable-pitch :foreground
,cyan-alt-other
- ,@(modus-operandi-theme-scale
modus-operandi-theme-scale-4)
- ,@(modus-operandi-theme-heading-block
cyan-nuanced-bg cyan-nuanced))))
- `(org-agenda-date-today ((,class :inherit (bold ,modus-theme-variable-pitch)
- :background ,cyan-intense-bg :foreground
,fg-main
- ,@(modus-operandi-theme-scale
modus-operandi-theme-scale-4))))
- `(org-agenda-date-weekend ((,class :inherit ,modus-theme-variable-pitch
:foreground ,cyan
- ,@(modus-operandi-theme-scale
modus-operandi-theme-scale-4)
- ,@(modus-operandi-theme-heading-block
blue-nuanced-bg cyan-nuanced))))
+ `(org-agenda-current-time ((,class :inherit bold :foreground
,blue-alt-other)))
+ `(org-agenda-date ((,class :foreground ,cyan)))
+ `(org-agenda-date-today ((,class :inherit bold :foreground ,fg-main
:underline t)))
+ `(org-agenda-date-weekend ((,class :foreground ,cyan-alt-other)))
`(org-agenda-diary ((,class :foreground ,fg-main)))
- `(org-agenda-dimmed-todo-face ((,class :inherit
modus-theme-subtle-neutral)))
- `(org-agenda-done ((,class ,@(modus-operandi-theme-org-todo-block
green-nuanced-bg green-nuanced green))))
+ `(org-agenda-dimmed-todo-face ((,class :inherit bold :foreground ,fg-alt)))
+ `(org-agenda-done ((,class :foreground ,green-alt)))
`(org-agenda-filter-category ((,class :inherit bold :foreground
,magenta-active)))
`(org-agenda-filter-effort ((,class :inherit bold :foreground
,magenta-active)))
`(org-agenda-filter-regexp ((,class :inherit bold :foreground
,magenta-active)))
`(org-agenda-filter-tags ((,class :inherit bold :foreground
,magenta-active)))
`(org-agenda-restriction-lock ((,class :background ,bg-dim :foreground
,fg-dim)))
- `(org-agenda-structure ((,class :inherit ,modus-theme-variable-pitch
- :foreground ,fg-special-mild
- ,@(modus-operandi-theme-scale
modus-operandi-theme-scale-3))))
+ `(org-agenda-structure ((,class :foreground ,blue-alt)))
`(org-archived ((,class :background ,bg-alt :foreground ,fg-alt)))
- `(org-block ((,class ,@(modus-operandi-theme-org-block bg-dim)
- :inherit fixed-pitch :foreground ,fg-main)))
- `(org-block-begin-line ((,class ,@(modus-operandi-theme-org-block-delim
+ `(org-block ((,class ,@(modus-operandi-theme-mixed-fonts)
+ ,@(modus-operandi-theme-org-block bg-dim)
+ :foreground ,fg-main)))
+ `(org-block-begin-line ((,class ,@(modus-operandi-theme-mixed-fonts)
+ ,@(modus-operandi-theme-org-block-delim
bg-dim fg-special-cold
- bg-alt fg-special-mild)
- :inherit fixed-pitch)))
+ bg-alt fg-special-mild))))
`(org-block-end-line ((,class :inherit org-block-begin-line)))
`(org-checkbox ((,class :box (:line-width 1 :color ,bg-active)
:background ,bg-inactive :foreground ,fg-active)))
- `(org-checkbox-statistics-done ((,class :foreground ,green
-
,@(modus-operandi-theme-heading-block
- green-nuanced-bg
green-nuanced))))
- `(org-checkbox-statistics-todo ((,class
,@(modus-operandi-theme-heading-foreground red-alt red)
-
,@(modus-operandi-theme-heading-block
- red-nuanced-bg red-nuanced))))
+ `(org-checkbox-statistics-done ((,class :inherit org-done)))
+ `(org-checkbox-statistics-todo ((,class :inherit org-todo)))
`(org-clock-overlay ((,class :inherit modus-theme-special-cold)))
- `(org-code ((,class :inherit fixed-pitch :foreground ,magenta)))
+ `(org-code ((,class ,@(modus-operandi-theme-mixed-fonts) :foreground
,magenta)))
`(org-column ((,class :background ,bg-alt)))
`(org-column-title ((,class :inherit bold :underline t :background
,bg-alt)))
- `(org-date ((,class :inherit fixed-pitch :foreground ,cyan-alt-other
:underline t)))
+ `(org-date ((,class :inherit (button fixed-pitch) :foreground
,cyan-alt-other)))
`(org-date-selected ((,class :inherit bold :foreground ,blue-alt
:inverse-video t)))
- `(org-default ((,class :background ,bg-main :foreground ,fg-main)))
`(org-document-info ((,class :foreground ,fg-special-cold)))
- `(org-document-info-keyword ((,class :inherit fixed-pitch :foreground
,fg-alt)))
+ `(org-document-info-keyword ((,class ,@(modus-operandi-theme-mixed-fonts)
+ :foreground ,fg-alt)))
`(org-document-title ((,class :inherit (bold ,modus-theme-variable-pitch)
:foreground ,fg-special-cold
,@(modus-operandi-theme-scale
modus-operandi-theme-scale-5))))
- `(org-done ((,class ,@(modus-operandi-theme-org-todo-block green-nuanced-bg
green-nuanced green))))
- `(org-drawer ((,class :foreground ,cyan-alt)))
+ `(org-done ((,class :box ,bg-region :background ,bg-dim :foreground
,green)))
+ `(org-drawer ((,class ,@(modus-operandi-theme-mixed-fonts)
+ :foreground ,cyan)))
`(org-ellipsis ((,class :foreground nil))) ; inherits from the heading's
colour
- `(org-footnote ((,class :foreground ,blue-alt :underline t)))
- `(org-formula ((,class :inherit fixed-pitch :foreground ,red-alt)))
+ `(org-footnote ((,class :inherit button :foreground ,blue-alt)))
+ `(org-formula ((,class ,@(modus-operandi-theme-mixed-fonts)
+ :foreground ,red-alt)))
`(org-habit-alert-face ((,class :inherit modus-theme-intense-yellow)))
`(org-habit-alert-future-face ((,class :inherit modus-theme-refine-yellow)))
`(org-habit-clear-face ((,class :inherit modus-theme-intense-magenta)))
@@ -3212,69 +3642,48 @@ Also bind `class' to ((class color) (min-colors 89))."
`(org-habit-overdue-future-face ((,class :inherit modus-theme-refine-red)))
`(org-habit-ready-face ((,class :inherit modus-theme-intense-blue)))
`(org-habit-ready-future-face ((,class :inherit modus-theme-refine-blue)))
- `(org-headline-done ((,class :foreground ,green-nuanced
- ,@(modus-operandi-theme-heading-block
- green-nuanced-bg green-nuanced))))
+ `(org-headline-done ((,class :inherit ,modus-theme-variable-pitch
:foreground ,green-nuanced)))
+ `(org-headline-todo ((,class :inherit ,modus-theme-variable-pitch
:foreground ,red-nuanced)))
`(org-hide ((,class :foreground ,bg-main)))
`(org-indent ((,class :inherit (fixed-pitch org-hide))))
`(org-latex-and-related ((,class :foreground ,magenta-refine-fg)))
- `(org-level-1 ((,class :inherit (bold ,modus-theme-variable-pitch)
- ,@(modus-operandi-theme-heading-foreground fg-main
magenta-alt-other)
- ,@(modus-operandi-theme-scale
modus-operandi-theme-scale-4)
- ,@(modus-operandi-theme-heading-block
magenta-nuanced-bg magenta-nuanced))))
- `(org-level-2 ((,class :inherit (bold ,modus-theme-variable-pitch)
- ,@(modus-operandi-theme-heading-foreground
fg-special-warm magenta-alt)
- ,@(modus-operandi-theme-scale
modus-operandi-theme-scale-3)
- ,@(modus-operandi-theme-heading-block red-nuanced-bg
red-nuanced))))
- `(org-level-3 ((,class :inherit (bold ,modus-theme-variable-pitch)
- ,@(modus-operandi-theme-heading-foreground
fg-special-cold blue)
- ,@(modus-operandi-theme-scale
modus-operandi-theme-scale-2)
- ,@(modus-operandi-theme-heading-block
blue-nuanced-bg blue-nuanced))))
- `(org-level-4 ((,class :inherit (bold ,modus-theme-variable-pitch)
- ,@(modus-operandi-theme-heading-foreground
fg-special-mild cyan)
- ,@(modus-operandi-theme-scale
modus-operandi-theme-scale-1)
- ,@(modus-operandi-theme-heading-block
cyan-nuanced-bg cyan-nuanced))))
- `(org-level-5 ((,class :inherit (bold ,modus-theme-variable-pitch)
- ,@(modus-operandi-theme-heading-foreground
fg-special-calm green-alt-other)
- ,@(modus-operandi-theme-heading-block
green-nuanced-bg green-nuanced))))
- `(org-level-6 ((,class :inherit (bold ,modus-theme-variable-pitch)
- ,@(modus-operandi-theme-heading-foreground
yellow-nuanced yellow-alt-other)
- ,@(modus-operandi-theme-heading-block
yellow-nuanced-bg yellow-nuanced))))
- `(org-level-7 ((,class :inherit (bold ,modus-theme-variable-pitch)
- ,@(modus-operandi-theme-heading-foreground
red-nuanced red-alt)
- ,@(modus-operandi-theme-heading-block red-nuanced-bg
red-nuanced))))
- `(org-level-8 ((,class :inherit (bold ,modus-theme-variable-pitch)
- ,@(modus-operandi-theme-heading-foreground fg-dim
magenta)
- ,@(modus-operandi-theme-heading-block bg-alt
fg-alt))))
+ `(org-level-1 ((,class :inherit modus-theme-heading-1)))
+ `(org-level-2 ((,class :inherit modus-theme-heading-2)))
+ `(org-level-3 ((,class :inherit modus-theme-heading-3)))
+ `(org-level-4 ((,class :inherit modus-theme-heading-4)))
+ `(org-level-5 ((,class :inherit modus-theme-heading-5)))
+ `(org-level-6 ((,class :inherit modus-theme-heading-6)))
+ `(org-level-7 ((,class :inherit modus-theme-heading-7)))
+ `(org-level-8 ((,class :inherit modus-theme-heading-8)))
`(org-link ((,class :inherit link)))
`(org-list-dt ((,class :inherit bold)))
- `(org-macro ((,class :inherit org-latex-and-related)))
- `(org-meta-line ((,class :inherit fixed-pitch :background ,cyan-nuanced-bg
:foreground ,cyan-nuanced)))
+ `(org-macro ((,class :background ,blue-nuanced-bg :foreground
,magenta-alt-other)))
+ `(org-meta-line ((,class ,@(modus-operandi-theme-mixed-fonts) :foreground
,fg-alt)))
`(org-mode-line-clock ((,class :foreground ,fg-main)))
`(org-mode-line-clock-overrun ((,class :inherit modus-theme-active-red)))
- `(org-priority ((,class ,@(modus-operandi-theme-org-todo-block
magenta-nuanced-bg magenta-nuanced magenta)
- ,@(modus-operandi-theme-heading-foreground magenta
magenta-alt-other))))
- `(org-quote ((,class ,@(if modus-operandi-theme-org-blocks
- (append
- (and (>= emacs-major-version 27) '(:extend t))
- (list :background bg-dim))
- (list :background nil))
- :foreground ,fg-special-calm :slant
,modus-theme-slant)))
+ `(org-priority ((,class :box ,bg-region :background ,bg-dim :foreground
,magenta)))
+ `(org-property-value ((,class ,@(modus-operandi-theme-mixed-fonts)
+ :foreground ,cyan-alt-other)))
+ `(org-quote ((,class ,@(modus-operandi-theme-org-block bg-dim)
+ :foreground ,fg-special-cold :slant
,modus-theme-slant)))
`(org-scheduled ((,class :foreground ,fg-special-warm)))
`(org-scheduled-previously ((,class :foreground ,yellow-alt-other)))
`(org-scheduled-today ((,class :foreground ,magenta-alt-other)))
`(org-sexp-date ((,class :inherit org-date)))
- `(org-special-keyword ((,class ,@(modus-operandi-theme-org-todo-block
cyan-nuanced-bg cyan-nuanced cyan-alt))))
- `(org-table ((,class :inherit fixed-pitch :foreground ,fg-special-cold)))
- `(org-tag ((,class ,@(modus-operandi-theme-bold-weight) :foreground
,magenta-nuanced)))
+ `(org-special-keyword ((,class ,@(modus-operandi-theme-mixed-fonts)
+ :foreground ,blue-nuanced)))
+ `(org-table ((,class ,@(modus-operandi-theme-mixed-fonts)
+ :foreground ,fg-special-cold)))
+ `(org-table-header ((,class :inherit (fixed-pitch
modus-theme-intense-neutral))))
+ `(org-tag ((,class :foreground ,magenta-nuanced)))
`(org-tag-group ((,class :inherit bold :foreground ,cyan-nuanced)))
`(org-target ((,class :underline t)))
`(org-time-grid ((,class :foreground ,fg-unfocused)))
- `(org-todo ((,class ,@(modus-operandi-theme-org-todo-block red-nuanced-bg
red-nuanced red-alt)
- ,@(modus-operandi-theme-heading-foreground red-alt
red))))
+ `(org-todo ((,class :box ,bg-region :background ,bg-dim :foreground
,red-alt)))
`(org-upcoming-deadline ((,class :foreground ,red-alt-other)))
`(org-upcoming-distant-deadline ((,class :foreground ,red-nuanced)))
- `(org-verbatim ((,class :inherit fixed-pitch :background ,bg-alt
:foreground ,fg-special-calm)))
+ `(org-verbatim ((,class ,@(modus-operandi-theme-mixed-fonts)
+ :background ,bg-alt :foreground ,fg-special-calm)))
`(org-verse ((,class :inherit org-quote)))
`(org-warning ((,class :inherit bold :foreground ,red-alt-other)))
;;;;; org-journal
@@ -3291,8 +3700,11 @@ Also bind `class' to ((class color) (min-colors 89))."
;;;;; org-recur
`(org-recur ((,class :foreground ,magenta-active)))
;;;;; org-roam
- `(org-roam-link ((,class :foreground ,blue-alt-other :underline t)))
- `(org-roam-backlink ((,class :foreground ,green-alt-other :underline t)))
+ `(org-roam-link ((,class :inherit button :foreground ,green)))
+ `(org-roam-link-current ((,class :inherit button :foreground ,green-alt)))
+ `(org-roam-link-invalid ((,class :inherit button :foreground ,red)))
+ `(org-roam-link-shielded ((,class :inherit button :foreground ,yellow)))
+ `(org-roam-tag ((,class :foreground ,fg-alt :slant italic)))
;;;;; org-superstar
`(org-superstar-item ((,class :foreground ,fg-main)))
`(org-superstar-leading ((,class :foreground ,fg-whitespace)))
@@ -3305,37 +3717,16 @@ Also bind `class' to ((class color) (min-colors 89))."
`(origami-fold-header-face ((,class :background ,bg-dim :foreground ,fg-dim
:box t)))
`(origami-fold-replacement-face ((,class :background ,bg-alt :foreground
,fg-alt)))
;;;;; outline-mode
- `(outline-1 ((,class :inherit (bold ,modus-theme-variable-pitch)
- ,@(modus-operandi-theme-heading-foreground fg-main
magenta-alt-other)
- ,@(modus-operandi-theme-scale
modus-operandi-theme-scale-4)
- ,@(modus-operandi-theme-heading-block
magenta-nuanced-bg magenta-nuanced))))
- `(outline-2 ((,class :inherit (bold ,modus-theme-variable-pitch)
- ,@(modus-operandi-theme-heading-foreground
fg-special-warm magenta-alt)
- ,@(modus-operandi-theme-scale
modus-operandi-theme-scale-3)
- ,@(modus-operandi-theme-heading-block red-nuanced-bg
red-nuanced))))
- `(outline-3 ((,class :inherit (bold ,modus-theme-variable-pitch)
- ,@(modus-operandi-theme-heading-foreground
fg-special-cold blue)
- ,@(modus-operandi-theme-scale
modus-operandi-theme-scale-2)
- ,@(modus-operandi-theme-heading-block blue-nuanced-bg
blue-nuanced))))
- `(outline-4 ((,class :inherit (bold ,modus-theme-variable-pitch)
- ,@(modus-operandi-theme-heading-foreground
fg-special-mild cyan)
- ,@(modus-operandi-theme-scale
modus-operandi-theme-scale-1)
- ,@(modus-operandi-theme-heading-block cyan-nuanced-bg
cyan-nuanced))))
- `(outline-5 ((,class :inherit (bold ,modus-theme-variable-pitch)
- ,@(modus-operandi-theme-heading-foreground
fg-special-calm green-alt-other)
- ,@(modus-operandi-theme-heading-block green-nuanced-bg
green-nuanced))))
- `(outline-6 ((,class :inherit (bold ,modus-theme-variable-pitch)
- ,@(modus-operandi-theme-heading-foreground
yellow-nuanced yellow-alt-other)
- ,@(modus-operandi-theme-heading-block
yellow-nuanced-bg yellow-nuanced))))
- `(outline-7 ((,class :inherit (bold ,modus-theme-variable-pitch)
- ,@(modus-operandi-theme-heading-foreground red-nuanced
red-alt)
- ,@(modus-operandi-theme-heading-block red-nuanced-bg
red-nuanced))))
- `(outline-8 ((,class :inherit (bold ,modus-theme-variable-pitch)
- ,@(modus-operandi-theme-heading-foreground fg-dim
magenta)
- ,@(modus-operandi-theme-heading-block bg-alt fg-alt))))
+ `(outline-1 ((,class :inherit modus-theme-heading-1)))
+ `(outline-2 ((,class :inherit modus-theme-heading-2)))
+ `(outline-3 ((,class :inherit modus-theme-heading-3)))
+ `(outline-4 ((,class :inherit modus-theme-heading-4)))
+ `(outline-5 ((,class :inherit modus-theme-heading-5)))
+ `(outline-6 ((,class :inherit modus-theme-heading-6)))
+ `(outline-7 ((,class :inherit modus-theme-heading-7)))
+ `(outline-8 ((,class :inherit modus-theme-heading-8)))
;;;;; outline-minor-faces
- `(outline-minor-0 ((,class ,@(unless modus-operandi-theme-section-headings
- (list :background cyan-nuanced-bg)))))
+ `(outline-minor-0 ((,class nil)))
;;;;; package (M-x list-packages)
`(package-description ((,class :foreground ,fg-special-cold)))
`(package-help-section-name ((,class :inherit bold :foreground
,magenta-alt-other)))
@@ -3423,6 +3814,23 @@ Also bind `class' to ((class color) (min-colors 89))."
`(prodigy-green-face ((,class :foreground ,green)))
`(prodigy-red-face ((,class :foreground ,red)))
`(prodigy-yellow-face ((,class :foreground ,yellow)))
+;;;;; racket-mode
+ `(racket-debug-break-face ((,class :inherit modus-theme-intense-red)))
+ `(racket-debug-locals-face ((,class :box (:line-width -1 :color nil)
+ :foreground ,green-alt-other)))
+ `(racket-debug-result-face ((,class :inherit bold :box (:line-width -1
:color nil)
+ :foreground ,green)))
+ `(racket-here-string-face ((,class :foreground ,blue-alt)))
+ `(racket-keyword-argument-face ((,class :foreground ,red-alt)))
+ `(racket-logger-config-face ((,class :foreground ,fg-alt :slant
,modus-theme-slant)))
+ `(racket-logger-debug-face ((,class :foreground ,blue-alt-other)))
+ `(racket-logger-info-face ((,class :foreground ,fg-lang-note)))
+ `(racket-logger-topic-face ((,class :foreground ,magenta :slant
,modus-theme-slant)))
+ `(racket-selfeval-face ((,class :foreground ,green-alt)))
+ `(racket-xp-error-face
+ ((,(append '((supports :underline (:style wave))) class)
+ :underline (:color ,fg-lang-error :style wave))
+ (,class :foreground ,fg-lang-error :underline t)))
;;;;; rainbow-blocks
`(rainbow-blocks-depth-1-face ((,class :foreground ,magenta-alt-other)))
`(rainbow-blocks-depth-2-face ((,class :foreground ,blue)))
@@ -3544,24 +3952,19 @@ Also bind `class' to ((class color) (min-colors 89))."
'modus-theme-nuanced-blue
blue-alt-other))))
;;;;; selectrum
- `(selectrum-current-candidate ((,class
,@(modus-operandi-theme-extra-completions
- 'modus-theme-refine-magenta
- 'modus-theme-intense-magenta
- 'modus-theme-nuanced-magenta
- magenta
- 'bold))))
- `(selectrum-primary-highlight ((,class
,@(modus-operandi-theme-extra-completions
- 'modus-theme-refine-blue
- 'modus-theme-intense-blue
- 'modus-theme-nuanced-blue
- blue
- 'bold))))
- `(selectrum-secondary-highlight ((,class
,@(modus-operandi-theme-extra-completions
- 'modus-theme-refine-cyan
- 'modus-theme-intense-cyan
- 'modus-theme-nuanced-cyan
- cyan
- 'bold))))
+ `(selectrum-current-candidate
+ ((,class :inherit bold :foreground ,fg-main :underline ,fg-main
+ :background ,@(pcase modus-operandi-theme-completions
+ ('opinionated (list bg-active))
+ (_ (list bg-inactive))))))
+ `(selectrum-primary-highlight ((,class :inherit bold
+
,@(modus-operandi-theme-standard-completions
+ magenta-alt magenta-nuanced-bg
+ magenta-refine-bg
magenta-refine-fg))))
+ `(selectrum-secondary-highlight ((,class :inherit bold
+
,@(modus-operandi-theme-standard-completions
+ cyan-alt-other cyan-nuanced-bg
+ cyan-refine-bg
cyan-refine-fg))))
;;;;; semantic
`(semantic-complete-inline-face ((,class :foreground ,fg-special-warm
:underline t)))
`(semantic-decoration-on-private-members-face ((,class :inherit
modus-theme-refine-cyan)))
@@ -3628,23 +4031,13 @@ Also bind `class' to ((class color) (min-colors 89))."
`(sp-wrap-overlay-opening-pair ((,class :inherit sp-pair-overlay-face)))
`(sp-wrap-tag-overlay-face ((,class :inherit sp-pair-overlay-face)))
;;;;; smerge
- `(smerge-base ((,class ,@(modus-operandi-theme-diffs
- bg-main yellow
- bg-diff-focus-changed fg-diff-focus-changed))))
- `(smerge-lower ((,class ,@(modus-operandi-theme-diffs
- bg-main green
- bg-diff-focus-added fg-diff-focus-added))))
+ `(smerge-base ((,class :inherit modus-theme-diff-changed)))
+ `(smerge-lower ((,class :inherit modus-theme-diff-added)))
`(smerge-markers ((,class :background ,bg-diff-neutral-2 :foreground
,fg-diff-neutral-2)))
- `(smerge-refined-added ((,class ,@(modus-operandi-theme-diffs
- bg-diff-added fg-diff-added
- bg-diff-refine-added
fg-diff-refine-added))))
+ `(smerge-refined-added ((,class :inherit modus-theme-diff-refine-added)))
`(smerge-refined-changed ((,class)))
- `(smerge-refined-removed ((,class ,@(modus-operandi-theme-diffs
- bg-diff-removed fg-diff-removed
- bg-diff-refine-removed
fg-diff-refine-removed))))
- `(smerge-upper ((,class ,@(modus-operandi-theme-diffs
- bg-main red
- bg-diff-focus-removed fg-diff-focus-removed))))
+ `(smerge-refined-removed ((,class :inherit
modus-theme-diff-refine-removed)))
+ `(smerge-upper ((,class :inherit modus-theme-diff-removed)))
;;;;; spaceline
`(spaceline-evil-emacs ((,class :inherit modus-theme-active-magenta)))
`(spaceline-evil-insert ((,class :inherit modus-theme-active-green)))
@@ -3804,7 +4197,7 @@ Also bind `class' to ((class color) (min-colors 89))."
`(trashed-mark ((,class :inherit modus-theme-mark-symbol)))
`(trashed-marked ((,class :inherit modus-theme-mark-alt)))
`(trashed-restored ((,class :inherit modus-theme-mark-sel)))
- `(trashed-symlink ((,class :foreground ,cyan-alt :underline t)))
+ `(trashed-symlink ((,class :inherit button :foreground ,cyan-alt)))
;;;;; treemacs
`(treemacs-directory-collapsed-face ((,class :foreground ,magenta-alt)))
`(treemacs-directory-face ((,class :inherit dired-directory)))
@@ -3870,39 +4263,33 @@ Also bind `class' to ((class color) (min-colors 89))."
`(tuareg-opam-pkg-variable-name-face ((,class
,@(modus-operandi-theme-syntax-foreground
cyan cyan-faint)
:slant ,modus-theme-slant)))
+;;;;; typescript
+ `(typescript-jsdoc-tag ((,class :foreground ,fg-special-mild :slant
,modus-theme-slant)))
+ `(typescript-jsdoc-type ((,class :foreground ,fg-special-calm :slant
,modus-theme-slant)))
+ `(typescript-jsdoc-value ((,class :foreground ,fg-special-cold :slant
,modus-theme-slant)))
;;;;; undo-tree
`(undo-tree-visualizer-active-branch-face ((,class :inherit bold
:foreground ,fg-main)))
`(undo-tree-visualizer-current-face ((,class :foreground ,blue-intense)))
`(undo-tree-visualizer-default-face ((,class :foreground ,fg-alt)))
`(undo-tree-visualizer-register-face ((,class :foreground
,magenta-intense)))
`(undo-tree-visualizer-unmodified-face ((,class :foreground
,green-intense)))
-;;;;; vc
- `(vc-conflict-state ((,class ,@(modus-operandi-theme-bold-weight)
:foreground ,red-active)))
- `(vc-edited-state ((,class :foreground ,fg-special-warm)))
+;;;;; vc (vc-hooks.el)
+ `(vc-conflict-state ((,class :foreground ,red-active :slant
,modus-theme-slant)))
+ `(vc-edited-state ((,class :foreground ,yellow-active)))
`(vc-locally-added-state ((,class :foreground ,cyan-active)))
- `(vc-locked-state ((,class ,@(modus-operandi-theme-bold-weight) :foreground
,magenta-active)))
- `(vc-missing-state ((,class ,@(modus-operandi-theme-bold-weight)
:foreground ,yellow-active)))
- `(vc-needs-update-state ((,class ,@(modus-operandi-theme-bold-weight)
:foreground ,fg-special-mild)))
+ `(vc-locked-state ((,class :foreground ,blue-active)))
+ `(vc-missing-state ((,class :foreground ,magenta-active :slant
,modus-theme-slant)))
+ `(vc-needs-update-state ((,class :foreground ,green-active :slant
,modus-theme-slant)))
`(vc-removed-state ((,class :foreground ,red-active)))
`(vc-state-base ((,class :foreground ,fg-active)))
`(vc-up-to-date-state ((,class :foreground ,fg-special-cold)))
;;;;; vdiff
- `(vdiff-addition-face ((,class ,@(modus-operandi-theme-diffs
- bg-main green
- bg-diff-focus-added
fg-diff-focus-added))))
- `(vdiff-change-face ((,class ,@(modus-operandi-theme-diffs
- bg-main yellow
- bg-diff-focus-changed
fg-diff-focus-changed))))
+ `(vdiff-addition-face ((,class :inherit modus-theme-diff-added)))
+ `(vdiff-change-face ((,class :inherit modus-theme-diff-changed)))
`(vdiff-closed-fold-face ((,class :background ,bg-diff-neutral-1
:foreground ,fg-diff-neutral-1)))
- `(vdiff-refine-added ((,class ,@(modus-operandi-theme-diffs
- bg-diff-added fg-diff-added
- bg-diff-refine-added
fg-diff-refine-added))))
- `(vdiff-refine-changed ((,class ,@(modus-operandi-theme-diffs
- bg-diff-changed fg-diff-changed
- bg-diff-refine-changed
fg-diff-refine-changed))))
- `(vdiff-subtraction-face ((,class ,@(modus-operandi-theme-diffs
- bg-main red
- bg-diff-focus-removed
fg-diff-focus-removed))))
+ `(vdiff-refine-added ((,class :inherit modus-theme-diff-refine-added)))
+ `(vdiff-refine-changed ((,class :inherit modus-theme-diff-refine-changed)))
+ `(vdiff-subtraction-face ((,class :inherit modus-theme-diff-removed)))
`(vdiff-target-face ((,class :inherit modus-theme-intense-blue)))
;;;;; vimish-fold
`(vimish-fold-fringe ((,class :foreground ,cyan-active)))
@@ -3925,7 +4312,7 @@ Also bind `class' to ((class color) (min-colors 89))."
`(vhl/default-face ((,class ,@(and (>= emacs-major-version 27) '(:extend t))
:background ,bg-alt :foreground ,blue-nuanced)))
;;;;; vterm
- `(vterm-color-black ((,class :background "black" :foreground "black")))
+ `(vterm-color-black ((,class :background "gray35" :foreground "gray35")))
`(vterm-color-blue ((,class :background ,blue :foreground ,blue)))
`(vterm-color-cyan ((,class :background ,cyan :foreground ,cyan)))
`(vterm-color-default ((,class :background ,bg-main :foreground ,fg-main)))
@@ -3934,7 +4321,7 @@ Also bind `class' to ((class color) (min-colors 89))."
`(vterm-color-magenta ((,class :background ,magenta :foreground ,magenta)))
`(vterm-color-red ((,class :background ,red :foreground ,red)))
`(vterm-color-underline ((,class :foreground ,fg-special-warm :underline
t)))
- `(vterm-color-white ((,class :background "white" :foreground "white")))
+ `(vterm-color-white ((,class :background "gray65" :foreground "gray65")))
`(vterm-color-yellow ((,class :background ,yellow :foreground ,yellow)))
;;;;; wcheck-mode
`(wcheck-default-face ((,class :foreground ,red :underline t)))
@@ -4135,7 +4522,6 @@ Also bind `class' to ((class color) (min-colors 89))."
`(ztreep-node-count-children-face ((,class :foreground ,fg-special-warm)))
`(ztreep-node-face ((,class :foreground ,fg-main))))
;;;; Emacs 27+
- ;; EXPERIMENTAL this form is subject to review
(when (>= emacs-major-version 27)
(custom-theme-set-faces
'modus-operandi
@@ -4143,8 +4529,12 @@ Also bind `class' to ((class color) (min-colors 89))."
;; NOTE that this is specifically for the faces that were
;; introduced in Emacs 27, as the other faces are already
;; supported.
- `(line-number-major-tick ((,class (:background ,yellow-nuanced-bg
:foreground ,yellow-nuanced))))
- `(line-number-minor-tick ((,class (:background ,cyan-nuanced-bg
:foreground ,cyan-nuanced))))
+ `(line-number-major-tick ((,class :inherit (bold default)
+ :background ,yellow-nuanced-bg
+ :foreground ,yellow-nuanced)))
+ `(line-number-minor-tick ((,class :inherit (bold default)
+ :background ,bg-inactive
+ :foreground ,fg-inactive)))
;;;;; tab-bar-mode
`(tab-bar ((,class :background ,bg-tab-bar :foreground ,fg-main)))
`(tab-bar-tab ((,class :inherit bold :box (:line-width 2 :color
,bg-tab-active)
@@ -4160,12 +4550,22 @@ Also bind `class' to ((class color) (min-colors 89))."
`(tab-line-tab-current ((,class :inherit tab-line-tab)))
`(tab-line-tab-inactive ((,class :box (:line-width 2 :color
,bg-tab-inactive)
:background ,bg-tab-inactive :foreground
,fg-dim)))))
+;;;; Emacs 28+
+ (when (>= emacs-major-version 28)
+ (custom-theme-set-faces
+ 'modus-operandi
+;;;;; isearch regexp groups
+ `(isearch-group-1 ((,class :inherit modus-theme-intense-blue)))
+ `(isearch-group-2 ((,class :inherit modus-theme-intense-magenta)))))
;;; variables
(custom-theme-set-variables
'modus-operandi
;;;; ansi-colors
`(ansi-color-faces-vector [default bold shadow italic underline success
warning error])
`(ansi-color-names-vector [,fg-main ,red ,green ,yellow ,blue ,magenta
,cyan ,bg-main])
+;;;; awesome-tray
+ `(awesome-tray-mode-line-active-color ,blue)
+ `(awesome-tray-mode-line-inactive-color ,bg-active)
;;;; flymake fringe indicators
`(flymake-error-bitmap '(flymake-double-exclamation-mark
modus-theme-fringe-red))
`(flymake-warning-bitmap '(exclamation-mark modus-theme-fringe-yellow))
@@ -4174,7 +4574,7 @@ Also bind `class' to ((class color) (min-colors 89))."
`(ibuffer-deletion-face 'modus-theme-mark-del)
`(ibuffer-filter-group-name-face 'modus-theme-mark-symbol)
`(ibuffer-marked-face 'modus-theme-mark-sel)
- `(ibuffer-title-face 'modus-theme-header)
+ `(ibuffer-title-face 'modus-theme-pseudo-header)
;;;; highlight-tail
`(highlight-tail-colors
'((,green-subtle-bg . 0)
diff --git a/etc/themes/modus-vivendi-theme.el
b/etc/themes/modus-vivendi-theme.el
index fa1b6be..d45c3ca 100644
--- a/etc/themes/modus-vivendi-theme.el
+++ b/etc/themes/modus-vivendi-theme.el
@@ -1,10 +1,10 @@
;;; modus-vivendi-theme.el --- Accessible dark theme (WCAG AAA) -*-
lexical-binding:t -*-
-;; Copyright (c) 2019-2020 Free Software Foundation, Inc.
+;; Copyright (C) 2019-2020 Free Software Foundation, Inc.
;; Author: Protesilaos Stavrou <info@protesilaos.com>
;; URL: https://gitlab.com/protesilaos/modus-themes
-;; Version: 0.12.0
+;; Version: 0.13.0
;; Package-Requires: ((emacs "26.1"))
;; Keywords: faces, theme, accessibility
@@ -42,17 +42,18 @@
;; modus-vivendi-theme-slanted-constructs (boolean)
;; modus-vivendi-theme-bold-constructs (boolean)
;; modus-vivendi-theme-variable-pitch-headings (boolean)
-;; modus-vivendi-theme-rainbow-headings (boolean)
-;; modus-vivendi-theme-section-headings (boolean)
+;; modus-vivendi-theme-no-mixed-fonts (boolean)
+;; modus-vivendi-theme-headings (alist)
;; modus-vivendi-theme-scale-headings (boolean)
;; modus-vivendi-theme-fringes (choice)
;; modus-vivendi-theme-org-blocks (choice)
;; modus-vivendi-theme-prompts (choice)
-;; modus-vivendi-theme-3d-modeline (boolean)
-;; modus-vivendi-theme-subtle-diffs (boolean)
+;; modus-vivendi-theme-mode-line (choice)
+;; modus-vivendi-theme-diffs (choice)
;; modus-vivendi-theme-faint-syntax (boolean)
;; modus-vivendi-theme-intense-hl-line (boolean)
;; modus-vivendi-theme-intense-paren-match (boolean)
+;; modus-vivendi-theme-no-link-underline (boolean)
;; modus-vivendi-theme-completions (choice)
;; modus-vivendi-theme-override-colors-alist (alist)
;;
@@ -81,6 +82,8 @@
;; auctex and TeX
;; auto-dim-other-buffers
;; avy
+;; awesome-tray
+;; binder
;; bm
;; bongo
;; boon
@@ -103,6 +106,7 @@
;; counsel-notmuch
;; counsel-org-capture-string
;; cov
+;; cperl-mode
;; csv-mode
;; ctrlf
;; custom (M-x customize)
@@ -116,6 +120,7 @@
;; diff-hl
;; diff-mode
;; dim-autoload
+;; dir-treeview
;; dired
;; dired-async
;; dired-git
@@ -132,6 +137,7 @@
;; ediff
;; eglot
;; el-search
+;; eldoc
;; eldoc-box
;; elfeed
;; elfeed-score
@@ -146,6 +152,7 @@
;; eshell-fringe-status
;; eshell-git-prompt
;; eshell-prompt-extras (epe)
+;; eshell-syntax-highlighting
;; evil (evil-mode)
;; evil-goggles
;; evil-visual-mark-mode
@@ -153,6 +160,7 @@
;; eyebrowse
;; fancy-dabbrev
;; flycheck
+;; flycheck-color-mode-line
;; flycheck-indicator
;; flycheck-posframe
;; flymake
@@ -229,6 +237,7 @@
;; minimap
;; modeline
;; mood-line
+;; mpdel
;; mu4e
;; mu4e-conversation
;; multiple-cursors
@@ -237,6 +246,7 @@
;; notmuch
;; num3-mode
;; nxml-mode
+;; objed
;; orderless
;; org
;; org-journal
@@ -266,6 +276,7 @@
;; powerline-evil
;; proced
;; prodigy
+;; racket-mode
;; rainbow-blocks
;; rainbow-identifiers
;; rainbow-delimiters
@@ -308,6 +319,7 @@
;; treemacs
;; tty-menu
;; tuareg
+;; typescript
;; undo-tree
;; vc (built-in mode line status for version control)
;; vc-annotate (C-x v g)
@@ -411,11 +423,19 @@ between foreground and background is >= 7:1)."
(defface modus-theme-diff-focus-changed nil nil)
(defface modus-theme-diff-focus-removed nil nil)
(defface modus-theme-diff-heading nil nil)
-(defface modus-theme-header nil nil) ; Name is tentative
+(defface modus-theme-pseudo-header nil nil)
(defface modus-theme-mark-alt nil nil)
(defface modus-theme-mark-del nil nil)
(defface modus-theme-mark-sel nil nil)
(defface modus-theme-mark-symbol nil nil)
+(defface modus-theme-heading-1 nil nil)
+(defface modus-theme-heading-2 nil nil)
+(defface modus-theme-heading-3 nil nil)
+(defface modus-theme-heading-4 nil nil)
+(defface modus-theme-heading-5 nil nil)
+(defface modus-theme-heading-6 nil nil)
+(defface modus-theme-heading-7 nil nil)
+(defface modus-theme-heading-8 nil nil)
(defface modus-theme-hl-line nil nil)
;;; Customisation options
@@ -441,14 +461,125 @@ between foreground and background is >= 7:1)."
"Use proportional fonts (variable-pitch) in headings."
:type 'boolean)
+(defcustom modus-vivendi-theme-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."
+ :type 'boolean)
+
+(make-obsolete 'modus-vivendi-theme-rainbow-headings
+ 'modus-vivendi-theme-headings
+ "`modus-vivendi-theme' 0.13.0")
+
(defcustom modus-vivendi-theme-rainbow-headings nil
"Use more saturated colours for headings."
:type 'boolean)
+(make-obsolete 'modus-vivendi-theme-section-headings
+ 'modus-vivendi-theme-headings
+ "`modus-vivendi-theme' 0.13.0")
+
(defcustom modus-vivendi-theme-section-headings nil
"Use a background and an overline in headings."
:type 'boolean)
+(defcustom modus-vivendi-theme-headings
+ '((t . nil))
+ "Alist of styles for headings, with optional value per level.
+
+To control faces per level from 1-8, use something like this:
+
+ (setq modus-vivendi-theme-headings
+ '((1 . highlight)
+ (2 . line)
+ (t . rainbow-line-no-bold)))
+
+To set a uniform value for all heading levels, use this pattern:
+
+ (setq modus-vivendi-theme-headings
+ '((t . rainbow-line-no-bold)))
+
+The default uses a fairly desaturated foreground value in
+combination with a bold typographic weight. To specify this
+style for a given level N (assuming you wish to have another
+fallback option), just specify the value t like this:
+
+ (setq modus-vivendi-theme-headings
+ '((1 . t)
+ (2 . line)
+ (t . rainbow-line-no-bold)))
+
+A description of all possible values:
+
++ `no-bold' retains the default text colour while removing
+ the typographic weight.
+
++ `line' is the same as the default plus an overline over the
+ heading.
+
++ `line-no-bold' is the same as `line' without bold weight.
+
++ `rainbow' uses a more colourful foreground in combination
+ with bold weight.
+
++ `rainbow-line' is the same as `rainbow' plus an overline.
+
++ `rainbow-line-no-bold' is the same as `rainbow-line' without
+ the bold weight.
+
++ `highlight' retains the default style of a fairly desaturated
+ foreground combined with a bold weight and add to it a subtle
+ accented background.
+
++ `highlight-no-bold' is the same as `highlight' without a bold
+ weight.
+
++ `rainbow-highlight' is the same as `highlight' but with a more
+ colourful foreground.
+
++ `rainbow-highlight-no-bold' is the same as `rainbow-highlight'
+ without a bold weight.
+
++ `section' retains the default looks and adds to them both an
+ overline and a slightly accented background. It is, in effect,
+ a combination of the `line' and `highlight' values.
+
++ `section-no-bold' is the same as `section' without a bold
+ weight.
+
++ `rainbow-section' is the same as `section' but with a more
+ colourful foreground.
+
++ `rainbow-section-no-bold' is the same as `rainbow-section'
+ without a bold weight."
+ :type
+ '(alist
+ :key-type symbol
+ :value-type
+ (choice (const :tag "Fairly desaturated foreground with bold weight
(default)" t)
+ (const :tag "Like the default without bold weight" no-bold)
+ (const :tag "Like the default plus overline" line)
+ (const :tag "Like `line' without bold weight" line-no-bold)
+ (const :tag "Like the default but with more colourful foreground"
rainbow)
+ (const :tag "Like `rainbow' plus overline" rainbow-line)
+ (const :tag "Like `rainbow' without bold weight" rainbow-no-bold)
+ (const :tag "Like `rainbow-line' without bold weight"
rainbow-line-no-bold)
+ (const :tag "Like the default plus subtle background" highlight)
+ (const :tag "Like `highlight' without bold weight"
highlight-no-bold)
+ (const :tag "Like `highlight' with more colourful foreground"
rainbow-highlight)
+ (const :tag "Like `rainbow-highlight' without bold weight"
rainbow-highlight-no-bold)
+ (const :tag "Like `highlight' plus overline" section)
+ (const :tag "Like `section' without bold weight" section-no-bold)
+ (const :tag "Like `section' with more colourful foreground"
rainbow-section)
+ (const :tag "Like `rainbow-section' without bold weight"
rainbow-section-no-bold))))
+
(defcustom modus-vivendi-theme-scale-headings nil
"Use font scaling for headings."
:type 'boolean)
@@ -508,8 +639,9 @@ For more on the matter, read the documentation of
`set-face-attribute', specifically the ':height' section."
:type 'number)
-(define-obsolete-variable-alias 'modus-vivendi-theme-visible-fringes
- 'modus-vivendi-theme-fringes "`modus-vivendi-theme' 0.12.0")
+(make-obsolete 'modus-vivendi-theme-visible-fringes
+ 'modus-vivendi-theme-fringes
+ "`modus-vivendi-theme' 0.12.0")
(defcustom modus-vivendi-theme-visible-fringes nil
"Use a visible style for fringes."
@@ -527,15 +659,17 @@ pronounced greyscale value."
(const :tag "Subtle greyscale background" subtle)
(const :tag "Intense greyscale background" intense)))
-(define-obsolete-variable-alias 'modus-vivendi-theme-distinct-org-blocks
- 'modus-vivendi-theme-org-blocks "`modus-vivendi-theme' 0.11.0")
+(make-obsolete 'modus-vivendi-theme-distinct-org-blocks
+ 'modus-vivendi-theme-org-blocks
+ "`modus-vivendi-theme' 0.11.0")
(defcustom modus-vivendi-theme-distinct-org-blocks nil
"Use a distinct neutral background for `org-mode' blocks."
:type 'boolean)
-(define-obsolete-variable-alias 'modus-vivendi-theme-rainbow-org-src-blocks
- 'modus-vivendi-theme-org-blocks "`modus-vivendi-theme' 0.11.0")
+(make-obsolete 'modus-vivendi-theme-rainbow-org-src-blocks
+ 'modus-vivendi-theme-org-blocks
+ "`modus-vivendi-theme' 0.11.0")
(defcustom modus-vivendi-theme-rainbow-org-src-blocks nil
"Use colour-coded backgrounds for `org-mode' source blocks.
@@ -565,16 +699,69 @@ association list)."
(const :tag "Subtle grey block background" greyscale)
(const :tag "Colour-coded background per programming language"
rainbow)))
+(make-obsolete 'modus-vivendi-theme-3d-modeline
+ 'modus-vivendi-theme-mode-line
+ "`modus-vivendi-theme' 0.13.0")
+
(defcustom modus-vivendi-theme-3d-modeline nil
"Use a three-dimensional style for the active mode line."
:type 'boolean)
+(defcustom modus-vivendi-theme-mode-line nil
+ "Adjust the overall style of the mode line.
+
+Nil is a two-dimensional rectangle with a border around it. The
+active and the inactive modelines use different shades of
+greyscale values for the background and foreground.
+
+A `3d' value will apply a three-dimensional effect to the active
+modeline. The inactive modelines remain two-dimensional and are
+toned down a bit, relative to the nil value.
+
+The `moody' option is meant to optimise the modeline for use with
+the library of the same name. This practically means to remove
+the box effect and rely on underline and overline properties
+instead. It also tones down the inactive modelines. Despite its
+intended purpose, this option can also be used without the
+`moody' library."
+ :type '(choice
+ (const :tag "Two-dimensional box (default)" nil)
+ (const :tag "Three-dimensional style for the active mode line" 3d)
+ (const :tag "No box effects, which are optimal for use with the
`moody' library" moody)))
+
+(make-obsolete 'modus-vivendi-theme-subtle-diffs
+ 'modus-vivendi-theme-diffs
+ "`modus-vivendi-theme' 0.13.0")
+
(defcustom modus-vivendi-theme-subtle-diffs nil
"Use fewer/dim backgrounds in `diff-mode', `ediff',`magit'."
:type 'boolean)
-(define-obsolete-variable-alias
'modus-vivendi-theme-intense-standard-completions
- 'modus-vivendi-theme-completions "`modus-vivendi-theme' 0.12.0")
+(defcustom modus-vivendi-theme-diffs nil
+ "Adjust the overall styles of diffs.
+
+Nil means to use fairly intense colour combinations for diffs.
+For example, you get a rich green background with a green
+foreground for added lines. Word-wise or 'refined' diffs follow
+the same pattern but use different shades of those colours to
+remain distinct.
+
+A `desaturated' value follows the same principles as with the nil
+option, while it tones down all relevant colours.
+
+Option `fg-only' will remove all accented backgrounds, except
+from word-wise changes. It instead uses colour-coded foreground
+values to differentiate between added/removed/changed lines. If
+a background is necessary, such as with `ediff', then a subtle
+greyscale value is used."
+ :type '(choice
+ (const :tag "Intensely coloured backgrounds (default)" nil)
+ (const :tag "Slightly accented backgrounds with tinted text"
desaturated)
+ (const :tag "No backgrounds, except for refined diffs" fg-only)))
+
+(make-obsolete 'modus-vivendi-theme-intense-standard-completions
+ 'modus-vivendi-theme-completions
+ "`modus-vivendi-theme' 0.12.0")
(defcustom modus-vivendi-theme-intense-standard-completions nil
"Use prominent backgrounds for Icomplete, Ido, or similar."
@@ -582,6 +769,7 @@ association list)."
(defcustom modus-vivendi-theme-completions nil
"Apply special styles to the UI of completion frameworks.
+
This concerns Icomplete, Ivy, Helm, Selectrum, Ido, as well as
any other tool meant to enhance their experience. The effect
will vary depending on the completion framework.
@@ -621,7 +809,7 @@ effect than the former."
(const :tag "Intense background and foreground for the prompt"
intense)))
(defcustom modus-vivendi-theme-intense-hl-line nil
- "Use more prominent background for `hl-line-mode'."
+ "Use more prominent background for command `hl-line-mode'."
:type 'boolean)
(defcustom modus-vivendi-theme-intense-paren-match nil
@@ -632,6 +820,10 @@ effect than the former."
"Use less saturated colours for code syntax highlighting."
:type 'boolean)
+(defcustom modus-vivendi-theme-no-link-underline nil
+ "Do not underline links."
+ :type 'boolean)
+
;;; Internal functions
;; Helper functions that are meant to ease the implementation of the
@@ -641,6 +833,11 @@ effect than the former."
(when modus-vivendi-theme-bold-constructs
(list :inherit 'bold)))
+(defun modus-vivendi-theme-mixed-fonts ()
+ "Conditional application of `fixed-pitch' inheritance."
+ (unless modus-vivendi-theme-no-mixed-fonts
+ (list :inherit 'fixed-pitch)))
+
(defun modus-vivendi-theme-fringe (subtlebg intensebg)
"Conditional use of background colours for fringes.
SUBTLEBG should be a subtle greyscale value. INTENSEBG must be a
@@ -679,29 +876,65 @@ FAINT is the less saturated colour."
(list :foreground faint)
(list :foreground normal)))
-(defun modus-vivendi-theme-heading-foreground (subtle rainbow)
- "Apply foreground value to headings.
-SUBTLE is the default aesthetic. RAINBOW is the saturated one."
- (if modus-vivendi-theme-rainbow-headings
- (list :foreground rainbow)
- (list :foreground subtle)))
-
-(defun modus-vivendi-theme-heading-block (bg fg)
- "Conditionally extend heading styles.
-Apply BG to background and FG to overline."
- (if modus-vivendi-theme-section-headings
- (append
- (and (>= emacs-major-version 27) '(:extend t))
- (list :background bg :overline fg))
- (list :background nil :overline nil)))
+(defun modus-vivendi-theme-heading-p (key)
+ "Query style of KEY in `modus-vivendi-theme-headings'."
+ (cdr (assoc key modus-vivendi-theme-headings)))
+
+(defun modus-vivendi-theme-heading (level fg fg-alt bg border)
+ "Conditional styles for `modus-vivendi-theme-headings'.
-(defun modus-vivendi-theme-org-todo-block (bgbox fgbox fg)
- "Conditionally extend the styles of Org keywords.
-BGBOX applies to the background. FGBOX applies to the foreground
-and the border. FG is used when no block style is in effect."
- (if modus-vivendi-theme-section-headings
- (list :background bgbox :foreground fgbox :box (list :color fgbox))
- (list :foreground fg)))
+LEVEL is the heading's position in their order. FG is the
+default text colour. FG-ALT is an accented, more saturated value
+than the default. BG is a nuanced, typically accented,
+background that can work well with either of the foreground
+values. BORDER is a colour value that combines well with the
+background and alternative foreground."
+ (let* ((key (modus-vivendi-theme-heading-p `,level))
+ (style (or key (modus-vivendi-theme-heading-p t)))
+ (var (if modus-vivendi-theme-variable-pitch-headings
+ 'variable-pitch
+ 'default)))
+ (pcase style
+ ('no-bold
+ (list :inherit `,var :foreground fg))
+ ('line
+ (list :inherit `(bold ,var) :foreground fg :overline border))
+ ('line-no-bold
+ (list :inherit `,var :foreground fg :overline border))
+ ('rainbow
+ (list :inherit `(bold ,var) :foreground fg-alt))
+ ('rainbow-no-bold
+ (list :inherit `,var :foreground fg-alt))
+ ('rainbow-line
+ (list :inherit `(bold ,var) :foreground fg-alt :overline border))
+ ('rainbow-line-no-bold
+ (list :inherit `,var :foreground fg-alt :overline border))
+ ('highlight
+ (list :inherit `(bold ,var) :background bg :foreground fg))
+ ('highlight-no-bold
+ (list :inherit `,var :background bg :foreground fg))
+ ('rainbow-highlight
+ (list :inherit `(bold ,var) :background bg :foreground fg-alt))
+ ('rainbow-highlight-no-bold
+ (list :inherit `,var :background bg :foreground fg-alt))
+ ('section
+ (append
+ (and (>= emacs-major-version 27) '(:extend t))
+ (list :inherit `(bold ,var) :background bg :foreground fg :overline
border)))
+ ('section-no-bold
+ (append
+ (and (>= emacs-major-version 27) '(:extend t))
+ (list :inherit `,var :background bg :foreground fg :overline border)))
+ ('rainbow-section
+ (append
+ (and (>= emacs-major-version 27) '(:extend t))
+ (list :inherit `(bold ,var) :background bg :foreground fg-alt
:overline border)))
+ ('rainbow-section-no-bold
+ (append
+ (and (>= emacs-major-version 27) '(:extend t))
+ (list :inherit `,var :background bg :foreground fg-alt :overline
border)))
+ (_
+ (list :inherit `(bold ,var) :foreground fg)))))
(defun modus-vivendi-theme-org-block (bgblk)
"Conditionally set the background of Org blocks.
@@ -737,46 +970,64 @@ set to `rainbow'."
('rainbow (list :background bgaccent :foreground fgaccent))
(_ (list :background bg :foreground fg))))
-(defun modus-vivendi-theme-modeline-box (col3d col &optional btn int)
- "Control the box properties of the mode line.
-COL3D is the border that is intended for the three-dimensional
-modeline. COL applies to the two-dimensional modeline. Optional
-BTN provides the 3d button style. Optional INT defines a border
-width."
- (let* ((style (if btn 'released-button nil))
- (int (if int int 1)))
- (if modus-vivendi-theme-3d-modeline
- (list :line-width int :color col3d :style style)
- (list :line-width 1 :color col :style nil))))
-
-(defun modus-vivendi-theme-modeline-props (bg3d fg3d &optional bg fg)
- "Control the background and foreground of the mode line.
-BG is the modeline's background. FG is the modeline's
-foreground. BG3D and FG3D apply to the three-dimensional
-modeline style."
- (if modus-vivendi-theme-3d-modeline
- (list :background bg3d :foreground fg3d)
- (list :background bg :foreground fg)))
-
-(defun modus-vivendi-theme-diffs (subtle-bg subtle-fg intense-bg intense-fg)
- "Colour combinations for `modus-vivendi-theme-subtle-diffs'.
-
-SUBTLE-BG should be similar or the same as the main background.
-SUBTLE-FG should be an appropriate accent value. INTENSE-BG
-should be one of the dedicated backgrounds for diffs. INTENSE-FG
-should be one of the dedicated foregrounds for diffs"
- (if modus-vivendi-theme-subtle-diffs
- (list :background subtle-bg :foreground subtle-fg)
- (list :background intense-bg :foreground intense-fg)))
+(defun modus-vivendi-theme-mode-line-attrs
+ (fg bg fg-alt bg-alt border border-3d &optional alt-style border-width
fg-distant)
+ "Colour combinations for `modus-vivendi-theme-mode-line'.
+
+FG and BG are the default colours. FG-ALT and BG-ALT are meant
+to accommodate the options for a 3D modeline or a `moody'
+compliant one. BORDER applies to all permutations of the
+modeline, except the three-dimensional effect, where BORDER-3D is
+used instead.
+
+Optional ALT-STYLE applies an appropriate style to the mode
+line's box property.
+
+Optional BORDER-WIDTH specifies an integer for the width of the
+rectangle that produces the box effect.
+
+Optional FG-DISTANT should be close to the main background
+values. It is intended to be used as a distant-foreground
+property."
+ (pcase modus-vivendi-theme-mode-line
+ ('3d
+ `(:background ,bg-alt :foreground ,fg-alt
+ :box (:line-width ,(or border-width 1)
+ :color ,border-3d
+ :style ,(and alt-style
'released-button))))
+ ('moody
+ `(:background ,bg-alt :foreground ,fg-alt :underline ,border :overline
,border
+ :distant-foreground ,fg-distant))
+ (_
+ `(:foreground ,fg :background ,bg :box ,border))))
+
+(defun modus-vivendi-theme-diff (fg-only-bg fg-only-fg mainbg mainfg altbg
altfg)
+ "Colour combinations for `modus-vivendi-theme-diffs'.
+
+FG-ONLY-BG should be similar or the same as the main background.
+FG-ONLY-FG should be a saturated accent value that can be
+combined with the former.
+
+MAINBG must be one of the dedicated backgrounds for diffs while
+MAINFG must be the same for the foreground.
+
+ALTBG needs to be a slightly accented background that is meant to
+be combined with ALTFG. Both must be less intense than MAINBG
+and MAINFG respectively."
+ (pcase modus-vivendi-theme-diffs
+ ('fg-only (list :background fg-only-bg :foreground fg-only-fg))
+ ('desaturated (list :background altbg :foreground altfg))
+ (_ (list :background mainbg :foreground mainfg))))
(defun modus-vivendi-theme-standard-completions (mainfg subtlebg intensebg
intensefg)
"Combinations for `modus-vivendi-theme-completions'.
-These are intended for Icomplete, Ido, and related.
MAINFG is an accented foreground value. SUBTLEBG is an accented
background value that can be combined with MAINFG. INTENSEBG and
INTENSEFG are accented colours that are designed to be used in
-tandem."
+tandem.
+
+These are intended for Icomplete, Ido, and related."
(pcase modus-vivendi-theme-completions
('opinionated (list :background intensebg :foreground intensefg))
('moderate (list :background subtlebg :foreground mainfg))
@@ -784,7 +1035,6 @@ tandem."
(defun modus-vivendi-theme-extra-completions (subtleface intenseface altface
&optional altfg bold)
"Combinations for `modus-vivendi-theme-completions'.
-These are intended for Helm, Ivy, Selectrum, etc.
SUBTLEFACE and INTENSEFACE are custom theme faces that combine a
background and foreground value. The difference between the two
@@ -794,10 +1044,12 @@ ALTFACE is a combination of colours that represents a
departure
from the UI's default aesthetics. Optional ALTFG is meant to be
used in tandem with it.
-Optional BOLD will apply a heavier weight to the text."
+Optional BOLD will apply a heavier weight to the text.
+
+These are intended for Helm, Ivy, etc."
(pcase modus-vivendi-theme-completions
('opinionated (list :inherit (list altface bold)
- :foreground (if altfg altfg 'unspecified)))
+ :foreground (or altfg 'unspecified)))
('moderate (list :inherit (list subtleface bold)))
(_ (list :inherit (list intenseface bold)))))
@@ -826,8 +1078,8 @@ AMOUNT is a customisation option."
;; specifically for on/off states (e.g. `mode-line')
;;
;; must be combined with themselves
- ("bg-active" . "#2f2f2f") ("fg-active" . "#f5f5f5")
- ("bg-inactive" . "#202020") ("fg-inactive" . "#bebebe")
+ ("bg-active" . "#323232") ("fg-active" . "#f4f4f4")
+ ("bg-inactive" . "#1e1e1e") ("fg-inactive" . "#bfc0c4")
;; special base values, used only for cases where the above
;; fg-* or bg-* cannot or should not be used (to avoid confusion)
;; must be combined with: {fg,bg}-{main,alt,dim}
@@ -839,19 +1091,19 @@ AMOUNT is a customisation option."
;;
;; must be combined with: `bg-main', `bg-alt', `bg-dim'
("red" . "#ff8059") ("green" . "#44bc44")
- ("yellow" . "#eecc00") ("blue" . "#29aeff")
+ ("yellow" . "#eecc00") ("blue" . "#2fafff")
("magenta" . "#feacd0") ("cyan" . "#00d3d0")
;; styles for common, but still specialised constructs
;;
;; must be combined with: `bg-main', `bg-alt', `bg-dim'
("red-alt" . "#f4923b") ("green-alt" . "#80d200")
- ("yellow-alt" . "#cfdf30") ("blue-alt" . "#72a4ff")
+ ("yellow-alt" . "#cfdf30") ("blue-alt" . "#79a8ff")
("magenta-alt" . "#f78fe7") ("cyan-alt" . "#4ae8fc")
;; same purpose as above, just slight differences
;;
;; must be combined with: `bg-main', `bg-alt', `bg-dim'
("red-alt-other" . "#ff9977") ("green-alt-other" . "#00cd68")
- ("yellow-alt-other" . "#f0ce43") ("blue-alt-other" . "#00bdfa")
+ ("yellow-alt-other" . "#f0ce43") ("blue-alt-other" . "#00bcff")
("magenta-alt-other" . "#b6a0ff") ("cyan-alt-other" . "#6ae4b9")
;; styles for desaturated foreground text, intended for use with
;; the `modus-vivendi-theme-faint-syntax' option
@@ -915,21 +1167,24 @@ AMOUNT is a customisation option."
;; styles that are meant exclusively for the mode line
;;
;; must be combined with: `bg-active', `bg-inactive'
- ("red-active" . "#ffa49e") ("green-active" . "#70e030")
- ("yellow-active" . "#efdf00") ("blue-active" . "#00ccff")
- ("magenta-active" . "#d0acff") ("cyan-active" . "#00ddc0")
+ ("red-active" . "#ffa7ba") ("green-active" . "#70d73f")
+ ("yellow-active" . "#dbbe5f") ("blue-active" . "#34cfff")
+ ("magenta-active" . "#d5b1ff") ("cyan-active" . "#00d8b4")
;; styles that are meant exclusively for the fringes
;;
- ;; must have a minimum contrast ratio of 1.5:1 with `bg-inactive'
- ;; and be combined with `fg-main' or `fg-dim'
- ("red-fringe-bg" . "#8f0040") ("green-fringe-bg" . "#006000")
- ("yellow-fringe-bg" . "#6f4a00") ("blue-fringe-bg" . "#3a30ab")
- ("magenta-fringe-bg" . "#692089") ("cyan-fringe-bg" . "#0068a0")
+ ;; must be combined with `fg-main'
+ ("red-fringe-bg" . "#8f1f4b") ("green-fringe-bg" . "#006700")
+ ("yellow-fringe-bg" . "#6f4f00") ("blue-fringe-bg" . "#3f33af")
+ ("magenta-fringe-bg" . "#6f2f89") ("cyan-fringe-bg" . "#004f8f")
;; styles reserved for specific faces
;;
;; `bg-hl-line' is between `bg-dim' and `bg-alt', so it should
;; work with all accents that cover those two, plus `bg-main'
;;
+ ;; `bg-hl-alt' and `bg-hl-alt-intense' should only be used when no
+ ;; other greyscale or fairly neutral background is available to
+ ;; properly draw attention to a given construct
+ ;;
;; `bg-header' is between `bg-active' and `bg-inactive', so it
;; can be combined with any of the "active" values, plus the
;; "special" and base foreground colours
@@ -960,8 +1215,11 @@ AMOUNT is a customisation option."
;;
;; all pairs are combinable with themselves
("bg-hl-line" . "#151823")
+ ("bg-hl-line-intense" . "#2f2f2f")
+ ("bg-hl-alt" . "#181732")
+ ("bg-hl-alt-intense" . "#282e46")
("bg-paren-match" . "#5f362f")
- ("bg-paren-match-intense" . "#255650")
+ ("bg-paren-match-intense" . "#7416b5")
("bg-region" . "#3c3c3c")
("bg-tab-bar" . "#2c2c2c")
@@ -1094,12 +1352,12 @@ Also bind `class' to ((class color) (min-colors 89))."
`(modus-theme-nuanced-cyan ((,class :background ,cyan-nuanced-bg
,@(and (>= emacs-major-version 27)
'(:extend t)))))
;;;;; fringe-specific combinations
- `(modus-theme-fringe-red ((,class :background ,red-fringe-bg :foreground
,fg-dim)))
- `(modus-theme-fringe-green ((,class :background ,green-fringe-bg
:foreground ,fg-dim)))
- `(modus-theme-fringe-yellow ((,class :background ,yellow-fringe-bg
:foreground ,fg-dim)))
- `(modus-theme-fringe-blue ((,class :background ,blue-fringe-bg :foreground
,fg-dim)))
- `(modus-theme-fringe-magenta ((,class :background ,magenta-fringe-bg
:foreground ,fg-dim)))
- `(modus-theme-fringe-cyan ((,class :background ,cyan-fringe-bg :foreground
,fg-dim)))
+ `(modus-theme-fringe-red ((,class :background ,red-fringe-bg :foreground
,fg-main)))
+ `(modus-theme-fringe-green ((,class :background ,green-fringe-bg
:foreground ,fg-main)))
+ `(modus-theme-fringe-yellow ((,class :background ,yellow-fringe-bg
:foreground ,fg-main)))
+ `(modus-theme-fringe-blue ((,class :background ,blue-fringe-bg :foreground
,fg-main)))
+ `(modus-theme-fringe-magenta ((,class :background ,magenta-fringe-bg
:foreground ,fg-main)))
+ `(modus-theme-fringe-cyan ((,class :background ,cyan-fringe-bg :foreground
,fg-main)))
;;;;; special base values
;; these are closer to the grayscale than the accents defined above
;; and should only be used when the next closest alternative would be
@@ -1110,26 +1368,96 @@ Also bind `class' to ((class color) (min-colors 89))."
`(modus-theme-special-calm ((,class :background ,bg-special-calm
:foreground ,fg-special-calm)))
;;;;; diff-specific combinations
;; intended for `diff-mode' or equivalent
- `(modus-theme-diff-added ((,class :background ,bg-diff-added :foreground
,fg-diff-added)))
- `(modus-theme-diff-changed ((,class :background ,bg-diff-changed
:foreground ,fg-diff-changed)))
- `(modus-theme-diff-removed ((,class :background ,bg-diff-removed
:foreground ,fg-diff-removed)))
- `(modus-theme-diff-refine-added ((,class :background ,bg-diff-refine-added
:foreground ,fg-diff-refine-added)))
- `(modus-theme-diff-refine-changed ((,class :background
,bg-diff-refine-changed :foreground ,fg-diff-refine-changed)))
- `(modus-theme-diff-refine-removed ((,class :background
,bg-diff-refine-removed :foreground ,fg-diff-refine-removed)))
- `(modus-theme-diff-focus-added ((,class :background ,bg-diff-focus-added
:foreground ,fg-diff-focus-added)))
- `(modus-theme-diff-focus-changed ((,class :background
,bg-diff-focus-changed :foreground ,fg-diff-focus-changed)))
- `(modus-theme-diff-focus-removed ((,class :background
,bg-diff-focus-removed :foreground ,fg-diff-focus-removed)))
- `(modus-theme-diff-heading ((,class :background ,bg-diff-heading
:foreground ,fg-diff-heading)))
+ `(modus-theme-diff-added
+ ((,class ,@(modus-vivendi-theme-diff
+ bg-main green
+ bg-diff-focus-added fg-diff-focus-added
+ green-nuanced-bg fg-diff-added))))
+ `(modus-theme-diff-changed
+ ((,class ,@(modus-vivendi-theme-diff
+ bg-main yellow
+ bg-diff-focus-changed fg-diff-focus-changed
+ yellow-nuanced-bg fg-diff-changed))))
+ `(modus-theme-diff-removed
+ ((,class ,@(modus-vivendi-theme-diff
+ bg-main red
+ bg-diff-focus-removed fg-diff-focus-removed
+ red-nuanced-bg fg-diff-removed))))
+ `(modus-theme-diff-refine-added
+ ((,class ,@(modus-vivendi-theme-diff
+ bg-diff-added fg-diff-added
+ bg-diff-refine-added fg-diff-refine-added
+ bg-diff-focus-added fg-diff-focus-added))))
+ `(modus-theme-diff-refine-changed
+ ((,class ,@(modus-vivendi-theme-diff
+ bg-diff-changed fg-diff-changed
+ bg-diff-refine-changed fg-diff-refine-changed
+ bg-diff-focus-changed fg-diff-focus-changed))))
+ `(modus-theme-diff-refine-removed
+ ((,class ,@(modus-vivendi-theme-diff
+ bg-diff-removed fg-diff-removed
+ bg-diff-refine-removed fg-diff-refine-removed
+ bg-diff-focus-removed fg-diff-focus-removed))))
+ `(modus-theme-diff-focus-added
+ ((,class ,@(modus-vivendi-theme-diff
+ bg-dim green
+ bg-diff-focus-added fg-diff-focus-added
+ bg-diff-added fg-diff-added))))
+ `(modus-theme-diff-focus-changed
+ ((,class ,@(modus-vivendi-theme-diff
+ bg-dim yellow
+ bg-diff-focus-changed fg-diff-focus-changed
+ bg-diff-changed fg-diff-changed))))
+ `(modus-theme-diff-focus-removed
+ ((,class ,@(modus-vivendi-theme-diff
+ bg-dim red
+ bg-diff-focus-removed fg-diff-focus-removed
+ bg-diff-removed fg-diff-removed))))
+ `(modus-theme-diff-heading
+ ((,class ,@(modus-vivendi-theme-diff
+ bg-alt blue-alt
+ bg-diff-heading fg-diff-heading
+ blue-nuanced-bg blue))))
;;;;; mark indicators
;; colour combinations intended for Dired, Ibuffer, or equivalent
- `(modus-theme-header ((,class :inherit bold :foreground ,fg-main)))
+ `(modus-theme-pseudo-header ((,class :inherit bold :foreground ,fg-main)))
`(modus-theme-mark-alt ((,class :inherit bold :background ,bg-mark-alt
:foreground ,fg-mark-alt)))
`(modus-theme-mark-del ((,class :inherit bold :background ,bg-mark-del
:foreground ,fg-mark-del)))
`(modus-theme-mark-sel ((,class :inherit bold :background ,bg-mark-sel
:foreground ,fg-mark-sel)))
`(modus-theme-mark-symbol ((,class :inherit bold :foreground ,blue-alt)))
+;;;;; heading levels
+ ;; styles for regular headings used in Org, Markdown, Info, etc.
+ `(modus-theme-heading-1
+ ((,class ,@(modus-vivendi-theme-heading
+ 1 fg-main magenta-alt-other magenta-nuanced-bg bg-region)
+ ,@(modus-vivendi-theme-scale modus-vivendi-theme-scale-4))))
+ `(modus-theme-heading-2
+ ((,class ,@(modus-vivendi-theme-heading
+ 2 fg-special-warm magenta-alt red-nuanced-bg bg-region)
+ ,@(modus-vivendi-theme-scale modus-vivendi-theme-scale-3))))
+ `(modus-theme-heading-3
+ ((,class ,@(modus-vivendi-theme-heading
+ 3 fg-special-cold blue blue-nuanced-bg bg-region)
+ ,@(modus-vivendi-theme-scale modus-vivendi-theme-scale-2))))
+ `(modus-theme-heading-4
+ ((,class ,@(modus-vivendi-theme-heading
+ 4 fg-special-mild cyan cyan-nuanced-bg bg-region)
+ ,@(modus-vivendi-theme-scale modus-vivendi-theme-scale-1))))
+ `(modus-theme-heading-5
+ ((,class ,@(modus-vivendi-theme-heading
+ 5 fg-special-calm green-alt-other green-nuanced-bg
bg-region))))
+ `(modus-theme-heading-6
+ ((,class ,@(modus-vivendi-theme-heading
+ 6 yellow-nuanced yellow-alt-other yellow-nuanced-bg
bg-region))))
+ `(modus-theme-heading-7
+ ((,class ,@(modus-vivendi-theme-heading
+ 7 red-nuanced red-alt red-nuanced-bg bg-region))))
+ `(modus-theme-heading-8
+ ((,class ,@(modus-vivendi-theme-heading
+ 8 fg-dim magenta bg-alt bg-region))))
;;;;; other custom faces
`(modus-theme-hl-line ((,class :background ,(if
modus-vivendi-theme-intense-hl-line
- bg-active bg-hl-line)
+ bg-hl-line-intense
bg-hl-line)
(and (>= emacs-major-version 27) '(:extend
t)))))
;;;; standard faces
;;;;; absolute essentials
@@ -1149,26 +1477,25 @@ Also bind `class' to ((class color) (min-colors 89))."
`(bold ((,class :weight bold)))
`(comint-highlight-input ((,class :inherit bold)))
`(comint-highlight-prompt ((,class ,@(modus-vivendi-theme-bold-weight)
- ,@(modus-vivendi-theme-prompt cyan
-
blue-nuanced-bg
- blue-alt
-
blue-refine-bg
- fg-main))))
+ ,@(modus-vivendi-theme-prompt
+ cyan
+ blue-nuanced-bg blue-alt
+ blue-refine-bg fg-main))))
`(error ((,class :inherit bold :foreground ,red)))
`(escape-glyph ((,class :foreground ,fg-escape-char-construct)))
`(file-name-shadow ((,class :foreground ,fg-unfocused)))
`(header-line ((,class :background ,bg-header :foreground ,fg-header)))
`(header-line-highlight ((,class :inherit modus-theme-active-blue)))
+ `(help-argument-name ((,class :foreground ,cyan :slant ,modus-theme-slant)))
`(homoglyph ((,class :foreground ,fg-escape-char-construct)))
`(ibuffer-locked-buffer ((,class :foreground ,yellow-alt-other)))
`(italic ((,class :slant italic)))
`(nobreak-hyphen ((,class :foreground ,fg-escape-char-construct)))
`(nobreak-space ((,class :foreground ,fg-escape-char-construct :underline
t)))
- `(minibuffer-prompt ((,class ,@(modus-vivendi-theme-prompt cyan-alt-other
- cyan-nuanced-bg
- cyan
- cyan-refine-bg
- fg-main))))
+ `(minibuffer-prompt ((,class ,@(modus-vivendi-theme-prompt
+ cyan-alt-other
+ cyan-nuanced-bg cyan
+ cyan-refine-bg fg-main))))
`(mm-command-output ((,class :foreground ,red-alt-other)))
`(mm-uu-extract ((,class :background ,bg-dim :foreground ,fg-special-mild)))
`(next-error ((,class :inherit modus-theme-subtle-red)))
@@ -1180,9 +1507,11 @@ Also bind `class' to ((class color) (min-colors 89))."
`(trailing-whitespace ((,class :background ,red-intense-bg)))
`(warning ((,class :inherit bold :foreground ,yellow)))
;;;;; buttons, links, widgets
- `(button ((,class :foreground ,blue-alt-other :underline t)))
- `(link ((,class :foreground ,blue-alt-other :underline t)))
- `(link-visited ((,class :foreground ,magenta-alt-other :underline t)))
+ `(button ((,class :foreground ,blue-alt-other
+ ,@(unless modus-vivendi-theme-no-link-underline
+ (list :underline t)))))
+ `(link ((,class :inherit button)))
+ `(link-visited ((,class :inherit link :foreground ,magenta-alt-other)))
`(tooltip ((,class :background ,bg-special-cold :foreground ,fg-main)))
`(widget-button ((,class :inherit button)))
`(widget-button-pressed ((,class :inherit button :foreground ,magenta)))
@@ -1249,13 +1578,13 @@ Also bind `class' to ((class color) (min-colors 89))."
`(anzu-replace-highlight ((,class :inherit modus-theme-refine-yellow
:underline t)))
`(anzu-replace-to ((,class :inherit (modus-theme-intense-green bold))))
;;;;; apropos
- `(apropos-function-button ((,class :foreground ,magenta-alt-other
:underline t)))
+ `(apropos-function-button ((,class :inherit button :foreground
,magenta-alt-other)))
`(apropos-keybinding ((,class :inherit bold :foreground ,cyan)))
- `(apropos-misc-button ((,class :foreground ,cyan-alt-other :underline t)))
+ `(apropos-misc-button ((,class :inherit button :foreground
,cyan-alt-other)))
`(apropos-property ((,class ,@(modus-vivendi-theme-bold-weight) :foreground
,magenta-alt)))
- `(apropos-symbol ((,class ,@(modus-vivendi-theme-bold-weight) :foreground
,blue-nuanced :underline t)))
- `(apropos-user-option-button ((,class :foreground ,green-alt-other
:underline t)))
- `(apropos-variable-button ((,class :foreground ,blue :underline t)))
+ `(apropos-symbol ((,class ,@(modus-vivendi-theme-bold-weight) :foreground
,blue-alt-other)))
+ `(apropos-user-option-button ((,class :inherit button :foreground
,green-alt-other)))
+ `(apropos-variable-button ((,class :inherit button :foreground ,blue)))
;;;;; apt-sources-list
`(apt-sources-list-components ((,class :foreground ,cyan)))
`(apt-sources-list-options ((,class :foreground ,yellow)))
@@ -1310,6 +1639,24 @@ Also bind `class' to ((class color) (min-colors 89))."
`(aw-leading-char-face ((,class :inherit bold :height 1.5 :background
,bg-main :foreground ,red-intense)))
`(aw-minibuffer-leading-char-face ((,class :foreground ,magenta-active)))
`(aw-mode-line-face ((,class :inherit bold)))
+;;;;; awesome-tray
+ `(awesome-tray-module-awesome-tab-face ((,class :inherit bold :foreground
,red-alt-other)))
+ `(awesome-tray-module-battery-face ((,class :inherit bold :foreground
,cyan-alt-other)))
+ `(awesome-tray-module-buffer-name-face ((,class :inherit bold :foreground
,yellow-alt-other)))
+ `(awesome-tray-module-circe-face ((,class :inherit bold :foreground
,blue-alt)))
+ `(awesome-tray-module-date-face ((,class :inherit bold :foreground
,fg-dim)))
+ `(awesome-tray-module-evil-face ((,class :inherit bold :foreground
,green-alt)))
+ `(awesome-tray-module-git-face ((,class :inherit bold :foreground
,magenta)))
+ `(awesome-tray-module-last-command-face ((,class :inherit bold :foreground
,blue-alt-other)))
+ `(awesome-tray-module-location-face ((,class :inherit bold :foreground
,yellow)))
+ `(awesome-tray-module-mode-name-face ((,class :inherit bold :foreground
,green)))
+ `(awesome-tray-module-parent-dir-face ((,class :inherit bold :foreground
,cyan)))
+ `(awesome-tray-module-rvm-face ((,class :inherit bold :foreground
,magenta-alt-other)))
+;;;;; binder
+ `(binder-sidebar-highlight ((,class :inherit modus-theme-subtle-cyan)))
+ `(binder-sidebar-marked ((,class :inherit modus-theme-mark-sel)))
+ `(binder-sidebar-missing ((,class :inherit modus-theme-subtle-red)))
+ `(binder-sidebar-tags ((,class :foreground ,cyan)))
;;;;; bm
`(bm-face ((,class :inherit modus-theme-subtle-yellow
,@(and (>= emacs-major-version 27) '(:extend t)))))
@@ -1351,26 +1698,27 @@ Also bind `class' to ((class color) (min-colors 89))."
`(diary-time ((,class :foreground ,blue-alt)))
`(holiday ((,class :foreground ,magenta-alt)))
;;;;; calfw
- `(cfw:face-annotation ((,class :background ,bg-alt :foreground ,fg-alt)))
- `(cfw:face-day-title ((,class :background ,bg-alt :foreground ,fg-main)))
+ `(cfw:face-annotation ((,class :foreground ,fg-special-warm)))
+ `(cfw:face-day-title ((,class :foreground ,fg-main)))
`(cfw:face-default-content ((,class :foreground ,green-alt)))
`(cfw:face-default-day ((,class :inherit (cfw:face-day-title bold))))
- `(cfw:face-disable ((,class :background ,bg-inactive :foreground
,fg-inactive)))
- `(cfw:face-grid ((,class :foreground ,fg-inactive)))
- `(cfw:face-header ((,class :inherit bold ::foreground ,fg-main)))
- `(cfw:face-holiday ((,class :inherit bold :background ,bg-alt :foreground
,magenta)))
+ `(cfw:face-disable ((,class :foreground ,fg-unfocused)))
+ `(cfw:face-grid ((,class :foreground ,fg-window-divider-outer)))
+ `(cfw:face-header ((,class :inherit bold :foreground ,fg-main)))
+ `(cfw:face-holiday ((,class :foreground ,magenta-alt-other)))
`(cfw:face-periods ((,class :foreground ,cyan-alt-other)))
- `(cfw:face-saturday ((,class :inherit bold :background ,bg-alt :foreground
,magenta-alt)))
+ `(cfw:face-saturday ((,class :inherit bold :foreground ,cyan-alt-other)))
`(cfw:face-select ((,class :inherit modus-theme-intense-blue)))
- `(cfw:face-sunday ((,class :inherit bold :background ,bg-alt :foreground
,magenta-alt-other)))
+ `(cfw:face-sunday ((,class :inherit bold :foreground ,cyan-alt-other)))
`(cfw:face-title ((,class :inherit ,modus-theme-variable-pitch
- :foreground ,fg-special-warm
- ,@(modus-vivendi-theme-scale
modus-vivendi-theme-scale-4))))
- `(cfw:face-today ((,class :inherit bold :foreground ,blue)))
- `(cfw:face-today-title ((,class :inherit modus-theme-special-mild :box t)))
- `(cfw:face-toolbar ((,class :background ,bg-active :foreground ,bg-active)))
- `(cfw:face-toolbar-button-off ((,class :background ,bg-alt :foreground
,cyan)))
- `(cfw:face-toolbar-button-on ((,class :inherit bold :background ,bg-main
:foreground ,blue-intense)))
+ :foreground ,fg-special-cold
+ ,@(modus-vivendi-theme-scale
modus-vivendi-theme-scale-5))))
+ `(cfw:face-today ((,class :background ,bg-inactive)))
+ `(cfw:face-today-title ((,class :background ,bg-active)))
+ `(cfw:face-toolbar ((,class :background ,bg-alt :foreground ,bg-alt)))
+ `(cfw:face-toolbar-button-off ((,class :foreground ,fg-alt)))
+ `(cfw:face-toolbar-button-on ((,class :inherit bold :background
,blue-nuanced-bg
+ :foreground ,blue-alt)))
;;;;; centaur-tabs
`(centaur-tabs-active-bar-face ((,class :background ,fg-tab-active)))
`(centaur-tabs-close-mouse-face ((,class :inherit bold :foreground
,red-active :underline t)))
@@ -1392,8 +1740,8 @@ Also bind `class' to ((class color) (min-colors 89))."
`(change-log-function ((,class :foreground ,green-alt-other)))
`(change-log-list ((,class :foreground ,magenta-alt-other)))
`(change-log-name ((,class :foreground ,cyan)))
- `(log-edit-header ((,class :inherit bold :foreground ,green-alt-other)))
- `(log-edit-summary ((,class :foreground ,magenta-alt-other)))
+ `(log-edit-header ((,class :foreground ,fg-special-warm)))
+ `(log-edit-summary ((,class :inherit bold :foreground ,cyan)))
`(log-edit-unknown-header ((,class :foreground ,fg-alt)))
`(log-view-file ((,class :inherit bold :foreground ,fg-special-cold)))
`(log-view-message ((,class :foreground ,fg-alt)))
@@ -1437,7 +1785,7 @@ Also bind `class' to ((class color) (min-colors 89))."
`(circe-highlight-nick-face ((,class :inherit bold :foreground ,blue)))
`(circe-prompt-face ((,class :inherit bold :foreground ,cyan-alt-other)))
`(circe-server-face ((,class :foreground ,fg-unfocused)))
- `(lui-button-face ((,class :foreground ,blue :underline t)))
+ `(lui-button-face ((,class :inherit button :foreground ,blue)))
`(lui-highlight-face ((,class :foreground ,magenta-alt)))
`(lui-time-stamp-face ((,class :foreground ,blue-nuanced)))
;;;;; color-rg
@@ -1490,12 +1838,12 @@ Also bind `class' to ((class color) (min-colors 89))."
;;;;; completions
`(completions-annotations ((,class :foreground ,fg-special-cold :slant
,modus-theme-slant)))
`(completions-common-part ((,class
,@(modus-vivendi-theme-standard-completions
- cyan-alt-other cyan-nuanced-bg
- yellow-refine-bg yellow-refine-fg))))
+ blue-alt blue-nuanced-bg
+ cyan-refine-bg cyan-refine-fg))))
`(completions-first-difference ((,class :inherit bold
,@(modus-vivendi-theme-standard-completions
- blue-alt-other blue-nuanced-bg
- cyan-subtle-bg fg-dim))))
+ magenta-alt blue-nuanced-bg
+ magenta-intense-bg fg-main))))
;;;;; counsel
`(counsel-active-mode ((,class :foreground ,magenta-alt-other)))
`(counsel-application-name ((,class :foreground ,red-alt-other)))
@@ -1531,6 +1879,10 @@ Also bind `class' to ((class color) (min-colors 89))."
`(cov-light-face ((,class :foreground ,blue-intense)))
`(cov-med-face ((,class :foreground ,yellow-intense)))
`(cov-none-face ((,class :foreground ,cyan-intense)))
+;;;;; cperl-mode
+ `(cperl-nonoverridable-face ((,class :foreground ,yellow-alt-other)))
+ `(cperl-array-face ((,class :inherit bold :background ,bg-alt :foreground
,magenta-alt)))
+ `(cperl-hash-face ((,class :inherit bold :background ,bg-alt :foreground
,red-alt :slant ,modus-theme-slant)))
;;;;; csv-mode
`(csv-separator-face ((,class :background ,bg-special-cold :foreground
,fg-main)))
;;;;; ctrlf
@@ -1609,7 +1961,7 @@ Also bind `class' to ((class color) (min-colors 89))."
`(deft-title-face ((,class :inherit bold :foreground ,fg-main)))
;;;;; dictionary
`(dictionary-button-face ((,class :inherit bold :foreground
,fg-special-cold)))
- `(dictionary-reference-face ((,class :foreground ,blue-alt-other :underline
t)))
+ `(dictionary-reference-face ((,class :inherit button :foreground
,blue-alt-other)))
`(dictionary-word-definition-face ((,class :foreground ,fg-main)))
`(dictionary-word-entry-face ((,class :foreground ,fg-special-cold :slant
,modus-theme-slant)))
;;;;; diff-hl
@@ -1623,47 +1975,54 @@ Also bind `class' to ((class color) (min-colors 89))."
`(diff-hl-insert ((,class :inherit modus-theme-fringe-green)))
`(diff-hl-reverted-hunk-highlight ((,class :inherit
(modus-theme-active-magenta bold))))
;;;;; diff-mode
- `(diff-added ((,class ,@(modus-vivendi-theme-diffs
- bg-main green
- bg-diff-focus-added fg-diff-focus-added))))
- `(diff-changed ((,class ,@(modus-vivendi-theme-diffs
- bg-main yellow
- bg-diff-focus-changed fg-diff-focus-changed))))
+ `(diff-added ((,class :inherit modus-theme-diff-added)))
+ `(diff-changed ((,class :inherit modus-theme-diff-changed)))
`(diff-context ((,class :foreground ,fg-unfocused)))
`(diff-file-header ((,class :inherit bold :foreground ,blue)))
`(diff-function ((,class :foreground ,fg-special-cold)))
`(diff-header ((,class :foreground ,blue-nuanced)))
- `(diff-hunk-header ((,class ,@(modus-vivendi-theme-diffs
- bg-alt blue-alt
- bg-diff-heading fg-diff-heading))))
+ `(diff-hunk-header ((,class :inherit modus-theme-diff-heading)))
`(diff-index ((,class :inherit bold :foreground ,blue-alt)))
`(diff-indicator-added ((,class :inherit diff-added)))
`(diff-indicator-changed ((,class :inherit diff-changed)))
`(diff-indicator-removed ((,class :inherit diff-removed)))
`(diff-nonexistent ((,class :inherit (modus-theme-neutral bold))))
- `(diff-refine-added ((,class ,@(modus-vivendi-theme-diffs
- bg-diff-added fg-diff-added
- bg-diff-refine-added
fg-diff-refine-added))))
- `(diff-refine-changed ((,class ,@(modus-vivendi-theme-diffs
- bg-diff-changed fg-diff-changed
- bg-diff-refine-changed
fg-diff-refine-changed))))
- `(diff-refine-removed ((,class ,@(modus-vivendi-theme-diffs
- bg-diff-removed fg-diff-removed
- bg-diff-refine-removed
fg-diff-refine-removed))))
- `(diff-removed ((,class ,@(modus-vivendi-theme-diffs
- bg-main red
- bg-diff-focus-removed fg-diff-focus-removed))))
+ `(diff-refine-added ((,class :inherit modus-theme-diff-refine-added)))
+ `(diff-refine-changed ((,class :inherit modus-theme-diff-refine-changed)))
+ `(diff-refine-removed ((,class :inherit modus-theme-diff-refine-removed)))
+ `(diff-removed ((,class :inherit modus-theme-diff-removed)))
;;;;; dim-autoload
`(dim-autoload-cookie-line ((,class :foreground ,fg-alt :slant
,modus-theme-slant)))
+;;;;; dir-treeview
+ `(dir-treeview-archive-face ((,class :foreground ,fg-special-warm)))
+ `(dir-treeview-archive-icon-face ((,class :inherit
dir-treeview-default-icon-face :foreground ,yellow)))
+ `(dir-treeview-audio-face ((,class :foreground ,magenta)))
+ `(dir-treeview-audio-icon-face ((,class :inherit
dir-treeview-default-icon-face :foreground ,magenta-alt)))
+ `(dir-treeview-control-face ((,class :foreground ,fg-alt)))
+ `(dir-treeview-control-mouse-face ((,class :inherit highlight)))
+ `(dir-treeview-default-icon-face ((,class :inherit bold :family "Font
Awesome" :foreground ,fg-alt)))
+ `(dir-treeview-default-filename-face ((,class :foreground ,fg-main)))
+ `(dir-treeview-directory-face ((,class :foreground ,blue)))
+ `(dir-treeview-directory-icon-face ((,class :inherit
dir-treeview-default-icon-face :foreground ,blue-alt)))
+ `(dir-treeview-executable-face ((,class :foreground ,red-alt)))
+ `(dir-treeview-executable-icon-face ((,class :inherit
dir-treeview-default-icon-face :foreground ,red-alt-other)))
+ `(dir-treeview-image-face ((,class :foreground ,green-alt-other)))
+ `(dir-treeview-image-icon-face ((,class :inherit
dir-treeview-default-icon-face :foreground ,green-alt)))
+ `(dir-treeview-indent-face ((,class :foreground ,fg-alt)))
+ `(dir-treeview-label-mouse-face ((,class :inherit highlight)))
+ `(dir-treeview-start-dir-face ((,class :inherit modus-theme-pseudo-header)))
+ `(dir-treeview-symlink-face ((,class :inherit button :foreground ,cyan)))
+ `(dir-treeview-video-face ((,class :foreground ,magenta-alt-other)))
+ `(dir-treeview-video-icon-face ((,class :inherit
dir-treeview-default-icon-face :foreground ,magenta-alt-other)))
;;;;; dired
`(dired-directory ((,class :foreground ,blue)))
`(dired-flagged ((,class :inherit modus-theme-mark-del)))
- `(dired-header ((,class :inherit modus-theme-header)))
+ `(dired-header ((,class :inherit modus-theme-pseudo-header)))
`(dired-ignored ((,class :foreground ,fg-alt)))
`(dired-mark ((,class :inherit modus-theme-mark-symbol)))
`(dired-marked ((,class :inherit modus-theme-mark-sel)))
`(dired-perm-write ((,class :foreground ,fg-special-warm)))
- `(dired-symlink ((,class :foreground ,cyan-alt :underline t)))
+ `(dired-symlink ((,class :inherit button :foreground ,cyan-alt)))
`(dired-warning ((,class :inherit bold :foreground ,yellow)))
;;;;; dired-async
`(dired-async-failures ((,class ,@(modus-vivendi-theme-bold-weight)
:foreground ,red-active)))
@@ -1688,43 +2047,44 @@ Also bind `class' to ((class color) (min-colors 89))."
`(dired-subtree-depth-6-face ((,class :background nil)))
;;;;; diredfl
`(diredfl-autofile-name ((,class :inherit modus-theme-special-cold)))
- `(diredfl-compressed-file-name ((,class :foreground ,green-alt-other)))
- `(diredfl-compressed-file-suffix ((,class :foreground ,green-alt)))
- `(diredfl-date-time ((,class :foreground ,fg-special-cold)))
+ `(diredfl-compressed-file-name ((,class :foreground ,fg-special-warm)))
+ `(diredfl-compressed-file-suffix ((,class :foreground ,red-alt)))
+ `(diredfl-date-time ((,class :foreground ,cyan-alt-other)))
`(diredfl-deletion ((,class :inherit modus-theme-mark-del)))
`(diredfl-deletion-file-name ((,class :inherit modus-theme-mark-del)))
- `(diredfl-dir-heading ((,class :inherit modus-theme-header)))
+ `(diredfl-dir-heading ((,class :inherit modus-theme-pseudo-header)))
`(diredfl-dir-name ((,class :inherit dired-directory)))
- `(diredfl-dir-priv ((,class :foreground ,blue)))
- `(diredfl-exec-priv ((,class :foreground ,red-alt-other)))
- `(diredfl-executable-tag ((,class :foreground ,red-alt)))
+ `(diredfl-dir-priv ((,class :foreground ,blue-alt)))
+ `(diredfl-exec-priv ((,class :foreground ,magenta)))
+ `(diredfl-executable-tag ((,class :foreground ,magenta-alt)))
`(diredfl-file-name ((,class :foreground ,fg-main)))
- `(diredfl-file-suffix ((,class :foreground ,fg-special-warm)))
+ `(diredfl-file-suffix ((,class :foreground ,cyan)))
`(diredfl-flag-mark ((,class :inherit modus-theme-mark-sel)))
`(diredfl-flag-mark-line ((,class :inherit modus-theme-mark-sel)))
- `(diredfl-ignored-file-name ((,class :foreground ,fg-inactive)))
+ `(diredfl-ignored-file-name ((,class :foreground ,fg-alt)))
`(diredfl-link-priv ((,class :foreground ,blue-alt-other)))
- `(diredfl-no-priv ((,class :foreground ,fg-inactive)))
- `(diredfl-number ((,class :foreground ,cyan)))
+ `(diredfl-no-priv ((,class :foreground ,fg-alt)))
+ `(diredfl-number ((,class :foreground ,cyan-alt)))
`(diredfl-other-priv ((,class :foreground ,yellow)))
- `(diredfl-rare-priv ((,class :foreground ,magenta-alt-other)))
- `(diredfl-read-priv ((,class :foreground ,magenta)))
- `(diredfl-symlink ((,class :foreground ,cyan-alt :underline t)))
+ `(diredfl-rare-priv ((,class :foreground ,red-alt)))
+ `(diredfl-read-priv ((,class :foreground ,fg-main)))
+ `(diredfl-symlink ((,class :inherit dired-symlink)))
`(diredfl-tagged-autofile-name ((,class :inherit
modus-theme-refine-magenta)))
- `(diredfl-write-priv ((,class :foreground ,cyan-alt-other)))
+ `(diredfl-write-priv ((,class :foreground ,cyan)))
;;;;; disk-usage
`(disk-usage-children ((,class :foreground ,yellow)))
`(disk-usage-inaccessible ((,class :inherit bold :foreground ,red)))
`(disk-usage-percent ((,class :foreground ,green)))
`(disk-usage-size ((,class :foreground ,cyan)))
- `(disk-usage-symlink ((,class :foreground ,blue :underline t)))
+ `(disk-usage-symlink ((,class :inherit button :foreground ,blue)))
`(disk-usage-symlink-directory ((,class :inherit bold :foreground
,blue-alt)))
;;;;; doom-modeline
`(doom-modeline-bar ((,class :inherit modus-theme-active-blue)))
`(doom-modeline-bar-inactive ((,class :background ,fg-inactive :foreground
,bg-main)))
`(doom-modeline-battery-charging ((,class :foreground ,green-active)))
`(doom-modeline-battery-critical ((,class :inherit bold :foreground
,red-active)))
- `(doom-modeline-battery-error ((,class :inherit modus-theme-active-red)))
+ `(doom-modeline-battery-error ((,class :inherit bold :box (:line-width -2)
+ :foreground ,red-active)))
`(doom-modeline-battery-full ((,class :foreground ,blue-active)))
`(doom-modeline-battery-normal ((,class :foreground ,fg-active)))
`(doom-modeline-battery-warning ((,class :inherit bold :foreground
,yellow-active)))
@@ -1781,18 +2141,24 @@ Also bind `class' to ((class color) (min-colors 89))."
`(ebdb-role-defunct ((,class :foreground ,fg-alt)))
`(eieio-custom-slot-tag-face ((,class :foreground ,red-alt)))
;;;;; ediff
- `(ediff-current-diff-A ((,class ,@(modus-vivendi-theme-diffs
- bg-alt red
- bg-diff-removed fg-diff-removed))))
- `(ediff-current-diff-Ancestor ((,class ,@(modus-vivendi-theme-diffs
- bg-alt fg-special-cold
- bg-special-cold
fg-special-cold))))
- `(ediff-current-diff-B ((,class ,@(modus-vivendi-theme-diffs
- bg-alt green
- bg-diff-added fg-diff-added))))
- `(ediff-current-diff-C ((,class ,@(modus-vivendi-theme-diffs
- bg-alt yellow
- bg-diff-changed fg-diff-changed))))
+ ;; NOTE: here we break from the pattern of inheriting from the
+ ;; modus-theme-diff-* faces.
+ `(ediff-current-diff-A ((,class ,@(modus-vivendi-theme-diff
+ bg-dim red
+ bg-diff-removed fg-diff-removed
+ red-nuanced-bg red-faint))))
+ `(ediff-current-diff-Ancestor ((,class ,@(modus-vivendi-theme-diff
+ bg-dim fg-special-cold
+ bg-special-cold fg-special-cold
+ blue-nuanced-bg blue))))
+ `(ediff-current-diff-B ((,class ,@(modus-vivendi-theme-diff
+ bg-dim green
+ bg-diff-added fg-diff-added
+ green-nuanced-bg green-faint))))
+ `(ediff-current-diff-C ((,class ,@(modus-vivendi-theme-diff
+ bg-dim yellow
+ bg-diff-changed fg-diff-changed
+ yellow-nuanced-bg yellow-faint))))
`(ediff-even-diff-A ((,class :background ,bg-diff-neutral-1 :foreground
,fg-diff-neutral-1)))
`(ediff-even-diff-Ancestor ((,class :background ,bg-diff-neutral-2
:foreground ,fg-diff-neutral-1)))
`(ediff-even-diff-B ((,class :background ,bg-diff-neutral-1 :foreground
,fg-diff-neutral-1)))
@@ -1812,6 +2178,9 @@ Also bind `class' to ((class color) (min-colors 89))."
`(el-search-match ((,class :inherit modus-theme-intense-green)))
`(el-search-other-match ((,class :inherit modus-theme-special-mild)))
`(el-search-occur-match ((,class :inherit modus-theme-special-calm)))
+;;;;; eldoc
+ ;; NOTE: see https://github.com/purcell/package-lint/issues/187
+ (list 'eldoc-highlight-function-argument `((,class :inherit bold
:foreground ,blue-alt-other)))
;;;;; eldoc-box
`(eldoc-box-body ((,class :background ,bg-alt :foreground ,fg-main)))
`(eldoc-box-border ((,class :background ,fg-alt)))
@@ -1821,14 +2190,14 @@ Also bind `class' to ((class color) (min-colors 89))."
`(elfeed-log-error-level-face ((,class :foreground ,red)))
`(elfeed-log-info-level-face ((,class :foreground ,green)))
`(elfeed-log-warn-level-face ((,class :foreground ,yellow)))
- `(elfeed-search-date-face ((,class :foreground ,cyan)))
- `(elfeed-search-feed-face ((,class :foreground ,blue)))
- `(elfeed-search-filter-face ((,class :foreground ,magenta-active)))
- `(elfeed-search-last-update-face ((,class :foreground ,green-active)))
- `(elfeed-search-tag-face ((,class :foreground ,cyan-alt-other)))
- `(elfeed-search-title-face ((,class :foreground ,fg-main)))
- `(elfeed-search-unread-count-face ((,class :foreground ,blue-active)))
- `(elfeed-search-unread-title-face ((,class :inherit bold)))
+ `(elfeed-search-date-face ((,class :foreground ,blue-nuanced)))
+ `(elfeed-search-feed-face ((,class :foreground ,cyan)))
+ `(elfeed-search-filter-face ((,class :inherit bold :foreground
,magenta-active)))
+ `(elfeed-search-last-update-face ((,class :foreground ,cyan-active)))
+ `(elfeed-search-tag-face ((,class :foreground ,blue-nuanced)))
+ `(elfeed-search-title-face ((,class :foreground ,fg-dim)))
+ `(elfeed-search-unread-count-face ((,class :foreground ,green-active)))
+ `(elfeed-search-unread-title-face ((,class :inherit bold :foreground
,fg-main)))
;;;;; elfeed-score
`(elfeed-score-date-face ((,class :foreground ,blue)))
`(elfeed-score-debug-level-face ((,class :foreground ,magenta-alt-other)))
@@ -1888,6 +2257,38 @@ Also bind `class' to ((class color) (min-colors 89))."
`(erc-prompt-face ((,class :inherit bold :foreground ,cyan-alt-other)))
`(erc-timestamp-face ((,class :foreground ,blue-nuanced)))
`(erc-underline-face ((,class :underline t)))
+ `(bg:erc-color-face0 ((,class :background "white")))
+ `(bg:erc-color-face1 ((,class :background "black")))
+ `(bg:erc-color-face10 ((,class :background ,cyan-subtle-bg)))
+ `(bg:erc-color-face11 ((,class :background ,cyan-intense-bg)))
+ `(bg:erc-color-face12 ((,class :background ,blue-subtle-bg)))
+ `(bg:erc-color-face13 ((,class :background ,magenta-subtle-bg)))
+ `(bg:erc-color-face14 ((,class :background "gray60")))
+ `(bg:erc-color-face15 ((,class :background "gray80")))
+ `(bg:erc-color-face2 ((,class :background ,blue-intense-bg)))
+ `(bg:erc-color-face3 ((,class :background ,green-intense-bg)))
+ `(bg:erc-color-face4 ((,class :background ,red-subtle-bg)))
+ `(bg:erc-color-face5 ((,class :background ,red-intense-bg)))
+ `(bg:erc-color-face6 ((,class :background ,magenta-refine-bg)))
+ `(bg:erc-color-face7 ((,class :background ,yellow-subtle-bg)))
+ `(bg:erc-color-face8 ((,class :background ,yellow-refine-bg)))
+ `(bg:erc-color-face9 ((,class :background ,green-subtle-bg)))
+ `(fg:erc-color-face0 ((,class :foreground "white")))
+ `(fg:erc-color-face1 ((,class :foreground "black")))
+ `(fg:erc-color-face10 ((,class :foreground ,cyan)))
+ `(fg:erc-color-face11 ((,class :foreground ,cyan-alt-other)))
+ `(fg:erc-color-face12 ((,class :foreground ,blue)))
+ `(fg:erc-color-face13 ((,class :foreground ,magenta-alt)))
+ `(fg:erc-color-face14 ((,class :foreground "gray60")))
+ `(fg:erc-color-face15 ((,class :foreground "gray80")))
+ `(fg:erc-color-face2 ((,class :foreground ,blue-alt-other)))
+ `(fg:erc-color-face3 ((,class :foreground ,green)))
+ `(fg:erc-color-face4 ((,class :foreground ,red)))
+ `(fg:erc-color-face5 ((,class :foreground ,red-alt)))
+ `(fg:erc-color-face6 ((,class :foreground ,magenta-alt-other)))
+ `(fg:erc-color-face7 ((,class :foreground ,yellow-alt-other)))
+ `(fg:erc-color-face8 ((,class :foreground ,yellow-alt)))
+ `(fg:erc-color-face9 ((,class :foreground ,green-alt-other)))
;;;;; eros
`(eros-result-overlay-face ((,class :box (:line-width -1 :color ,blue)
:background ,bg-dim :foreground
,fg-dim)))
@@ -1904,14 +2305,13 @@ Also bind `class' to ((class color) (min-colors 89))."
`(eshell-ls-product ((,class :foreground ,fg-special-warm)))
`(eshell-ls-readonly ((,class :foreground ,fg-special-cold)))
`(eshell-ls-special ((,class :inherit bold :foreground ,magenta)))
- `(eshell-ls-symlink ((,class :foreground ,cyan :underline t)))
+ `(eshell-ls-symlink ((,class :inherit button :foreground ,cyan)))
`(eshell-ls-unreadable ((,class :background ,bg-inactive :foreground
,fg-inactive)))
`(eshell-prompt ((,class ,@(modus-vivendi-theme-bold-weight)
- ,@(modus-vivendi-theme-prompt green-alt-other
- green-nuanced-bg
- green-alt
- green-refine-bg
- fg-main))))
+ ,@(modus-vivendi-theme-prompt
+ green-alt-other
+ green-nuanced-bg green-alt
+ green-refine-bg fg-main))))
;;;;; eshell-fringe-status
`(eshell-fringe-status-failure ((,class :foreground ,red)))
`(eshell-fringe-status-success ((,class :foreground ,green)))
@@ -1939,6 +2339,15 @@ Also bind `class' to ((class color) (min-colors 89))."
`(epe-remote-face ((,class :foreground ,fg-alt :slant ,modus-theme-slant)))
`(epe-status-face ((,class :foreground ,magenta-alt-other)))
`(epe-venv-face ((,class :foreground ,fg-alt :slant ,modus-theme-slant)))
+;;;;; eshell-syntax-highlighting
+ `(eshell-syntax-highlighting-alias-face ((,class :foreground ,cyan)))
+ `(eshell-syntax-highlighting-comment-face ((,class :foreground ,fg-alt)))
+ `(eshell-syntax-highlighting-directory-face ((,class :foreground ,blue)))
+ `(eshell-syntax-highlighting-envvar-face ((,class :foreground
,magenta-alt)))
+ `(eshell-syntax-highlighting-invalid-face ((,class :foreground ,red)))
+ `(eshell-syntax-highlighting-lisp-function-face ((,class :foreground
,magenta)))
+ `(eshell-syntax-highlighting-shell-command-face ((,class :foreground
,cyan-alt-other)))
+ `(eshell-syntax-highlighting-string-face ((,class :foreground ,blue-alt)))
;;;;; evil-mode
`(evil-ex-commands ((,class :foreground ,magenta-alt-other)))
`(evil-ex-info ((,class :foreground ,cyan-alt-other)))
@@ -2006,6 +2415,11 @@ Also bind `class' to ((class color) (min-colors 89))."
((,(append '((supports :underline (:style wave))) class)
:underline (:color ,fg-lang-warning :style wave))
(,class :foreground ,fg-lang-warning :underline t)))
+;;;;; flycheck-color-mode-line
+ `(flycheck-color-mode-line-error-face ((,class :inherit
flycheck-fringe-error)))
+ `(flycheck-color-mode-line-info-face ((,class :inherit
flycheck-fringe-info)))
+ `(flycheck-color-mode-line-running-face ((,class :foreground ,fg-inactive
:slant italic)))
+ `(flycheck-color-mode-line-info-face ((,class :inherit
flycheck-fringe-warning)))
;;;;; flycheck-indicator
`(flycheck-indicator-disabled ((,class :foreground ,fg-inactive :slant
,modus-theme-slant)))
`(flycheck-indicator-error ((,class ,@(modus-vivendi-theme-bold-weight)
:foreground ,red-active)))
@@ -2049,7 +2463,7 @@ Also bind `class' to ((class color) (min-colors 89))."
'modus-theme-subtle-magenta
'modus-theme-intense-magenta
'modus-theme-nuanced-magenta
- magenta-alt-other
+ magenta-alt
'bold))))
;;;;; freeze-it
`(freeze-it-show ((,class :background ,bg-dim :foreground
,fg-special-warm)))
@@ -2157,13 +2571,13 @@ Also bind `class' to ((class color) (min-colors 89))."
`(git-commit-comment-branch-remote ((,class :foreground ,magenta-alt :slant
,modus-theme-slant)))
`(git-commit-comment-detached ((,class :foreground ,cyan-alt :slant
,modus-theme-slant)))
`(git-commit-comment-file ((,class :foreground ,fg-special-cold :slant
,modus-theme-slant)))
- `(git-commit-comment-heading ((,class :inherit bold :foreground ,fg-alt
:slant ,modus-theme-slant)))
+ `(git-commit-comment-heading ((,class :inherit bold :foreground ,fg-dim
:slant ,modus-theme-slant)))
`(git-commit-keyword ((,class :foreground ,magenta)))
- `(git-commit-known-pseudo-header ((,class :inherit bold :foreground
,fg-special-warm)))
+ `(git-commit-known-pseudo-header ((,class :foreground ,cyan-alt-other)))
`(git-commit-nonempty-second-line ((,class :inherit
modus-theme-refine-yellow)))
`(git-commit-overlong-summary ((,class :inherit modus-theme-refine-yellow)))
- `(git-commit-pseudo-header ((,class :inherit bold :foreground ,fg-alt)))
- `(git-commit-summary ((,class :foreground ,magenta-alt-other)))
+ `(git-commit-pseudo-header ((,class :foreground ,blue)))
+ `(git-commit-summary ((,class :inherit bold :foreground ,cyan)))
;;;;; git-gutter
`(git-gutter:added ((,class :inherit modus-theme-fringe-green)))
`(git-gutter:deleted ((,class :inherit modus-theme-fringe-red)))
@@ -2200,7 +2614,7 @@ Also bind `class' to ((class color) (min-colors 89))."
`(git-timemachine-minibuffer-detail-face ((,class :foreground ,red-alt)))
;;;;; git-walktree
`(git-walktree-commit-face ((,class :foreground ,yellow)))
- `(git-walktree-symlink-face ((,class :foreground ,cyan :underline t)))
+ `(git-walktree-symlink-face ((,class :inherit button :foreground ,cyan)))
`(git-walktree-tree-face ((,class :foreground ,magenta)))
;;;;; gnus
`(gnus-button ((,class :inherit button)))
@@ -2239,9 +2653,9 @@ Also bind `class' to ((class color) (min-colors 89))."
`(gnus-group-news-6-empty ((,class :foreground ,fg-alt)))
`(gnus-group-news-low ((,class :inherit bold :foreground ,green-nuanced)))
`(gnus-group-news-low-empty ((,class :foreground ,green-nuanced)))
- `(gnus-header-content ((,class :foreground ,fg-special-calm)))
- `(gnus-header-from ((,class :inherit bold :foreground ,cyan-alt :underline
nil)))
- `(gnus-header-name ((,class :foreground ,cyan-alt-other)))
+ `(gnus-header-content ((,class :foreground ,cyan)))
+ `(gnus-header-from ((,class :inherit bold :foreground ,cyan-alt-other
:underline nil)))
+ `(gnus-header-name ((,class :foreground ,green)))
`(gnus-header-newsgroups ((,class :inherit bold :foreground ,blue-alt)))
`(gnus-header-subject ((,class :inherit bold :foreground
,magenta-alt-other)))
`(gnus-server-agent ((,class :inherit bold :foreground ,cyan)))
@@ -2260,12 +2674,12 @@ Also bind `class' to ((class color) (min-colors 89))."
`(gnus-summary-high-undownloaded ((,class :inherit bold :foreground
,yellow)))
`(gnus-summary-high-unread ((,class :inherit bold :foreground ,fg-main)))
`(gnus-summary-low-ancient ((,class :foreground ,fg-alt :slant italic)))
- `(gnus-summary-low-read ((,class :foreground ,fg-special-cold :slant
italic)))
+ `(gnus-summary-low-read ((,class :foreground ,fg-alt :slant italic)))
`(gnus-summary-low-ticked ((,class :foreground ,red-refine-fg :slant
italic)))
`(gnus-summary-low-undownloaded ((,class :foreground ,yellow-refine-fg
:slant italic)))
`(gnus-summary-low-unread ((,class :inherit bold :foreground
,fg-special-cold)))
`(gnus-summary-normal-ancient ((,class :foreground ,fg-special-calm)))
- `(gnus-summary-normal-read ((,class :foreground ,fg-special-cold)))
+ `(gnus-summary-normal-read ((,class :foreground ,fg-alt)))
`(gnus-summary-normal-ticked ((,class :foreground ,red-alt-other)))
`(gnus-summary-normal-undownloaded ((,class :foreground ,yellow)))
`(gnus-summary-normal-unread ((,class :foreground ,fg-main)))
@@ -2309,11 +2723,11 @@ Also bind `class' to ((class color) (min-colors 89))."
`(helm-ff-directory ((,class :inherit helm-buffer-directory)))
`(helm-ff-dirs ((,class :inherit bold :foreground ,blue-alt-other)))
`(helm-ff-dotted-directory ((,class :inherit bold :background ,bg-alt
:foreground ,fg-alt)))
- `(helm-ff-dotted-symlink-directory ((,class :inherit
helm-ff-dotted-directory :underline t)))
+ `(helm-ff-dotted-symlink-directory ((,class :inherit (button
helm-ff-dotted-directory))))
`(helm-ff-executable ((,class :foreground ,magenta-alt)))
`(helm-ff-file ((,class :foreground ,fg-main)))
`(helm-ff-file-extension ((,class :foreground ,fg-special-warm)))
- `(helm-ff-invalid-symlink ((,class :foreground ,red :underline t)))
+ `(helm-ff-invalid-symlink ((,class :inherit button :foreground ,red)))
`(helm-ff-pipe ((,class ,@(modus-vivendi-theme-extra-completions
'modus-theme-refine-magenta
'modus-theme-subtle-magenta
@@ -2330,7 +2744,7 @@ Also bind `class' to ((class color) (min-colors 89))."
'modus-theme-refine-red
'modus-theme-nuanced-yellow
red-alt))))
- `(helm-ff-symlink ((,class :foreground ,cyan :underline t)))
+ `(helm-ff-symlink ((,class :inherit button :foreground ,cyan)))
`(helm-ff-truename ((,class :foreground ,blue-alt-other)))
`(helm-grep-cmd-line ((,class :foreground ,yellow-alt-other)))
`(helm-grep-file ((,class :inherit bold :foreground ,fg-special-cold)))
@@ -2366,7 +2780,7 @@ Also bind `class' to ((class color) (min-colors 89))."
'modus-theme-nuanced-cyan
cyan-alt-other))))
`(helm-minibuffer-prompt ((,class :inherit minibuffer-prompt)))
- `(helm-moccur-buffer ((,class :foreground ,cyan-alt-other :underline t)))
+ `(helm-moccur-buffer ((,class :inherit button :foreground ,cyan-alt-other)))
`(helm-mode-prefix ((,class ,@(modus-vivendi-theme-extra-completions
'modus-theme-subtle-magenta
'modus-theme-intense-magenta
@@ -2416,8 +2830,7 @@ Also bind `class' to ((class color) (min-colors 89))."
`(helm-xref-file-name ((,class :inherit bold :foreground ,fg-special-cold)))
`(helm-xref-file-name ((,class :foreground ,fg-special-warm)))
;;;;; helpful
- `(helpful-heading ((,class :inherit (bold ,modus-theme-variable-pitch)
:foreground ,fg-main
- ,@(modus-vivendi-theme-scale
modus-vivendi-theme-scale-4))))
+ `(helpful-heading ((,class :inherit modus-theme-heading-1)))
;;;;; highlight region or ad-hoc regexp
`(hi-black-b ((,class :background ,fg-main :foreground ,bg-main)))
`(hi-blue ((,class :background ,bg-alt :foreground ,blue :underline t)))
@@ -2487,23 +2900,23 @@ Also bind `class' to ((class color) (min-colors 89))."
;;;;; icomplete
`(icomplete-first-match ((,class :inherit bold
,@(modus-vivendi-theme-standard-completions
- magenta magenta-nuanced-bg
- magenta-intense-bg fg-main))))
+ magenta bg-alt
+ bg-active fg-main))))
;;;;; icomplete-vertical
`(icomplete-vertical-separator ((,class :foreground ,fg-alt)))
;;;;; ido-mode
`(ido-first-match ((,class :inherit bold
,@(modus-vivendi-theme-standard-completions
- magenta magenta-nuanced-bg
- magenta-subtle-bg fg-main))))
+ magenta bg-alt
+ bg-active fg-main))))
`(ido-incomplete-regexp ((,class :inherit error)))
`(ido-indicator ((,class :inherit modus-theme-subtle-yellow)))
`(ido-only-match ((,class :inherit bold
,@(modus-vivendi-theme-standard-completions
- magenta-intense red-nuanced-bg
- magenta-intense-bg fg-main))))
- `(ido-subdir ((,class :foreground ,blue-alt-other)))
- `(ido-virtual ((,class :foreground ,yellow-alt-other)))
+ green green-nuanced-bg
+ green-intense-bg fg-main))))
+ `(ido-subdir ((,class :foreground ,blue)))
+ `(ido-virtual ((,class :foreground ,fg-special-warm)))
;;;;; iedit
`(iedit-occurrence ((,class :inherit modus-theme-refine-blue)))
`(iedit-read-only-occurrence ((,class :inherit modus-theme-intense-yellow)))
@@ -2521,29 +2934,25 @@ Also bind `class' to ((class color) (min-colors 89))."
`(imenu-list-entry-subalist-face-3 ((,class :inherit bold :foreground
,red-alt-other :underline t)))
;;;;; indium
`(indium-breakpoint-face ((,class :foreground ,red-active)))
- `(indium-frame-url-face ((,class :foreground ,fg-alt :underline t)))
+ `(indium-frame-url-face ((,class :inherit button :foreground ,fg-alt)))
`(indium-keyword-face ((,class :foreground ,magenta-alt-other)))
`(indium-litable-face ((,class :foreground ,fg-special-warm :slant
,modus-theme-slant)))
`(indium-repl-error-face ((,class :inherit bold :foreground ,red)))
`(indium-repl-prompt-face ((,class :foreground ,cyan-alt-other)))
`(indium-repl-stdout-face ((,class :foreground ,fg-main)))
;;;;; info
- `(Info-quoted ((,class :foreground ,magenta))) ; the capitalisation is
canonical
+ `(Info-quoted ((,class ,@(modus-vivendi-theme-mixed-fonts)
+ :foreground ,magenta))) ; the capitalisation is
canonical
`(info-header-node ((,class :inherit bold :foreground ,fg-alt)))
`(info-header-xref ((,class :foreground ,blue-active)))
`(info-index-match ((,class :inherit match)))
- `(info-menu-header ((,class :inherit (bold ,modus-theme-variable-pitch)
:foreground ,fg-main
- ,@(modus-vivendi-theme-scale
modus-vivendi-theme-scale-2))))
- `(info-menu-star ((,class :foreground ,fg-main)))
+ `(info-menu-header ((,class :inherit modus-theme-heading-3)))
+ `(info-menu-star ((,class :foreground ,red)))
`(info-node ((,class :inherit bold)))
- `(info-title-1 ((,class :inherit (bold ,modus-theme-variable-pitch)
:foreground ,fg-main
- ,@(modus-vivendi-theme-scale
modus-vivendi-theme-scale-4))))
- `(info-title-2 ((,class :inherit (bold ,modus-theme-variable-pitch)
:foreground ,fg-special-warm
- ,@(modus-vivendi-theme-scale
modus-vivendi-theme-scale-3))))
- `(info-title-3 ((,class :inherit (bold ,modus-theme-variable-pitch)
:foreground ,fg-special-cold
- ,@(modus-vivendi-theme-scale
modus-vivendi-theme-scale-2))))
- `(info-title-4 ((,class :inherit (bold ,modus-theme-variable-pitch)
:foreground ,fg-special-mild
- ,@(modus-vivendi-theme-scale
modus-vivendi-theme-scale-1))))
+ `(info-title-1 ((,class :inherit modus-theme-heading-1)))
+ `(info-title-2 ((,class :inherit modus-theme-heading-2)))
+ `(info-title-3 ((,class :inherit modus-theme-heading-3)))
+ `(info-title-4 ((,class :inherit modus-theme-heading-4)))
;;;;; info-colors
`(info-colors-lisp-code-block ((,class :inherit fixed-pitch)))
`(info-colors-ref-item-command ((,class :foreground ,magenta)))
@@ -2689,13 +3098,14 @@ Also bind `class' to ((class color) (min-colors 89))."
`(kaocha-runner-warning-face ((,class :foreground ,yellow)))
;;;;; keycast
`(keycast-command ((,class :inherit bold :foreground ,blue-active)))
- `(keycast-key ((,class :box ,(modus-vivendi-theme-modeline-box blue-alt
blue-active t -3)
- ,@(modus-vivendi-theme-modeline-props
- blue-active bg-main
- blue-active bg-active))))
+ `(keycast-key ((,class ,@(modus-vivendi-theme-mode-line-attrs
+ bg-main blue-active
+ bg-main blue-active
+ blue-active blue-intense
+ 'alt-style -3))))
;;;;; line numbers (display-line-numbers-mode and global variant)
- `(line-number ((,class :background ,bg-dim :foreground ,fg-alt)))
- `(line-number-current-line ((,class :inherit bold :background ,bg-active
:foreground ,fg-active)))
+ `(line-number ((,class :inherit default :background ,bg-dim :foreground
,fg-alt)))
+ `(line-number-current-line ((,class :inherit default :background ,bg-active
:foreground ,fg-main)))
;;;;; lsp-mode
`(lsp-face-highlight-read ((,class :inherit modus-theme-subtle-blue
:underline t)))
`(lsp-face-highlight-textual ((,class :inherit modus-theme-subtle-blue)))
@@ -2725,7 +3135,7 @@ Also bind `class' to ((class color) (min-colors 89))."
`(lsp-lens-mouse-face ((,class :height 0.8 :foreground ,blue-alt-other
:underline t)))
`(lsp-ui-doc-background ((,class :background ,bg-alt)))
`(lsp-ui-doc-header ((,class :background ,bg-header :foreground
,fg-header)))
- `(lsp-ui-doc-url ((,class :foreground ,blue-alt-other :underline t)))
+ `(lsp-ui-doc-url ((,class :inherit button :foreground ,blue-alt-other)))
`(lsp-ui-peek-filename ((,class :foreground ,fg-special-warm)))
`(lsp-ui-peek-footer ((,class :background ,bg-header :foreground
,fg-header)))
`(lsp-ui-peek-header ((,class :background ,bg-header :foreground
,fg-header)))
@@ -2757,37 +3167,43 @@ Also bind `class' to ((class color) (min-colors 89))."
`(magit-branch-upstream ((,class :slant italic)))
`(magit-cherry-equivalent ((,class :background ,bg-main :foreground
,magenta-intense)))
`(magit-cherry-unmatched ((,class :background ,bg-main :foreground
,cyan-intense)))
- `(magit-diff-added ((,class ,@(modus-vivendi-theme-diffs
+ ;; NOTE: here we break from the pattern of inheriting from the
+ ;; modus-theme-diff-* faces, though only for the standard actions,
+ ;; not the highlighted ones. This is because Magit's interaction
+ ;; model relies on highlighting the current diff hunk.
+ `(magit-diff-added ((,class ,@(modus-vivendi-theme-diff
bg-main green
- bg-diff-added fg-diff-added))))
- `(magit-diff-added-highlight ((,class ,@(modus-vivendi-theme-diffs
- bg-dim green
- bg-diff-focus-added
fg-diff-focus-added))))
- `(magit-diff-base ((,class ,@(modus-vivendi-theme-diffs
+ bg-diff-added fg-diff-added
+ green-nuanced-bg fg-diff-added))))
+ `(magit-diff-added-highlight ((,class :inherit
modus-theme-diff-focus-added)))
+ `(magit-diff-base ((,class ,@(modus-vivendi-theme-diff
bg-main yellow
- bg-diff-changed fg-diff-changed))))
- `(magit-diff-base-highlight ((,class ,@(modus-vivendi-theme-diffs
- bg-dim yellow
- bg-diff-focus-changed
fg-diff-focus-changed))))
+ bg-diff-changed fg-diff-changed
+ yellow-nuanced-bg fg-diff-changed))))
+ `(magit-diff-base-highlight ((,class :inherit
modus-theme-diff-focus-changed)))
`(magit-diff-context ((,class :foreground ,fg-unfocused)))
- `(magit-diff-context-highlight ((,class ,@(modus-vivendi-theme-diffs
+ `(magit-diff-context-highlight ((,class ,@(modus-vivendi-theme-diff
bg-dim fg-dim
- bg-inactive fg-inactive))))
+ bg-inactive fg-inactive
+ bg-dim fg-alt))))
`(magit-diff-file-heading ((,class :inherit bold :foreground
,fg-special-cold)))
`(magit-diff-file-heading-highlight ((,class :inherit
(modus-theme-special-cold bold))))
- `(magit-diff-file-heading-selection ((,class :background ,bg-alt
:foreground ,cyan)))
- `(magit-diff-hunk-heading ((,class :inherit bold :background ,bg-active
:foreground ,fg-inactive)))
- `(magit-diff-hunk-heading-highlight ((,class :inherit
(modus-theme-diff-heading bold))))
- `(magit-diff-hunk-heading-selection ((,class :inherit
modus-theme-intense-cyan)))
+ `(magit-diff-file-heading-selection ((,class :inherit
modus-theme-refine-cyan)))
+ ;; NOTE: here we break from the pattern of inheriting from the
+ ;; modus-theme-diff-* faces.
+ `(magit-diff-hunk-heading ((,class :inherit bold :background ,bg-active
+ :foreground ,fg-inactive)))
+ `(magit-diff-hunk-heading-highlight ((,class :inherit bold :background
,bg-diff-heading
+ :foreground ,fg-diff-heading)))
+ `(magit-diff-hunk-heading-selection ((,class :inherit
modus-theme-refine-blue)))
`(magit-diff-hunk-region ((,class :inherit bold)))
`(magit-diff-lines-boundary ((,class :background ,fg-main)))
`(magit-diff-lines-heading ((,class :inherit modus-theme-refine-magenta)))
- `(magit-diff-removed ((,class ,@(modus-vivendi-theme-diffs
+ `(magit-diff-removed ((,class ,@(modus-vivendi-theme-diff
bg-main red
- bg-diff-removed fg-diff-removed))))
- `(magit-diff-removed-highlight ((,class ,@(modus-vivendi-theme-diffs
- bg-dim red
- bg-diff-focus-removed
fg-diff-focus-removed))))
+ bg-diff-removed fg-diff-removed
+ red-nuanced-bg fg-diff-removed))))
+ `(magit-diff-removed-highlight ((,class :inherit
modus-theme-diff-focus-removed)))
`(magit-diffstat-added ((,class :foreground ,green)))
`(magit-diffstat-removed ((,class :foreground ,red)))
`(magit-dimmed ((,class :foreground ,fg-unfocused)))
@@ -2846,26 +3262,40 @@ Also bind `class' to ((class color) (min-colors 89))."
`(Man-reverse ((,class :inherit modus-theme-subtle-magenta)))
`(Man-underline ((,class :foreground ,cyan :underline t)))
;;;;; markdown-mode
- `(markdown-blockquote-face ((,class :foreground ,fg-special-warm :slant
,modus-theme-slant)))
+ `(markdown-blockquote-face ((,class :foreground ,fg-special-cold :slant
,modus-theme-slant)))
`(markdown-bold-face ((,class :inherit bold)))
- `(markdown-code-face ((,class :inherit fixed-pitch)))
+ `(markdown-code-face ((,class ,@(modus-vivendi-theme-mixed-fonts))))
`(markdown-comment-face ((,class :foreground ,fg-alt :slant
,modus-theme-slant)))
`(markdown-footnote-marker-face ((,class :inherit bold :foreground
,cyan-alt)))
`(markdown-footnote-text-face ((,class :foreground ,fg-main :slant
,modus-theme-slant)))
`(markdown-gfm-checkbox-face ((,class :foreground ,cyan-alt-other)))
`(markdown-header-delimiter-face ((,class
,@(modus-vivendi-theme-bold-weight) :foreground ,fg-dim)))
- `(markdown-header-face ((,class :inherit bold)))
+ `(markdown-header-face ((t nil)))
+ `(markdown-header-face-1 ((,class :inherit modus-theme-heading-1)))
+ `(markdown-header-face-2 ((,class :inherit modus-theme-heading-2)))
+ `(markdown-header-face-3 ((,class :inherit modus-theme-heading-3)))
+ `(markdown-header-face-4 ((,class :inherit modus-theme-heading-4)))
+ `(markdown-header-face-5 ((,class :inherit modus-theme-heading-5)))
+ `(markdown-header-face-6 ((,class :inherit modus-theme-heading-6)))
`(markdown-header-rule-face ((,class :inherit bold :foreground
,fg-special-warm)))
`(markdown-hr-face ((,class :inherit bold :foreground ,fg-special-warm)))
- `(markdown-html-attr-name-face ((,class :inherit fixed-pitch :foreground
,cyan)))
- `(markdown-html-attr-value-face ((,class :inherit fixed-pitch :foreground
,blue)))
- `(markdown-html-entity-face ((,class :inherit fixed-pitch :foreground
,cyan)))
- `(markdown-html-tag-delimiter-face ((,class :inherit fixed-pitch
:foreground ,fg-special-mild)))
- `(markdown-html-tag-name-face ((,class :inherit fixed-pitch :foreground
,magenta-alt)))
- `(markdown-inline-code-face ((,class :inherit fixed-pitch :foreground
,magenta)))
+ `(markdown-html-attr-name-face ((,class ,@(modus-vivendi-theme-mixed-fonts)
+ :foreground ,cyan)))
+ `(markdown-html-attr-value-face ((,class ,@(modus-vivendi-theme-mixed-fonts)
+ :foreground ,blue)))
+ `(markdown-html-entity-face ((,class ,@(modus-vivendi-theme-mixed-fonts)
+ :foreground ,cyan)))
+ `(markdown-html-tag-delimiter-face ((,class
,@(modus-vivendi-theme-mixed-fonts)
+ :foreground ,fg-special-mild)))
+ `(markdown-html-tag-name-face ((,class ,@(modus-vivendi-theme-mixed-fonts)
+ :foreground ,magenta-alt)))
+ `(markdown-inline-code-face ((,class ,@(modus-vivendi-theme-mixed-fonts)
+ :foreground ,magenta)))
`(markdown-italic-face ((,class :foreground ,fg-special-cold :slant
italic)))
- `(markdown-language-info-face ((,class :inherit fixed-pitch :foreground
,fg-special-cold)))
- `(markdown-language-keyword-face ((,class :inherit fixed-pitch :foreground
,green-alt-other)))
+ `(markdown-language-info-face ((,class ,@(modus-vivendi-theme-mixed-fonts)
+ :foreground ,fg-special-cold)))
+ `(markdown-language-keyword-face ((,class
,@(modus-vivendi-theme-mixed-fonts)
+ :foreground ,green-alt-other)))
`(markdown-line-break-face ((,class :inherit modus-theme-refine-cyan
:underline t)))
`(markdown-link-face ((,class :inherit link)))
`(markdown-link-title-face ((,class :foreground ,fg-special-cold :slant
,modus-theme-slant)))
@@ -2877,12 +3307,14 @@ Also bind `class' to ((class color) (min-colors 89))."
`(markdown-missing-link-face ((,class :inherit bold :foreground ,yellow)))
`(markdown-plain-url-face ((,class :inherit markdown-link-face)))
`(markdown-pre-face ((,class ,@(and (>= emacs-major-version 27) '(:extend
t))
- :inherit fixed-pitch :background ,bg-dim
+ ,@(modus-vivendi-theme-mixed-fonts)
+ :background ,bg-dim
:foreground ,fg-special-mild)))
`(markdown-reference-face ((,class :inherit markdown-markup-face)))
`(markdown-strike-through-face ((,class :strike-through t)))
- `(markdown-table-face ((,class :inherit fixed-pitch :foreground
,fg-special-cold)))
- `(markdown-url-face ((,class :foreground ,blue)))
+ `(markdown-table-face ((,class ,@(modus-vivendi-theme-mixed-fonts)
+ :foreground ,fg-special-cold)))
+ `(markdown-url-face ((,class :foreground ,blue-alt)))
;;;;; markup-faces (`adoc-mode')
`(markup-anchor-face ((,class :foreground ,fg-inactive)))
`(markup-attribute-face ((,class :foreground ,fg-inactive :slant italic)))
@@ -2896,7 +3328,7 @@ Also bind `class' to ((class color) (min-colors 89))."
`(markup-emphasis-face ((,class :foreground ,fg-special-cold :slant
italic)))
`(markup-error-face ((,class :inherit bold :foreground ,red)))
`(markup-gen-face ((,class :foreground ,magenta-alt)))
- `(markup-internal-reference-face ((,class :foreground ,fg-inactive
:underline t)))
+ `(markup-internal-reference-face ((,class :inherit button :foreground
,fg-inactive)))
`(markup-italic-face ((,class :foreground ,fg-special-cold :slant italic)))
`(markup-list-face ((,class :inherit modus-theme-special-calm)))
`(markup-meta-face ((,class :foreground ,fg-inactive)))
@@ -2935,32 +3367,30 @@ Also bind `class' to ((class color) (min-colors 89))."
`(message-cited-text-2 ((,class :foreground ,red-alt)))
`(message-cited-text-3 ((,class :foreground ,green-alt)))
`(message-cited-text-4 ((,class :foreground ,magenta-alt)))
- `(message-header-cc ((,class :foreground ,blue-alt)))
+ `(message-header-cc ((,class :inherit bold :foreground ,cyan-alt)))
`(message-header-name ((,class :foreground ,green-alt-other)))
- `(message-header-newsgroups ((,class :inherit bold :foreground ,blue)))
+ `(message-header-newsgroups ((,class :inherit bold :foreground ,green-alt)))
`(message-header-other ((,class :inherit bold :foreground ,cyan-alt-other)))
`(message-header-subject ((,class :inherit bold :foreground
,magenta-alt-other)))
- `(message-header-to ((,class :inherit bold :foreground ,magenta-alt)))
- `(message-header-xheader ((,class :foreground ,blue-alt-other)))
- `(message-mml ((,class :foreground ,green-alt)))
- `(message-separator ((,class :background ,bg-active :foreground
,fg-special-warm)))
+ `(message-header-to ((,class :inherit bold :foreground ,blue)))
+ `(message-header-xheader ((,class :foreground ,cyan)))
+ `(message-mml ((,class :foreground ,fg-special-warm)))
+ `(message-separator ((,class :inherit modus-theme-intense-neutral)))
;;;;; minibuffer-line
`(minibuffer-line ((,class :foreground ,fg-main)))
;;;;; minimap
`(minimap-active-region-background ((,class :background ,bg-active)))
`(minimap-current-line-face ((,class :background ,cyan-intense-bg
:foreground ,fg-main)))
;;;;; modeline
- `(mode-line ((,class :box ,(modus-vivendi-theme-modeline-box bg-active
fg-alt t)
- ,@(modus-vivendi-theme-modeline-props
- bg-active fg-dim
- bg-active fg-active))))
+ `(mode-line ((,class ,@(modus-vivendi-theme-mode-line-attrs
+ fg-active bg-active fg-dim bg-active
+ fg-alt bg-active 'alt-style nil bg-main))))
`(mode-line-buffer-id ((,class :inherit bold)))
`(mode-line-emphasis ((,class :inherit bold :foreground ,blue-active)))
`(mode-line-highlight ((,class :inherit modus-theme-active-blue :box
(:line-width -1 :style pressed-button))))
- `(mode-line-inactive ((,class :box ,(modus-vivendi-theme-modeline-box
bg-active bg-region)
- ,@(modus-vivendi-theme-modeline-props
- bg-dim fg-inactive
- bg-inactive fg-inactive))))
+ `(mode-line-inactive ((,class ,@(modus-vivendi-theme-mode-line-attrs
+ fg-inactive bg-inactive fg-alt bg-dim
+ bg-region bg-active))))
;;;;; mood-line
`(mood-line-modified ((,class :foreground ,magenta-active)))
`(mood-line-status-error ((,class :inherit bold :foreground ,red-active)))
@@ -2969,6 +3399,9 @@ Also bind `class' to ((class color) (min-colors 89))."
`(mood-line-status-success ((,class :foreground ,green-active)))
`(mood-line-status-warning ((,class :inherit bold :foreground
,yellow-active)))
`(mood-line-unimportant ((,class :foreground ,fg-inactive)))
+;;;;; mpdel
+ `(mpdel-browser-directory-face ((,class :foreground ,blue)))
+ `(mpdel-playlist-current-song-face ((,class :inherit bold :foreground
,blue-alt-other)))
;;;;; mu4e
`(mu4e-attach-number-face ((,class :inherit bold :foreground ,cyan-alt)))
`(mu4e-cited-1-face ((,class :foreground ,blue-alt)))
@@ -2979,7 +3412,7 @@ Also bind `class' to ((class color) (min-colors 89))."
`(mu4e-cited-6-face ((,class :foreground ,cyan-alt)))
`(mu4e-cited-7-face ((,class :foreground ,magenta)))
`(mu4e-compose-header-face ((,class :inherit mu4e-compose-separator-face)))
- `(mu4e-compose-separator-face ((,class :background ,bg-active :foreground
,fg-special-warm)))
+ `(mu4e-compose-separator-face ((,class :inherit
modus-theme-intense-neutral)))
`(mu4e-contact-face ((,class :inherit bold :foreground ,cyan-alt-other)))
`(mu4e-context-face ((,class :foreground ,blue-active)))
`(mu4e-draft-face ((,class :foreground ,magenta-alt)))
@@ -2998,7 +3431,7 @@ Also bind `class' to ((class color) (min-colors 89))."
`(mu4e-moved-face ((,class :foreground ,yellow :slant ,modus-theme-slant)))
`(mu4e-ok-face ((,class :inherit bold :foreground ,green)))
`(mu4e-region-code ((,class :inherit modus-theme-special-calm)))
- `(mu4e-replied-face ((,class :foreground ,cyan-active)))
+ `(mu4e-replied-face ((,class :foreground ,blue-faint)))
`(mu4e-special-header-value-face ((,class :inherit bold :foreground
,blue-alt-other)))
`(mu4e-system-face ((,class :foreground ,fg-mark-del :slant
,modus-theme-slant)))
`(mu4e-title-face ((,class :foreground ,fg-main)))
@@ -3129,10 +3562,15 @@ Also bind `class' to ((class color) (min-colors 89))."
`(nxml-ref ((,class ,@(modus-vivendi-theme-syntax-foreground
green-alt-other green-alt-other-faint)
,@(modus-vivendi-theme-bold-weight))))
+;;;;; objed
+ `(objed-hl ((,class :background ,(if modus-vivendi-theme-intense-hl-line
+ bg-hl-alt-intense bg-hl-alt))))
+ `(objed-mark ((,class :background ,bg-active)))
+ `(objed-mode-line ((,class :foreground ,cyan-active)))
;;;;; orderless
`(orderless-match-face-0 ((,class :inherit bold
,@(modus-vivendi-theme-standard-completions
- blue-alt blue-nuanced-bg
+ blue-alt-other blue-nuanced-bg
blue-refine-bg blue-refine-fg))))
`(orderless-match-face-1 ((,class :inherit bold
,@(modus-vivendi-theme-standard-completions
@@ -3140,70 +3578,62 @@ Also bind `class' to ((class color) (min-colors 89))."
magenta-refine-bg magenta-refine-fg))))
`(orderless-match-face-2 ((,class :inherit bold
,@(modus-vivendi-theme-standard-completions
- green-alt-other green-nuanced-bg
+ green green-nuanced-bg
green-refine-bg green-refine-fg))))
`(orderless-match-face-3 ((,class :inherit bold
,@(modus-vivendi-theme-standard-completions
- yellow-alt-other yellow-nuanced-bg
+ yellow yellow-nuanced-bg
yellow-refine-bg yellow-refine-fg))))
;;;;; org
`(org-agenda-calendar-event ((,class :foreground ,fg-main)))
`(org-agenda-calendar-sexp ((,class :foreground ,cyan-alt)))
- `(org-agenda-clocking ((,class :inherit modus-theme-special-cold)))
+ `(org-agenda-clocking ((,class :inherit modus-theme-special-cold
+ ,@(and (>= emacs-major-version 27) '(:extend
t)))))
`(org-agenda-column-dateline ((,class :background ,bg-alt)))
- `(org-agenda-current-time ((,class :inherit modus-theme-subtle-cyan)))
- `(org-agenda-date ((,class :inherit ,modus-theme-variable-pitch :foreground
,cyan-alt-other
- ,@(modus-vivendi-theme-scale
modus-vivendi-theme-scale-4)
- ,@(modus-vivendi-theme-heading-block
cyan-nuanced-bg cyan-nuanced))))
- `(org-agenda-date-today ((,class :inherit (bold ,modus-theme-variable-pitch)
- :background ,cyan-intense-bg :foreground
,fg-main
- ,@(modus-vivendi-theme-scale
modus-vivendi-theme-scale-4))))
- `(org-agenda-date-weekend ((,class :inherit ,modus-theme-variable-pitch
:foreground ,cyan
- ,@(modus-vivendi-theme-scale
modus-vivendi-theme-scale-4)
- ,@(modus-vivendi-theme-heading-block
blue-nuanced-bg cyan-nuanced))))
+ `(org-agenda-current-time ((,class :inherit bold :foreground
,blue-alt-other)))
+ `(org-agenda-date ((,class :foreground ,cyan)))
+ `(org-agenda-date-today ((,class :inherit bold :foreground ,fg-main
:underline t)))
+ `(org-agenda-date-weekend ((,class :foreground ,cyan-alt-other)))
`(org-agenda-diary ((,class :foreground ,fg-main)))
- `(org-agenda-dimmed-todo-face ((,class :inherit
modus-theme-subtle-neutral)))
- `(org-agenda-done ((,class ,@(modus-vivendi-theme-org-todo-block
green-nuanced-bg green-nuanced green))))
+ `(org-agenda-dimmed-todo-face ((,class :inherit bold :foreground ,fg-alt)))
+ `(org-agenda-done ((,class :foreground ,green-alt)))
`(org-agenda-filter-category ((,class :inherit bold :foreground
,magenta-active)))
`(org-agenda-filter-effort ((,class :inherit bold :foreground
,magenta-active)))
`(org-agenda-filter-regexp ((,class :inherit bold :foreground
,magenta-active)))
`(org-agenda-filter-tags ((,class :inherit bold :foreground
,magenta-active)))
`(org-agenda-restriction-lock ((,class :background ,bg-dim :foreground
,fg-dim)))
- `(org-agenda-structure ((,class :inherit ,modus-theme-variable-pitch
- :foreground ,fg-special-mild
- ,@(modus-vivendi-theme-scale
modus-vivendi-theme-scale-3))))
+ `(org-agenda-structure ((,class :foreground ,blue-alt)))
`(org-archived ((,class :background ,bg-alt :foreground ,fg-alt)))
- `(org-block ((,class ,@(modus-vivendi-theme-org-block bg-dim)
- :inherit fixed-pitch :foreground ,fg-main)))
- `(org-block-begin-line ((,class ,@(modus-vivendi-theme-org-block-delim
+ `(org-block ((,class ,@(modus-vivendi-theme-mixed-fonts)
+ ,@(modus-vivendi-theme-org-block bg-dim)
+ :foreground ,fg-main)))
+ `(org-block-begin-line ((,class ,@(modus-vivendi-theme-mixed-fonts)
+ ,@(modus-vivendi-theme-org-block-delim
bg-dim fg-special-cold
- bg-alt fg-special-mild)
- :inherit fixed-pitch)))
+ bg-alt fg-special-mild))))
`(org-block-end-line ((,class :inherit org-block-begin-line)))
`(org-checkbox ((,class :box (:line-width 1 :color ,bg-active)
:background ,bg-inactive :foreground ,fg-active)))
- `(org-checkbox-statistics-done ((,class :foreground ,green
- ,@(modus-vivendi-theme-heading-block
- green-nuanced-bg
green-nuanced))))
- `(org-checkbox-statistics-todo ((,class
,@(modus-vivendi-theme-heading-foreground red-alt red)
- ,@(modus-vivendi-theme-heading-block
- red-nuanced-bg red-nuanced))))
+ `(org-checkbox-statistics-done ((,class :inherit org-done)))
+ `(org-checkbox-statistics-todo ((,class :inherit org-todo)))
`(org-clock-overlay ((,class :inherit modus-theme-special-cold)))
- `(org-code ((,class :inherit fixed-pitch :foreground ,magenta)))
+ `(org-code ((,class ,@(modus-vivendi-theme-mixed-fonts) :foreground
,magenta)))
`(org-column ((,class :background ,bg-alt)))
`(org-column-title ((,class :inherit bold :underline t :background
,bg-alt)))
- `(org-date ((,class :inherit fixed-pitch :foreground ,cyan-alt-other
:underline t)))
+ `(org-date ((,class :inherit (button fixed-pitch) :foreground
,cyan-alt-other)))
`(org-date-selected ((,class :inherit bold :foreground ,blue-alt
:inverse-video t)))
- `(org-default ((,class :background ,bg-main :foreground ,fg-main)))
`(org-document-info ((,class :foreground ,fg-special-cold)))
- `(org-document-info-keyword ((,class :inherit fixed-pitch :foreground
,fg-alt)))
+ `(org-document-info-keyword ((,class ,@(modus-vivendi-theme-mixed-fonts)
+ :foreground ,fg-alt)))
`(org-document-title ((,class :inherit (bold ,modus-theme-variable-pitch)
:foreground ,fg-special-cold
,@(modus-vivendi-theme-scale
modus-vivendi-theme-scale-5))))
- `(org-done ((,class ,@(modus-vivendi-theme-org-todo-block green-nuanced-bg
green-nuanced green))))
- `(org-drawer ((,class :foreground ,cyan-alt)))
+ `(org-done ((,class :box ,bg-region :background ,bg-dim :foreground
,green)))
+ `(org-drawer ((,class ,@(modus-vivendi-theme-mixed-fonts)
+ :foreground ,cyan)))
`(org-ellipsis ((,class :foreground nil))) ; inherits from the heading's
colour
- `(org-footnote ((,class :foreground ,blue-alt :underline t)))
- `(org-formula ((,class :inherit fixed-pitch :foreground ,red-alt)))
+ `(org-footnote ((,class :inherit button :foreground ,blue-alt)))
+ `(org-formula ((,class ,@(modus-vivendi-theme-mixed-fonts)
+ :foreground ,red-alt)))
`(org-habit-alert-face ((,class :inherit modus-theme-intense-yellow)))
`(org-habit-alert-future-face ((,class :inherit modus-theme-refine-yellow)))
`(org-habit-clear-face ((,class :inherit modus-theme-intense-magenta)))
@@ -3212,69 +3642,48 @@ Also bind `class' to ((class color) (min-colors 89))."
`(org-habit-overdue-future-face ((,class :inherit modus-theme-refine-red)))
`(org-habit-ready-face ((,class :inherit modus-theme-intense-blue)))
`(org-habit-ready-future-face ((,class :inherit modus-theme-refine-blue)))
- `(org-headline-done ((,class :foreground ,green-nuanced
- ,@(modus-vivendi-theme-heading-block
- green-nuanced-bg green-nuanced))))
+ `(org-headline-done ((,class :inherit ,modus-theme-variable-pitch
:foreground ,green-nuanced)))
+ `(org-headline-todo ((,class :inherit ,modus-theme-variable-pitch
:foreground ,red-nuanced)))
`(org-hide ((,class :foreground ,bg-main)))
`(org-indent ((,class :inherit (fixed-pitch org-hide))))
`(org-latex-and-related ((,class :foreground ,magenta-refine-fg)))
- `(org-level-1 ((,class :inherit (bold ,modus-theme-variable-pitch)
- ,@(modus-vivendi-theme-heading-foreground fg-main
magenta-alt-other)
- ,@(modus-vivendi-theme-scale
modus-vivendi-theme-scale-4)
- ,@(modus-vivendi-theme-heading-block
magenta-nuanced-bg magenta-nuanced))))
- `(org-level-2 ((,class :inherit (bold ,modus-theme-variable-pitch)
- ,@(modus-vivendi-theme-heading-foreground
fg-special-warm magenta-alt)
- ,@(modus-vivendi-theme-scale
modus-vivendi-theme-scale-3)
- ,@(modus-vivendi-theme-heading-block red-nuanced-bg
red-nuanced))))
- `(org-level-3 ((,class :inherit (bold ,modus-theme-variable-pitch)
- ,@(modus-vivendi-theme-heading-foreground
fg-special-cold blue)
- ,@(modus-vivendi-theme-scale
modus-vivendi-theme-scale-2)
- ,@(modus-vivendi-theme-heading-block blue-nuanced-bg
blue-nuanced))))
- `(org-level-4 ((,class :inherit (bold ,modus-theme-variable-pitch)
- ,@(modus-vivendi-theme-heading-foreground
fg-special-mild cyan)
- ,@(modus-vivendi-theme-scale
modus-vivendi-theme-scale-1)
- ,@(modus-vivendi-theme-heading-block cyan-nuanced-bg
cyan-nuanced))))
- `(org-level-5 ((,class :inherit (bold ,modus-theme-variable-pitch)
- ,@(modus-vivendi-theme-heading-foreground
fg-special-calm green-alt-other)
- ,@(modus-vivendi-theme-heading-block
green-nuanced-bg green-nuanced))))
- `(org-level-6 ((,class :inherit (bold ,modus-theme-variable-pitch)
- ,@(modus-vivendi-theme-heading-foreground
yellow-nuanced yellow-alt-other)
- ,@(modus-vivendi-theme-heading-block
yellow-nuanced-bg yellow-nuanced))))
- `(org-level-7 ((,class :inherit (bold ,modus-theme-variable-pitch)
- ,@(modus-vivendi-theme-heading-foreground
red-nuanced red-alt)
- ,@(modus-vivendi-theme-heading-block red-nuanced-bg
red-nuanced))))
- `(org-level-8 ((,class :inherit (bold ,modus-theme-variable-pitch)
- ,@(modus-vivendi-theme-heading-foreground fg-dim
magenta)
- ,@(modus-vivendi-theme-heading-block bg-alt
fg-alt))))
+ `(org-level-1 ((,class :inherit modus-theme-heading-1)))
+ `(org-level-2 ((,class :inherit modus-theme-heading-2)))
+ `(org-level-3 ((,class :inherit modus-theme-heading-3)))
+ `(org-level-4 ((,class :inherit modus-theme-heading-4)))
+ `(org-level-5 ((,class :inherit modus-theme-heading-5)))
+ `(org-level-6 ((,class :inherit modus-theme-heading-6)))
+ `(org-level-7 ((,class :inherit modus-theme-heading-7)))
+ `(org-level-8 ((,class :inherit modus-theme-heading-8)))
`(org-link ((,class :inherit link)))
`(org-list-dt ((,class :inherit bold)))
- `(org-macro ((,class :inherit org-latex-and-related)))
- `(org-meta-line ((,class :inherit fixed-pitch :background ,cyan-nuanced-bg
:foreground ,cyan-nuanced)))
+ `(org-macro ((,class :background ,blue-nuanced-bg :foreground
,magenta-alt-other)))
+ `(org-meta-line ((,class ,@(modus-vivendi-theme-mixed-fonts) :foreground
,fg-alt)))
`(org-mode-line-clock ((,class :foreground ,fg-main)))
`(org-mode-line-clock-overrun ((,class :inherit modus-theme-active-red)))
- `(org-priority ((,class ,@(modus-vivendi-theme-org-todo-block
magenta-nuanced-bg magenta-nuanced magenta)
- ,@(modus-vivendi-theme-heading-foreground magenta
magenta-alt-other))))
- `(org-quote ((,class ,@(if modus-vivendi-theme-org-blocks
- (append
- (and (>= emacs-major-version 27) '(:extend t))
- (list :background bg-dim))
- (list :background nil))
- :foreground ,fg-special-calm :slant
,modus-theme-slant)))
+ `(org-priority ((,class :box ,bg-region :background ,bg-dim :foreground
,magenta)))
+ `(org-property-value ((,class ,@(modus-vivendi-theme-mixed-fonts)
+ :foreground ,cyan-alt-other)))
+ `(org-quote ((,class ,@(modus-vivendi-theme-org-block bg-dim)
+ :foreground ,fg-special-cold :slant
,modus-theme-slant)))
`(org-scheduled ((,class :foreground ,fg-special-warm)))
`(org-scheduled-previously ((,class :foreground ,yellow-alt-other)))
`(org-scheduled-today ((,class :foreground ,magenta-alt-other)))
`(org-sexp-date ((,class :inherit org-date)))
- `(org-special-keyword ((,class ,@(modus-vivendi-theme-org-todo-block
cyan-nuanced-bg cyan-nuanced cyan-alt))))
- `(org-table ((,class :inherit fixed-pitch :foreground ,fg-special-cold)))
- `(org-tag ((,class ,@(modus-vivendi-theme-bold-weight) :foreground
,magenta-nuanced)))
+ `(org-special-keyword ((,class ,@(modus-vivendi-theme-mixed-fonts)
+ :foreground ,blue-nuanced)))
+ `(org-table ((,class ,@(modus-vivendi-theme-mixed-fonts)
+ :foreground ,fg-special-cold)))
+ `(org-table-header ((,class :inherit (fixed-pitch
modus-theme-intense-neutral))))
+ `(org-tag ((,class :foreground ,magenta-nuanced)))
`(org-tag-group ((,class :inherit bold :foreground ,cyan-nuanced)))
`(org-target ((,class :underline t)))
`(org-time-grid ((,class :foreground ,fg-unfocused)))
- `(org-todo ((,class ,@(modus-vivendi-theme-org-todo-block red-nuanced-bg
red-nuanced red-alt)
- ,@(modus-vivendi-theme-heading-foreground red-alt
red))))
+ `(org-todo ((,class :box ,bg-region :background ,bg-dim :foreground
,red-alt)))
`(org-upcoming-deadline ((,class :foreground ,red-alt-other)))
`(org-upcoming-distant-deadline ((,class :foreground ,red-nuanced)))
- `(org-verbatim ((,class :inherit fixed-pitch :background ,bg-alt
:foreground ,fg-special-calm)))
+ `(org-verbatim ((,class ,@(modus-vivendi-theme-mixed-fonts)
+ :background ,bg-alt :foreground ,fg-special-calm)))
`(org-verse ((,class :inherit org-quote)))
`(org-warning ((,class :inherit bold :foreground ,red-alt-other)))
;;;;; org-journal
@@ -3291,8 +3700,11 @@ Also bind `class' to ((class color) (min-colors 89))."
;;;;; org-recur
`(org-recur ((,class :foreground ,magenta-active)))
;;;;; org-roam
- `(org-roam-link ((,class :foreground ,blue-alt-other :underline t)))
- `(org-roam-backlink ((,class :foreground ,green-alt-other :underline t)))
+ `(org-roam-link ((,class :inherit button :foreground ,green)))
+ `(org-roam-link-current ((,class :inherit button :foreground ,green-alt)))
+ `(org-roam-link-invalid ((,class :inherit button :foreground ,red)))
+ `(org-roam-link-shielded ((,class :inherit button :foreground ,yellow)))
+ `(org-roam-tag ((,class :foreground ,fg-alt :slant italic)))
;;;;; org-superstar
`(org-superstar-item ((,class :foreground ,fg-main)))
`(org-superstar-leading ((,class :foreground ,fg-whitespace)))
@@ -3305,37 +3717,16 @@ Also bind `class' to ((class color) (min-colors 89))."
`(origami-fold-header-face ((,class :background ,bg-dim :foreground ,fg-dim
:box t)))
`(origami-fold-replacement-face ((,class :background ,bg-alt :foreground
,fg-alt)))
;;;;; outline-mode
- `(outline-1 ((,class :inherit (bold ,modus-theme-variable-pitch)
- ,@(modus-vivendi-theme-heading-foreground fg-main
magenta-alt-other)
- ,@(modus-vivendi-theme-scale
modus-vivendi-theme-scale-4)
- ,@(modus-vivendi-theme-heading-block
magenta-nuanced-bg magenta-nuanced))))
- `(outline-2 ((,class :inherit (bold ,modus-theme-variable-pitch)
- ,@(modus-vivendi-theme-heading-foreground
fg-special-warm magenta-alt)
- ,@(modus-vivendi-theme-scale
modus-vivendi-theme-scale-3)
- ,@(modus-vivendi-theme-heading-block red-nuanced-bg
red-nuanced))))
- `(outline-3 ((,class :inherit (bold ,modus-theme-variable-pitch)
- ,@(modus-vivendi-theme-heading-foreground
fg-special-cold blue)
- ,@(modus-vivendi-theme-scale
modus-vivendi-theme-scale-2)
- ,@(modus-vivendi-theme-heading-block blue-nuanced-bg
blue-nuanced))))
- `(outline-4 ((,class :inherit (bold ,modus-theme-variable-pitch)
- ,@(modus-vivendi-theme-heading-foreground
fg-special-mild cyan)
- ,@(modus-vivendi-theme-scale
modus-vivendi-theme-scale-1)
- ,@(modus-vivendi-theme-heading-block cyan-nuanced-bg
cyan-nuanced))))
- `(outline-5 ((,class :inherit (bold ,modus-theme-variable-pitch)
- ,@(modus-vivendi-theme-heading-foreground
fg-special-calm green-alt-other)
- ,@(modus-vivendi-theme-heading-block green-nuanced-bg
green-nuanced))))
- `(outline-6 ((,class :inherit (bold ,modus-theme-variable-pitch)
- ,@(modus-vivendi-theme-heading-foreground
yellow-nuanced yellow-alt-other)
- ,@(modus-vivendi-theme-heading-block yellow-nuanced-bg
yellow-nuanced))))
- `(outline-7 ((,class :inherit (bold ,modus-theme-variable-pitch)
- ,@(modus-vivendi-theme-heading-foreground red-nuanced
red-alt)
- ,@(modus-vivendi-theme-heading-block red-nuanced-bg
red-nuanced))))
- `(outline-8 ((,class :inherit (bold ,modus-theme-variable-pitch)
- ,@(modus-vivendi-theme-heading-foreground fg-dim
magenta)
- ,@(modus-vivendi-theme-heading-block bg-alt fg-alt))))
+ `(outline-1 ((,class :inherit modus-theme-heading-1)))
+ `(outline-2 ((,class :inherit modus-theme-heading-2)))
+ `(outline-3 ((,class :inherit modus-theme-heading-3)))
+ `(outline-4 ((,class :inherit modus-theme-heading-4)))
+ `(outline-5 ((,class :inherit modus-theme-heading-5)))
+ `(outline-6 ((,class :inherit modus-theme-heading-6)))
+ `(outline-7 ((,class :inherit modus-theme-heading-7)))
+ `(outline-8 ((,class :inherit modus-theme-heading-8)))
;;;;; outline-minor-faces
- `(outline-minor-0 ((,class ,@(unless modus-vivendi-theme-section-headings
- (list :background cyan-nuanced-bg)))))
+ `(outline-minor-0 ((,class nil)))
;;;;; package (M-x list-packages)
`(package-description ((,class :foreground ,fg-special-cold)))
`(package-help-section-name ((,class :inherit bold :foreground
,magenta-alt-other)))
@@ -3423,6 +3814,23 @@ Also bind `class' to ((class color) (min-colors 89))."
`(prodigy-green-face ((,class :foreground ,green)))
`(prodigy-red-face ((,class :foreground ,red)))
`(prodigy-yellow-face ((,class :foreground ,yellow)))
+;;;;; racket-mode
+ `(racket-debug-break-face ((,class :inherit modus-theme-intense-red)))
+ `(racket-debug-locals-face ((,class :box (:line-width -1 :color nil)
+ :foreground ,green-alt-other)))
+ `(racket-debug-result-face ((,class :inherit bold :box (:line-width -1
:color nil)
+ :foreground ,green)))
+ `(racket-here-string-face ((,class :foreground ,blue-alt)))
+ `(racket-keyword-argument-face ((,class :foreground ,red-alt)))
+ `(racket-logger-config-face ((,class :foreground ,fg-alt :slant
,modus-theme-slant)))
+ `(racket-logger-debug-face ((,class :foreground ,blue-alt-other)))
+ `(racket-logger-info-face ((,class :foreground ,fg-lang-note)))
+ `(racket-logger-topic-face ((,class :foreground ,magenta :slant
,modus-theme-slant)))
+ `(racket-selfeval-face ((,class :foreground ,green-alt)))
+ `(racket-xp-error-face
+ ((,(append '((supports :underline (:style wave))) class)
+ :underline (:color ,fg-lang-error :style wave))
+ (,class :foreground ,fg-lang-error :underline t)))
;;;;; rainbow-blocks
`(rainbow-blocks-depth-1-face ((,class :foreground ,magenta-alt-other)))
`(rainbow-blocks-depth-2-face ((,class :foreground ,blue)))
@@ -3544,24 +3952,19 @@ Also bind `class' to ((class color) (min-colors 89))."
'modus-theme-nuanced-blue
blue-alt-other))))
;;;;; selectrum
- `(selectrum-current-candidate ((,class
,@(modus-vivendi-theme-extra-completions
- 'modus-theme-refine-magenta
- 'modus-theme-intense-magenta
- 'modus-theme-nuanced-magenta
- magenta
- 'bold))))
- `(selectrum-primary-highlight ((,class
,@(modus-vivendi-theme-extra-completions
- 'modus-theme-refine-blue
- 'modus-theme-intense-blue
- 'modus-theme-nuanced-blue
- blue
- 'bold))))
- `(selectrum-secondary-highlight ((,class
,@(modus-vivendi-theme-extra-completions
- 'modus-theme-refine-cyan
- 'modus-theme-intense-cyan
- 'modus-theme-nuanced-cyan
- cyan
- 'bold))))
+ `(selectrum-current-candidate
+ ((,class :inherit bold :foreground ,fg-main :underline ,fg-main
+ :background ,@(pcase modus-vivendi-theme-completions
+ ('opinionated (list bg-active))
+ (_ (list bg-inactive))))))
+ `(selectrum-primary-highlight ((,class :inherit bold
+
,@(modus-vivendi-theme-standard-completions
+ magenta-alt magenta-nuanced-bg
+ magenta-refine-bg
magenta-refine-fg))))
+ `(selectrum-secondary-highlight ((,class :inherit bold
+
,@(modus-vivendi-theme-standard-completions
+ cyan-alt-other cyan-nuanced-bg
+ cyan-refine-bg
cyan-refine-fg))))
;;;;; semantic
`(semantic-complete-inline-face ((,class :foreground ,fg-special-warm
:underline t)))
`(semantic-decoration-on-private-members-face ((,class :inherit
modus-theme-refine-cyan)))
@@ -3628,23 +4031,13 @@ Also bind `class' to ((class color) (min-colors 89))."
`(sp-wrap-overlay-opening-pair ((,class :inherit sp-pair-overlay-face)))
`(sp-wrap-tag-overlay-face ((,class :inherit sp-pair-overlay-face)))
;;;;; smerge
- `(smerge-base ((,class ,@(modus-vivendi-theme-diffs
- bg-main yellow
- bg-diff-focus-changed fg-diff-focus-changed))))
- `(smerge-lower ((,class ,@(modus-vivendi-theme-diffs
- bg-main green
- bg-diff-focus-added fg-diff-focus-added))))
+ `(smerge-base ((,class :inherit modus-theme-diff-changed)))
+ `(smerge-lower ((,class :inherit modus-theme-diff-added)))
`(smerge-markers ((,class :background ,bg-diff-neutral-2 :foreground
,fg-diff-neutral-2)))
- `(smerge-refined-added ((,class ,@(modus-vivendi-theme-diffs
- bg-diff-added fg-diff-added
- bg-diff-refine-added
fg-diff-refine-added))))
+ `(smerge-refined-added ((,class :inherit modus-theme-diff-refine-added)))
`(smerge-refined-changed ((,class)))
- `(smerge-refined-removed ((,class ,@(modus-vivendi-theme-diffs
- bg-diff-removed fg-diff-removed
- bg-diff-refine-removed
fg-diff-refine-removed))))
- `(smerge-upper ((,class ,@(modus-vivendi-theme-diffs
- bg-main red
- bg-diff-focus-removed fg-diff-focus-removed))))
+ `(smerge-refined-removed ((,class :inherit
modus-theme-diff-refine-removed)))
+ `(smerge-upper ((,class :inherit modus-theme-diff-removed)))
;;;;; spaceline
`(spaceline-evil-emacs ((,class :inherit modus-theme-active-magenta)))
`(spaceline-evil-insert ((,class :inherit modus-theme-active-green)))
@@ -3804,7 +4197,7 @@ Also bind `class' to ((class color) (min-colors 89))."
`(trashed-mark ((,class :inherit modus-theme-mark-symbol)))
`(trashed-marked ((,class :inherit modus-theme-mark-alt)))
`(trashed-restored ((,class :inherit modus-theme-mark-sel)))
- `(trashed-symlink ((,class :foreground ,cyan-alt :underline t)))
+ `(trashed-symlink ((,class :inherit button :foreground ,cyan-alt)))
;;;;; treemacs
`(treemacs-directory-collapsed-face ((,class :foreground ,magenta-alt)))
`(treemacs-directory-face ((,class :inherit dired-directory)))
@@ -3870,39 +4263,33 @@ Also bind `class' to ((class color) (min-colors 89))."
`(tuareg-opam-pkg-variable-name-face ((,class
,@(modus-vivendi-theme-syntax-foreground
cyan cyan-faint)
:slant ,modus-theme-slant)))
+;;;;; typescript
+ `(typescript-jsdoc-tag ((,class :foreground ,fg-special-mild :slant
,modus-theme-slant)))
+ `(typescript-jsdoc-type ((,class :foreground ,fg-special-calm :slant
,modus-theme-slant)))
+ `(typescript-jsdoc-value ((,class :foreground ,fg-special-cold :slant
,modus-theme-slant)))
;;;;; undo-tree
`(undo-tree-visualizer-active-branch-face ((,class :inherit bold
:foreground ,fg-main)))
`(undo-tree-visualizer-current-face ((,class :foreground ,blue-intense)))
`(undo-tree-visualizer-default-face ((,class :foreground ,fg-alt)))
`(undo-tree-visualizer-register-face ((,class :foreground
,magenta-intense)))
`(undo-tree-visualizer-unmodified-face ((,class :foreground
,green-intense)))
-;;;;; vc
- `(vc-conflict-state ((,class ,@(modus-vivendi-theme-bold-weight)
:foreground ,red-active)))
- `(vc-edited-state ((,class :foreground ,fg-special-warm)))
+;;;;; vc (vc-hooks.el)
+ `(vc-conflict-state ((,class :foreground ,red-active :slant
,modus-theme-slant)))
+ `(vc-edited-state ((,class :foreground ,yellow-active)))
`(vc-locally-added-state ((,class :foreground ,cyan-active)))
- `(vc-locked-state ((,class ,@(modus-vivendi-theme-bold-weight) :foreground
,magenta-active)))
- `(vc-missing-state ((,class ,@(modus-vivendi-theme-bold-weight) :foreground
,yellow-active)))
- `(vc-needs-update-state ((,class ,@(modus-vivendi-theme-bold-weight)
:foreground ,fg-special-mild)))
+ `(vc-locked-state ((,class :foreground ,blue-active)))
+ `(vc-missing-state ((,class :foreground ,magenta-active :slant
,modus-theme-slant)))
+ `(vc-needs-update-state ((,class :foreground ,green-active :slant
,modus-theme-slant)))
`(vc-removed-state ((,class :foreground ,red-active)))
`(vc-state-base ((,class :foreground ,fg-active)))
`(vc-up-to-date-state ((,class :foreground ,fg-special-cold)))
;;;;; vdiff
- `(vdiff-addition-face ((,class ,@(modus-vivendi-theme-diffs
- bg-main green
- bg-diff-focus-added
fg-diff-focus-added))))
- `(vdiff-change-face ((,class ,@(modus-vivendi-theme-diffs
- bg-main yellow
- bg-diff-focus-changed
fg-diff-focus-changed))))
+ `(vdiff-addition-face ((,class :inherit modus-theme-diff-added)))
+ `(vdiff-change-face ((,class :inherit modus-theme-diff-changed)))
`(vdiff-closed-fold-face ((,class :background ,bg-diff-neutral-1
:foreground ,fg-diff-neutral-1)))
- `(vdiff-refine-added ((,class ,@(modus-vivendi-theme-diffs
- bg-diff-added fg-diff-added
- bg-diff-refine-added
fg-diff-refine-added))))
- `(vdiff-refine-changed ((,class ,@(modus-vivendi-theme-diffs
- bg-diff-changed fg-diff-changed
- bg-diff-refine-changed
fg-diff-refine-changed))))
- `(vdiff-subtraction-face ((,class ,@(modus-vivendi-theme-diffs
- bg-main red
- bg-diff-focus-removed
fg-diff-focus-removed))))
+ `(vdiff-refine-added ((,class :inherit modus-theme-diff-refine-added)))
+ `(vdiff-refine-changed ((,class :inherit modus-theme-diff-refine-changed)))
+ `(vdiff-subtraction-face ((,class :inherit modus-theme-diff-removed)))
`(vdiff-target-face ((,class :inherit modus-theme-intense-blue)))
;;;;; vimish-fold
`(vimish-fold-fringe ((,class :foreground ,cyan-active)))
@@ -3925,7 +4312,7 @@ Also bind `class' to ((class color) (min-colors 89))."
`(vhl/default-face ((,class ,@(and (>= emacs-major-version 27) '(:extend t))
:background ,bg-alt :foreground ,blue-nuanced)))
;;;;; vterm
- `(vterm-color-black ((,class :background "black" :foreground "black")))
+ `(vterm-color-black ((,class :background "gray35" :foreground "gray35")))
`(vterm-color-blue ((,class :background ,blue :foreground ,blue)))
`(vterm-color-cyan ((,class :background ,cyan :foreground ,cyan)))
`(vterm-color-default ((,class :background ,bg-main :foreground ,fg-main)))
@@ -3934,7 +4321,7 @@ Also bind `class' to ((class color) (min-colors 89))."
`(vterm-color-magenta ((,class :background ,magenta :foreground ,magenta)))
`(vterm-color-red ((,class :background ,red :foreground ,red)))
`(vterm-color-underline ((,class :foreground ,fg-special-warm :underline
t)))
- `(vterm-color-white ((,class :background "white" :foreground "white")))
+ `(vterm-color-white ((,class :background "gray65" :foreground "gray65")))
`(vterm-color-yellow ((,class :background ,yellow :foreground ,yellow)))
;;;;; wcheck-mode
`(wcheck-default-face ((,class :foreground ,red :underline t)))
@@ -4135,7 +4522,6 @@ Also bind `class' to ((class color) (min-colors 89))."
`(ztreep-node-count-children-face ((,class :foreground ,fg-special-warm)))
`(ztreep-node-face ((,class :foreground ,fg-main))))
;;;; Emacs 27+
- ;; EXPERIMENTAL this form is subject to review
(when (>= emacs-major-version 27)
(custom-theme-set-faces
'modus-vivendi
@@ -4143,8 +4529,12 @@ Also bind `class' to ((class color) (min-colors 89))."
;; NOTE that this is specifically for the faces that were
;; introduced in Emacs 27, as the other faces are already
;; supported.
- `(line-number-major-tick ((,class (:background ,yellow-nuanced-bg
:foreground ,yellow-nuanced))))
- `(line-number-minor-tick ((,class (:background ,cyan-nuanced-bg
:foreground ,cyan-nuanced))))
+ `(line-number-major-tick ((,class :inherit (bold default)
+ :background ,yellow-nuanced-bg
+ :foreground ,yellow-nuanced)))
+ `(line-number-minor-tick ((,class :inherit (bold default)
+ :background ,bg-inactive
+ :foreground ,fg-inactive)))
;;;;; tab-bar-mode
`(tab-bar ((,class :background ,bg-tab-bar :foreground ,fg-main)))
`(tab-bar-tab ((,class :inherit bold :box (:line-width 2 :color
,bg-tab-active)
@@ -4160,12 +4550,22 @@ Also bind `class' to ((class color) (min-colors 89))."
`(tab-line-tab-current ((,class :inherit tab-line-tab)))
`(tab-line-tab-inactive ((,class :box (:line-width 2 :color
,bg-tab-inactive)
:background ,bg-tab-inactive :foreground
,fg-dim)))))
+;;;; Emacs 28+
+ (when (>= emacs-major-version 28)
+ (custom-theme-set-faces
+ 'modus-vivendi
+;;;;; isearch regexp groups
+ `(isearch-group-1 ((,class :inherit modus-theme-intense-blue)))
+ `(isearch-group-2 ((,class :inherit modus-theme-intense-magenta)))))
;;; variables
(custom-theme-set-variables
'modus-vivendi
;;;; ansi-colors
`(ansi-color-faces-vector [default bold shadow italic underline success
warning error])
`(ansi-color-names-vector [,bg-main ,red ,green ,yellow ,blue ,magenta
,cyan ,fg-main])
+;;;; awesome-tray
+ `(awesome-tray-mode-line-active-color ,blue)
+ `(awesome-tray-mode-line-inactive-color ,bg-active)
;;;; flymake fringe indicators
`(flymake-error-bitmap '(flymake-double-exclamation-mark
modus-theme-fringe-red))
`(flymake-warning-bitmap '(exclamation-mark modus-theme-fringe-yellow))
@@ -4174,7 +4574,7 @@ Also bind `class' to ((class color) (min-colors 89))."
`(ibuffer-deletion-face 'modus-theme-mark-del)
`(ibuffer-filter-group-name-face 'modus-theme-mark-symbol)
`(ibuffer-marked-face 'modus-theme-mark-sel)
- `(ibuffer-title-face 'modus-theme-header)
+ `(ibuffer-title-face 'modus-theme-pseudo-header)
;;;; highlight-tail
`(highlight-tail-colors
'((,green-subtle-bg . 0)
diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el
index c998a8a..eb62a85 100644
--- a/lisp/arc-mode.el
+++ b/lisp/arc-mode.el
@@ -41,8 +41,7 @@
;; changes will first take effect when the archive buffer
;; is saved. You will be warned about this.
;;
-;; * dos-fns.el: (Part of Emacs 19). You get automatic ^M^J <--> ^J
-;; conversion.
+;; * dos-fns.el: You get automatic ^M^J <--> ^J conversion.
;;
;; arc-mode.el does not work well with crypt++.el; for the archives as
;; such this could be fixed (but wouldn't be useful) by declaring such
diff --git a/lisp/button.el b/lisp/button.el
index 1131760..ba06823 100644
--- a/lisp/button.el
+++ b/lisp/button.el
@@ -493,12 +493,17 @@ butting, use the `button-describe' command."
t))))
(defun button--help-echo (button)
- "Evaluate BUTTON's `help-echo' property and return its value."
- (let ((help (button-get button 'help-echo)))
- (if (functionp help)
- (let ((obj (if (overlayp button) button (current-buffer))))
- (funcall help (selected-window) obj (button-start button)))
- (eval help lexical-binding))))
+ "Evaluate BUTTON's `help-echo' property and return its value.
+If the result is non-nil, pass it through `substitute-command-keys'
+before returning it, as is done for `show-help-function'."
+ (let* ((help (button-get button 'help-echo))
+ (help (if (functionp help)
+ (funcall help
+ (selected-window)
+ (if (overlayp button) button (current-buffer))
+ (button-start button))
+ (eval help lexical-binding))))
+ (and help (substitute-command-keys help))))
(defun forward-button (n &optional wrap display-message no-error)
"Move to the Nth next button, or Nth previous button if N is negative.
diff --git a/lisp/calc/calc-ext.el b/lisp/calc/calc-ext.el
index fc0a2c8..c48d159 100644
--- a/lisp/calc/calc-ext.el
+++ b/lisp/calc/calc-ext.el
@@ -3094,6 +3094,7 @@ If X is not an error form, return 1."
(defvar math-read-big-baseline)
(defvar math-read-big-h2)
(defvar math-read-big-err-msg)
+(defvar math-read-big-lines)
(defun math-read-big-expr (str)
(and (> (length calc-left-label) 0)
@@ -3138,41 +3139,42 @@ If X is not an error form, return 1."
(defvar math-rb-h2)
-(defun math-read-big-bigp (math-read-big-lines)
- (and (cdr math-read-big-lines)
- (let ((matrix nil)
- (v 0)
- (height (if (> (length (car math-read-big-lines)) 0) 1 0)))
- (while (and (cdr math-read-big-lines)
- (let* ((i 0)
- j
- (l1 (car math-read-big-lines))
- (l2 (nth 1 math-read-big-lines))
- (len (min (length l1) (length l2))))
- (if (> (length l2) 0)
- (setq height (1+ height)))
- (while (and (< i len)
- (or (memq (aref l1 i) '(?\ ?\- ?\_))
- (memq (aref l2 i) '(?\ ?\-))
- (and (memq (aref l1 i) '(?\| ?\,))
- (= (aref l2 i) (aref l1 i)))
- (and (eq (aref l1 i) ?\[)
- (eq (aref l2 i) ?\[)
- (let ((math-rb-h2 (length l1)))
- (setq j (math-read-big-balance
- (1+ i) v "[")))
- (setq i (1- j)))))
- (setq i (1+ i)))
- (or (= i len)
- (and (eq (aref l1 i) ?\[)
- (eq (aref l2 i) ?\[)
- (setq matrix t)
- nil))))
- (setq math-read-big-lines (cdr math-read-big-lines)
- v (1+ v)))
- (or (and (> height 1)
- (not (cdr math-read-big-lines)))
- matrix))))
+(defun math-read-big-bigp (read-big-lines)
+ (when (cdr read-big-lines)
+ (let ((math-read-big-lines read-big-lines)
+ (matrix nil)
+ (v 0)
+ (height (if (> (length (car read-big-lines)) 0) 1 0)))
+ (while (and (cdr math-read-big-lines)
+ (let* ((i 0)
+ j
+ (l1 (car math-read-big-lines))
+ (l2 (nth 1 math-read-big-lines))
+ (len (min (length l1) (length l2))))
+ (if (> (length l2) 0)
+ (setq height (1+ height)))
+ (while (and (< i len)
+ (or (memq (aref l1 i) '(?\ ?\- ?\_))
+ (memq (aref l2 i) '(?\ ?\-))
+ (and (memq (aref l1 i) '(?\| ?\,))
+ (= (aref l2 i) (aref l1 i)))
+ (and (eq (aref l1 i) ?\[)
+ (eq (aref l2 i) ?\[)
+ (let ((math-rb-h2 (length l1)))
+ (setq j (math-read-big-balance
+ (1+ i) v "[")))
+ (setq i (1- j)))))
+ (setq i (1+ i)))
+ (or (= i len)
+ (and (eq (aref l1 i) ?\[)
+ (eq (aref l2 i) ?\[)
+ (setq matrix t)
+ nil))))
+ (setq math-read-big-lines (cdr math-read-big-lines)
+ v (1+ v)))
+ (or (and (> height 1)
+ (not (cdr math-read-big-lines)))
+ matrix))))
;;; Nontrivial "flat" formatting.
diff --git a/lisp/calc/calc-graph.el b/lisp/calc/calc-graph.el
index 82e9335..829fa44 100644
--- a/lisp/calc/calc-graph.el
+++ b/lisp/calc/calc-graph.el
@@ -313,6 +313,7 @@
(defvar calc-graph-blank)
(defvar calc-graph-non-blank)
(defvar calc-graph-curve-num)
+(defvar math-arglist)
(defun calc-graph-plot (flag &optional printing)
(interactive "P")
diff --git a/lisp/calc/calc-map.el b/lisp/calc/calc-map.el
index 57483fc..0ee8282 100644
--- a/lisp/calc/calc-map.el
+++ b/lisp/calc/calc-map.el
@@ -493,6 +493,8 @@
(defvar calc-get-operator-history nil
"History for calc-get-operator.")
+(defvar math-arglist)
+
(defun calc-get-operator (msg &optional nargs)
(setq calc-aborted-prefix nil)
(let ((inv nil) (hyp nil) (prefix nil) (forcenargs nil)
diff --git a/lisp/calc/calc-misc.el b/lisp/calc/calc-misc.el
index 7c97dc6..2db09e2 100644
--- a/lisp/calc/calc-misc.el
+++ b/lisp/calc/calc-misc.el
@@ -757,19 +757,21 @@ loaded and the keystroke automatically re-typed."
;; The variable math-trunc-prec is local to math-trunc, but used by
;; math-trunc-fancy in calc-arith.el, which is called by math-trunc.
+(defvar math-trunc-prec)
;;;###autoload
-(defun math-trunc (a &optional math-trunc-prec)
- (cond (math-trunc-prec
+(defun math-trunc (a &optional trunc-prec)
+ (cond (trunc-prec
(require 'calc-ext)
- (math-trunc-special a math-trunc-prec))
+ (math-trunc-special a trunc-prec))
((Math-integerp a) a)
((Math-looks-negp a)
(math-neg (math-trunc (math-neg a))))
((eq (car a) 'float)
(math-scale-int (nth 1 a) (nth 2 a)))
(t (require 'calc-ext)
- (math-trunc-fancy a))))
+ (let ((math-trunc-prec trunc-prec))
+ (math-trunc-fancy a)))))
;;;###autoload
(defalias 'calcFunc-trunc 'math-trunc)
@@ -777,12 +779,13 @@ loaded and the keystroke automatically re-typed."
;; The variable math-floor-prec is local to math-floor, but used by
;; math-floor-fancy in calc-arith.el, which is called by math-floor.
+(defvar math-floor-prec)
;;;###autoload
-(defun math-floor (a &optional math-floor-prec) ; [Public]
- (cond (math-floor-prec
+(defun math-floor (a &optional floor-prec) ; [Public]
+ (cond (floor-prec
(require 'calc-ext)
- (math-floor-special a math-floor-prec))
+ (math-floor-special a floor-prec))
((Math-integerp a) a)
((Math-messy-integerp a) (math-trunc a))
((Math-realp a)
@@ -790,7 +793,9 @@ loaded and the keystroke automatically re-typed."
(math-add (math-trunc a) -1)
(math-trunc a)))
(t (require 'calc-ext)
- (math-floor-fancy a))))
+ (let ((math-floor-prec floor-prec))
+ (math-floor-fancy a)))))
+
;;;###autoload
(defalias 'calcFunc-floor 'math-floor)
diff --git a/lisp/calc/calc-nlfit.el b/lisp/calc/calc-nlfit.el
index 6f2a601..5ed85fe 100644
--- a/lisp/calc/calc-nlfit.el
+++ b/lisp/calc/calc-nlfit.el
@@ -665,6 +665,8 @@
(calc-handle-whys))
(defvar calc-curve-nvars)
+(defvar calc-curve-varnames)
+(defvar calc-curve-coefnames)
(defun math-nlfit-fit-curve (fn grad solnexpr initparms &optional sdv)
(calc-slow-wrapper
diff --git a/lisp/calc/calc-sel.el b/lisp/calc/calc-sel.el
index d294448..23c0e01 100644
--- a/lisp/calc/calc-sel.el
+++ b/lisp/calc/calc-sel.el
@@ -419,6 +419,7 @@
;; The variable math-comp-sel-tag is local to calc-find-selected-part,
;; but is used by math-comp-sel-flat-term and math-comp-add-string-sel
;; in calccomp.el, which are called (indirectly) by calc-find-selected-part.
+(defvar math-comp-sel-tag)
(defun calc-find-selected-part ()
(let* ((math-comp-sel-hpos (- (current-column) calc-selection-cache-offset))
@@ -437,7 +438,8 @@
(current-indentation))
lcount (1+ lcount)))
(- lcount (math-comp-ascent
- calc-selection-cache-comp) -1))))
+ calc-selection-cache-comp)
+ -1))))
(math-comp-sel-cpos (- (point) toppt calc-selection-cache-offset
spaces lcount))
(math-comp-sel-tag nil))
diff --git a/lisp/calc/calcalg2.el b/lisp/calc/calcalg2.el
index 99d0549..7894bd9 100644
--- a/lisp/calc/calcalg2.el
+++ b/lisp/calc/calcalg2.el
@@ -3259,16 +3259,16 @@
(let ((math-solve-simplifying t))
(math-solve-system-rec exprs math-solve-vars nil)))))
-;;; The following backtracking solver works by choosing a variable
-;;; and equation, and trying to solve the equation for the variable.
-;;; If it succeeds it calls itself recursively with that variable and
-;;; equation removed from their respective lists, and with the solution
-;;; added to solns as well as being substituted into all existing
-;;; equations. The algorithm terminates when any solution path
-;;; manages to remove all the variables from var-list.
-
-;;; To support calcFunc-roots, entries in eqn-list and solns are
-;;; actually lists of equations.
+;; The following backtracking solver works by choosing a variable
+;; and equation, and trying to solve the equation for the variable.
+;; If it succeeds it calls itself recursively with that variable and
+;; equation removed from their respective lists, and with the solution
+;; added to solns as well as being substituted into all existing
+;; equations. The algorithm terminates when any solution path
+;; manages to remove all the variables from `var-list'.
+
+;; To support calcFunc-roots, entries in eqn-list and solns are
+;; actually lists of equations.
;; The variables math-solve-system-res and math-solve-system-vv are
;; local to math-solve-system-rec, but are used by math-solve-system-subst.
diff --git a/lisp/calc/calcsel2.el b/lisp/calc/calcsel2.el
index faec230..d6842aa 100644
--- a/lisp/calc/calcsel2.el
+++ b/lisp/calc/calcsel2.el
@@ -34,6 +34,7 @@
;; The variable calc-sel-reselect is local to the methods below,
;; but is used by some functions in calc-sel.el which are called
;; by the functions below.
+(defvar calc-sel-reselect)
(defun calc-commute-left (arg)
(interactive "p")
diff --git a/lisp/cedet/semantic.el b/lisp/cedet/semantic.el
index 94bb7fa..71321e1 100644
--- a/lisp/cedet/semantic.el
+++ b/lisp/cedet/semantic.el
@@ -195,13 +195,13 @@ during a flush when the cache is given a new value of
nil.")
(make-variable-buffer-local 'semantic-parse-tree-state)
(defmacro semantic-parse-tree-unparseable ()
- "Indicate that the current buffer is unparsable.
+ "Indicate that the current buffer is unparseable.
It is also true that the parse tree will need either updating or
a rebuild. This state will be changed when the user edits the buffer."
'(setq semantic-parse-tree-state 'unparseable))
(defmacro semantic-parse-tree-unparseable-p ()
- "Return non-nil if the current buffer has been marked unparsable."
+ "Return non-nil if the current buffer has been marked unparseable."
'(eq semantic-parse-tree-state 'unparseable))
(defmacro semantic-parse-tree-set-needs-update ()
@@ -539,14 +539,14 @@ If the buffer cache is out of date, attempt an
incremental reparse.
If the buffer has not been parsed before, or if the incremental reparse
fails, then parse the entire buffer.
If a lexical error had been previously discovered and the buffer
-was marked unparsable, then do nothing, and return the cache."
+was marked unparseable, then do nothing, and return the cache."
(and
;; Is this a semantic enabled buffer?
(semantic-active-p)
;; Application hooks say the buffer is safe for parsing
(run-hook-with-args-until-failure
'semantic--before-fetch-tags-hook)
- ;; If the buffer was previously marked unparsable,
+ ;; If the buffer was previously marked unparseable,
;; then don't waste our time.
(not (semantic-parse-tree-unparseable-p))
;; The parse tree actually needs to be refreshed
@@ -617,7 +617,7 @@ Does nothing if the current buffer doesn't need reparsing."
;; do them here, then all the bovination hooks are not run, and
;; we save lots of time.
(cond
- ;; If the buffer was previously marked unparsable,
+ ;; If the buffer was previously marked unparseable,
;; then don't waste our time.
((semantic-parse-tree-unparseable-p)
nil)
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 3c93753..510c6e3 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -3205,6 +3205,7 @@ face attributes (as specified by a `default' defface
entry)."
:convert-widget 'custom-face-edit-convert-widget
:args (mapcar (lambda (att)
(list 'group :inline t
+ :format "%v"
:sibling-args (widget-get (nth 1 att) :sibling-args)
(list 'const :format "" :value (nth 0 att))
(nth 1 att)))
diff --git a/lisp/emacs-lisp/backquote.el b/lisp/emacs-lisp/backquote.el
index 8567a3a..5413022 100644
--- a/lisp/emacs-lisp/backquote.el
+++ b/lisp/emacs-lisp/backquote.el
@@ -1,4 +1,4 @@
-;;; backquote.el --- implement the ` Lisp construct
+;;; backquote.el --- implement the ` Lisp construct -*- lexical-binding: t -*-
;; Copyright (C) 1990, 1992, 1994, 2001-2020 Free Software Foundation,
;; Inc.
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index 7ff6d68..f10dc13 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -4461,7 +4461,6 @@ reinstrument it."
(defun edebug-temp-display-freq-count ()
"Temporarily display the frequency count data for the current definition.
It is removed when you hit any char."
- ;; This seems not to work with Emacs 18.59. It undoes too far.
(interactive)
(let ((inhibit-read-only t))
(undo-boundary)
diff --git a/lisp/emacs-lisp/ert-x.el b/lisp/emacs-lisp/ert-x.el
index 6569b8c..abbff6d 100644
--- a/lisp/emacs-lisp/ert-x.el
+++ b/lisp/emacs-lisp/ert-x.el
@@ -30,6 +30,7 @@
(eval-when-compile (require 'cl-lib))
(require 'ert)
+(require 'subr-x) ; string-trim
;;; Test buffers.
@@ -353,6 +354,45 @@ convert it to a string and pass it to COLLECTOR first."
(funcall func object)))
(funcall func object printcharfun))))
+(defvar ert-resource-directory-format "%s-resources/"
+ "Format for `ert-resource-directory'.")
+(defvar ert-resource-directory-trim-left-regexp ""
+ "Regexp for `string-trim' (left) used by `ert-resource-directory'.")
+(defvar ert-resource-directory-trim-right-regexp "\\(-tests?\\)?\\.el"
+ "Regexp for `string-trim' (right) used by `ert-resource-directory'.")
+
+;; Has to be a macro for `load-file-name'.
+(defmacro ert-resource-directory ()
+ "Return absolute file name of the resource directory for this file.
+
+The path to the resource directory is the \"resources\" directory
+in the same directory as the test file.
+
+If that directory doesn't exist, use the directory named like the
+test file but formatted by `ert-resource-directory-format' and trimmed
+using `string-trim' with arguments
+`ert-resource-directory-trim-left-regexp' and
+`ert-resource-directory-trim-right-regexp'. The default values mean
+that if called from a test file named \"foo-tests.el\", return
+the absolute file name for \"foo-resources\"."
+ `(let* ((testfile ,(or (bound-and-true-p byte-compile-current-file)
+ (and load-in-progress load-file-name)
+ buffer-file-name))
+ (default-directory (file-name-directory testfile)))
+ (file-truename
+ (if (file-accessible-directory-p "resources/")
+ (expand-file-name "resources/")
+ (expand-file-name
+ (format ert-resource-directory-format
+ (string-trim testfile
+ ert-resource-directory-trim-left-regexp
+ ert-resource-directory-trim-right-regexp)))))))
+
+(defmacro ert-resource-file (file)
+ "Return file name of resource file named FILE.
+A resource file is in the resource directory as per
+`ert-resource-directory'."
+ `(expand-file-name ,file (ert-resource-directory)))
(provide 'ert-x)
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 724e89d..56f000b 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -2152,6 +2152,7 @@ Downloads and installs required packages as needed."
(unless (package--user-selected-p name)
(package--save-selected-packages
(cons name package-selected-packages)))
+ (package--quickstart-maybe-refresh)
pkg-desc))
;;;###autoload
diff --git a/lisp/emacs-lisp/pp.el b/lisp/emacs-lisp/pp.el
index 3df7b0e..eb2ee94 100644
--- a/lisp/emacs-lisp/pp.el
+++ b/lisp/emacs-lisp/pp.el
@@ -164,8 +164,11 @@ With argument, pretty-print output into current buffer.
Ignores leading comment characters."
(interactive "P")
(if arg
- (insert (pp-to-string (eval (pp-last-sexp) lexical-binding)))
- (pp-eval-expression (pp-last-sexp))))
+ (insert (pp-to-string (eval (elisp--eval-defun-1
+ (macroexpand (pp-last-sexp)))
+ lexical-binding)))
+ (pp-eval-expression (elisp--eval-defun-1
+ (macroexpand (pp-last-sexp))))))
;;;###autoload
(defun pp-macroexpand-last-sexp (arg)
diff --git a/lisp/emacs-lisp/warnings.el b/lisp/emacs-lisp/warnings.el
index e10c149..f525ea43 100644
--- a/lisp/emacs-lisp/warnings.el
+++ b/lisp/emacs-lisp/warnings.el
@@ -294,7 +294,7 @@ entirely by setting `warning-suppress-types' or
message)
;; Don't output the buttons when doing batch compilation
;; and similar.
- (unless noninteractive
+ (unless (or noninteractive (eq type 'bytecomp))
(insert " ")
(insert-button "Disable showing"
'type 'warning-suppress-warning
diff --git a/lisp/epa-mail.el b/lisp/epa-mail.el
index 3ad4da1..dd171ab 100644
--- a/lisp/epa-mail.el
+++ b/lisp/epa-mail.el
@@ -243,6 +243,11 @@ If no one is selected, symmetric encryption will be
performed. "
(setq epa-last-coding-system-specified
(or coding-system-for-write
(select-safe-coding-system (point) (point-max)))))
+
+ ;; Insert contents of requested attachments, if any.
+ (when (and (eq major-mode 'mail-mode) mail-encode-mml)
+ (mml-to-mime)
+ (setq mail-encode-mml nil))
;; Don't let some read-only text stop us from encrypting.
(let ((inhibit-read-only t))
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 1d5506e..6481446 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -5472,6 +5472,10 @@ submitted line to be intentional."
(time-less-p erc-accidental-paste-threshold-seconds
(time-subtract now erc-last-input-time)))
(save-restriction
+ ;; If there's an abbrev at the end of the line, expand it.
+ (when (and abbrev-mode
+ (eolp))
+ (expand-abbrev))
(widen)
(if (< (point) (erc-beg-of-input-line))
(erc-error "Point is not in the input area")
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 2d9d5ec..2e9d85e 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -7094,6 +7094,7 @@ If given a prefix, show the hidden text instead."
(gnus-backlog-enter-article
group article (current-buffer)))
(when (and gnus-agent
+ gnus-agent-eagerly-store-articles
(gnus-agent-group-covered-p group))
(gnus-agent-store-article article group)))
(setq result 'article))
diff --git a/lisp/gnus/gnus-async.el b/lisp/gnus/gnus-async.el
index e3e81c8..9b08e6a 100644
--- a/lisp/gnus/gnus-async.el
+++ b/lisp/gnus/gnus-async.el
@@ -227,6 +227,7 @@ that was fetched."
(narrow-to-region mark (point-max))
;; Put the articles into the agent, if they aren't already.
(when (and gnus-agent
+ gnus-agent-eagerly-store-articles
(gnus-agent-group-covered-p group))
(save-restriction
(narrow-to-region mark (point-max))
diff --git a/lisp/gnus/gnus-fun.el b/lisp/gnus/gnus-fun.el
index 2461fd4..3218649 100644
--- a/lisp/gnus/gnus-fun.el
+++ b/lisp/gnus/gnus-fun.el
@@ -205,7 +205,7 @@ different input formats."
(defun gnus-convert-face-to-png (face)
"Convert FACE (which is base64-encoded) to a PNG.
The PNG is returned as a string."
- (let ((face (gnus-base64-repad face)))
+ (let ((face (gnus-base64-repad face nil nil t)))
(mm-with-unibyte-buffer
(insert face)
(ignore-errors
diff --git a/lisp/gnus/gnus-icalendar.el b/lisp/gnus/gnus-icalendar.el
index d7e35c5..389bce8 100644
--- a/lisp/gnus/gnus-icalendar.el
+++ b/lisp/gnus/gnus-icalendar.el
@@ -264,7 +264,14 @@
(map-property ical-property))
args)))))
(mapc #'accumulate-args prop-map)
- (apply #'make-instance event-class args))))
+ (apply
+ #'make-instance
+ event-class
+ (cl-loop for slot in (eieio-class-slots event-class)
+ for keyword = (intern
+ (format ":%s" (eieio-slot-descriptor-name slot)))
+ when (plist-member args keyword)
+ append (list keyword (plist-get args keyword)))))))
(defun gnus-icalendar-event-from-buffer (buf &optional attendee-name-or-email)
"Parse RFC5545 iCalendar in buffer BUF and return an event object.
diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el
index 684c535..807bd6a 100644
--- a/lisp/gnus/gnus-util.el
+++ b/lisp/gnus/gnus-util.el
@@ -1343,7 +1343,7 @@ forbidden in URL encoding."
(setq tmp (concat tmp str))
tmp))
-(defun gnus-base64-repad (str &optional reject-newlines line-length)
+(defun gnus-base64-repad (str &optional reject-newlines line-length no-check)
"Take a base 64-encoded string and return it padded correctly.
Existing padding is ignored.
@@ -1353,7 +1353,9 @@ If LINE-LENGTH is set and the string (or any line in the
string
if REJECT-NEWLINES is nil) is longer than that number, raise an
error. Common line length for input characters are 76 plus CRLF
(RFC 2045 MIME), 64 plus CRLF (RFC 1421 PEM), and 1000 including
-CRLF (RFC 5321 SMTP)."
+CRLF (RFC 5321 SMTP).
+
+If NOCHECK, don't check anything, but just repad."
;; RFC 4648 specifies that:
;; - three 8-bit inputs make up a 24-bit group
;; - the 24-bit group is broken up into four 6-bit values
@@ -1372,6 +1374,8 @@ CRLF (RFC 5321 SMTP)."
;; RFC 5322 section 2.2.3 consideration:
;; Because base 64-encoded strings can appear in long header fields, remove
;; folding whitespace while still observing the RFC 4648 decisions above.
+ (when no-check
+ (setq str (replace-regexp-in-string "[\n\r \t]+" "" str)));
(let ((splitstr (split-string str "[ \t]*[\r\n]+[ \t]?" t)))
(when (and reject-newlines (> (length splitstr) 1))
(error "Invalid Base64 string"))
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index ab54286..3c91c3e 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -2285,6 +2285,14 @@ a string, be sure to use a valid format, see RFC 2616."
(gnus-message 1 "Edit your init file to make this change permanent.")
(sit-for 2)))
+(defcustom gnus-agent-eagerly-store-articles t
+ "If non-nil, cache articles eagerly.
+
+When using the Gnus Agent and reading an agentized newsgroup,
+automatically cache the article in the agent cache."
+ :type 'boolean
+ :version "28.1")
+
;;; Internal variables
diff --git a/lisp/hi-lock.el b/lisp/hi-lock.el
index a81cefa..536a1af 100644
--- a/lisp/hi-lock.el
+++ b/lisp/hi-lock.el
@@ -493,6 +493,8 @@ the major mode specifies support for Font Lock."
'regexp-history-last)))
(hi-lock-read-face-name)
current-prefix-arg))
+ (when (stringp face)
+ (setq face (intern face)))
(or (facep face) (setq face 'hi-yellow))
(unless hi-lock-mode (hi-lock-mode 1))
(hi-lock-set-pattern
diff --git a/lisp/indent.el b/lisp/indent.el
index e436d14..e67109a 100644
--- a/lisp/indent.el
+++ b/lisp/indent.el
@@ -249,7 +249,8 @@ It is activated by calling `indent-rigidly' interactively.")
If called interactively with no prefix argument, activate a
transient mode in which the indentation can be adjusted interactively
by typing \\<indent-rigidly-map>\\[indent-rigidly-left],
\\[indent-rigidly-right], \\[indent-rigidly-left-to-tab-stop], or
\\[indent-rigidly-right-to-tab-stop].
-Typing any other key deactivates the transient mode.
+Typing any other key exits this mode. If `transient-mark-mode' is enabled,
+exiting also deactivates the mark.
If called from a program, or interactively with prefix ARG,
indent all lines starting in the region forward by ARG columns.
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 7ff7db3..86084b0 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -2877,9 +2877,9 @@ The current mail message becomes the message displayed."
(rmail-display-labels)
(rmail-swap-buffers)
(setq rmail-buffer-swapped t)
- (run-hooks 'rmail-show-message-hook)
(when showing-message
- (setq blurb (format "Showing message %d...done" msg)))))
+ (setq blurb (format "Showing message %d...done" msg)))
+ (run-hooks 'rmail-show-message-hook)))
blurb))
(defun rmail-copy-headers (beg _end &optional ignored-headers)
@@ -4147,22 +4147,12 @@ The variable `rmail-retry-ignored-headers' is a regular
expression
specifying headers which should not be copied into the new message."
(interactive)
(require 'mail-utils)
- ;; FIXME This does not handle rmail-mime-feature != 'rmailmm.
- ;; There is no API defined for rmail-mime-feature to provide
- ;; rmail-mime-message-p, rmail-mime-toggle-raw equivalents.
- ;; But does anyone actually use rmail-mime-feature != 'rmailmm?
- (if (and rmail-enable-mime
- (eq rmail-mime-feature 'rmailmm)
- (featurep rmail-mime-feature))
- (with-current-buffer rmail-buffer
- (if (rmail-mime-message-p)
- (let ((rmail-mime-mbox-buffer rmail-view-buffer)
- (rmail-mime-view-buffer rmail-buffer))
- (rmail-mime-toggle-raw 'raw)))))
-
- (let ((rmail-this-buffer (current-buffer))
+ (let (bounce-buffer ;; Buffer we found it in
+ bounce-start ;; Position of start of failed message in that buffer
+ bounce-end ;; Position of end of failed message in that buffer
+ bounce-indent ;; Number of columns we need to de-indent it.
(msgnum rmail-current-message)
- bounce-start bounce-end bounce-indent resending
+ resending
(content-type (rmail-get-header "Content-Type")))
(save-excursion
(goto-char (point-min))
@@ -4171,19 +4161,27 @@ specifying headers which should not be copied into the
new message."
(string-match
";[\n\t ]*boundary=\"?\\([-0-9a-z'()+_,./:=? ]+\\)\"?"
content-type))
- ;; Handle a MIME multipart bounce message.
+ ;; Handle a MIME multipart bounce message
+ ;; by scanning the raw buffer.
(let ((codestring
(concat "\n--"
(substring content-type (match-beginning 1)
- (match-end 1)))))
- (unless (re-search-forward mail-mime-unsent-header nil t)
- (error "Cannot find beginning of header in failed message"))
- (unless (search-forward "\n\n" nil t)
- (error "Cannot find start of Mime data in failed message"))
- (setq bounce-start (point))
- (if (search-forward codestring nil t)
- (setq bounce-end (match-beginning 0))
- (setq bounce-end (point-max))))
+ (match-end 1))))
+ (beg (rmail-msgbeg msgnum))
+ (end (rmail-msgend msgnum)))
+ (with-current-buffer rmail-view-buffer
+ (save-restriction
+ (narrow-to-region beg end)
+ (goto-char (point-min))
+ (unless (re-search-forward mail-mime-unsent-header nil t)
+ (error "Cannot find beginning of header in failed message"))
+ (unless (search-forward "\n\n" nil t)
+ (error "Cannot find start of Mime data in failed message"))
+ (setq bounce-start (point))
+ (setq bounce-buffer (current-buffer))
+ (if (search-forward codestring nil t)
+ (setq bounce-end (match-beginning 0))
+ (setq bounce-end (point-max))))))
;; Non-MIME bounce.
(or (re-search-forward mail-unsent-separator nil t)
(error "Cannot parse this as a failure message"))
@@ -4198,6 +4196,7 @@ specifying headers which should not be copied into the
new message."
(setq bounce-indent (- (current-column)))
(goto-char (point-max))
(re-search-backward "^End of returned message$" nil t)
+ (setq bounce-buffer (current-buffer))
(setq bounce-end (point)))
;; One message contained a few random lines before
;; the old message header. The first line of the
@@ -4214,8 +4213,10 @@ specifying headers which should not be copied into the
new message."
(setq bounce-start (point))
(goto-char (point-max))
(search-backward (concat "\n\n" boundary) bounce-start t)
+ (setq bounce-buffer (current-buffer))
(setq bounce-end (point)))
(setq bounce-start (point)
+ bounce-buffer (current-buffer)
bounce-end (point-max)))
(unless (search-forward "\n\n" nil t)
(error "Cannot find end of header in failed message"))))))
@@ -4224,9 +4225,9 @@ specifying headers which should not be copied into the
new message."
;; Turn off the usual actions for initializing the message body
;; because we want to get only the text from the failure message.
(let (mail-signature mail-setup-hook)
- (if (rmail-start-mail nil nil nil nil nil rmail-this-buffer
+ (if (rmail-start-mail nil nil nil nil nil rmail-buffer
(list (list 'rmail-mark-message
- rmail-this-buffer
+ rmail-buffer
(aref rmail-msgref-vector msgnum)
rmail-retried-attr-index)))
;; Insert original text as initial text of new draft message.
@@ -4235,7 +4236,7 @@ specifying headers which should not be copied into the
new message."
(let ((inhibit-read-only t)
eoh)
(erase-buffer)
- (insert-buffer-substring rmail-this-buffer
+ (insert-buffer-substring bounce-buffer
bounce-start bounce-end)
(goto-char (point-min))
(if bounce-indent
diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index 88e6917..2e5dd5f 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -146,6 +146,14 @@ same domain as the main data."
:version "24.4"
:type 'boolean)
+(defcustom shr-offer-extend-specpdl t
+ "Non-nil means offer to extend the specpdl if the HTML nests deeply.
+Complicated HTML can require more nesting than the current specpdl
+size permits. If this variable is t, ask the user whether to increase
+the specpdl size. If nil, just give up."
+ :version "28.1"
+ :type 'boolean)
+
(defvar shr-content-function nil
"If bound, this should be a function that will return the content.
This is used for cid: URLs, and the function is called with the
@@ -527,7 +535,8 @@ size, and full-buffer size."
(start (point)))
;; shr uses many frames per nested node.
(if (and (> shr-depth (/ max-specpdl-size 15))
- (not (and (y-or-n-p "Too deeply nested to render properly;
increase `max-specpdl-size'?")
+ (not (and shr-offer-extend-specpdl
+ (y-or-n-p "Too deeply nested to render properly;
increase `max-specpdl-size'?")
(setq max-specpdl-size (* max-specpdl-size 2)))))
(setq shr-warning
"Not rendering the complete page because of too-deep nesting")
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 4fe1377..bc0fe6d 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -745,6 +745,18 @@ variable, and you might not notice. Therefore,
`compile-command'
is considered unsafe if this variable is nil."
:type 'boolean)
+(defcustom compilation-search-all-directories t
+ "Whether further upward directories should be used when searching a file.
+When doing a parallel build, several files from different
+directories can be compiled at the same time. This makes it
+difficult to determine the base directory for a relative file
+name in a compiler error or warning. If this variable is
+non-nil, instead of just relying on the previous directory change
+in the compilation buffer, all other directories further upwards
+will be used as well."
+ :type 'boolean
+ :version "28.1")
+
;;;###autoload
(defcustom compilation-ask-about-save t
"Non-nil means \\[compile] asks which buffers to save before compiling.
@@ -2916,6 +2928,28 @@ attempts to find a file whose name is produced by
(format FMT FILENAME)."
(find-file-noselect name))
fmts (cdr fmts)))
(setq dirs (cdr dirs)))
+ ;; If we haven't found it, this might be a parallel build.
+ ;; Search the directories further up the buffer.
+ (when (and (null buffer)
+ compilation-search-all-directories)
+ (with-current-buffer (marker-buffer marker)
+ (save-excursion
+ (goto-char (marker-position marker))
+ (when-let ((prev (compilation--previous-directory (point))))
+ (goto-char prev))
+ (setq dirs (cdr (or (get-text-property
+ (1- (point)) 'compilation-directory)
+ (get-text-property
+ (point) 'compilation-directory))))))
+ (while (and dirs (null buffer))
+ (setq thisdir (car dirs)
+ fmts formats)
+ (while (and fmts (null buffer))
+ (setq name (expand-file-name (format (car fmts) filename) thisdir)
+ buffer (and (file-exists-p name)
+ (find-file-noselect name))
+ fmts (cdr fmts)))
+ (setq dirs (cdr dirs))))
(while (null buffer) ;Repeat until the user selects an existing file.
;; The file doesn't exist. Ask the user where to find it.
(save-excursion ;This save-excursion is probably not right.
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index 2e4b9d4..5b6e50c 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -48,6 +48,10 @@
;; DO NOT FORGET to read micro-docs (available from `Perl' menu) <<<<<<
;; or as help on variables `cperl-tips', `cperl-problems', <<<<<<
;; `cperl-praise', `cperl-speed'. <<<<<<
+;;
+;; Or search for "Short extra-docs" further down in this file for
+;; details on how to use `cperl-mode' instead of `perl-mode' and lots
+;; of other details.
;; The mode information (on C-h m) provides some customization help.
;; If you use font-lock feature of this mode, it is advisable to use
diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el
index b480368..dbbb127 100644
--- a/lisp/progmodes/elisp-mode.el
+++ b/lisp/progmodes/elisp-mode.el
@@ -1190,7 +1190,8 @@ character)."
;; Setup the lexical environment if lexical-binding is enabled.
(elisp--eval-last-sexp-print-value
(eval (macroexpand-all
- (eval-sexp-add-defvars (elisp--preceding-sexp)))
+ (eval-sexp-add-defvars
+ (elisp--eval-defun-1 (macroexpand (elisp--preceding-sexp)))))
lexical-binding)
(if insert-value (current-buffer) t) no-truncate char-print-limit)))
@@ -1246,6 +1247,10 @@ POS specifies the starting position where EXP was found
and defaults to point."
Interactively, with a non `-' prefix argument, print output into
current buffer.
+This commands handles `defvar', `defcustom' and `defface' the
+same way that `eval-defun' does. See the doc string of that
+function for details.
+
Normally, this function truncates long output according to the
value of the variables `eval-expression-print-length' and
`eval-expression-print-level'. With a prefix argument of zero,
diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el
index 40a804b..8f7482a 100644
--- a/lisp/progmodes/project.el
+++ b/lisp/progmodes/project.el
@@ -940,6 +940,7 @@ Arguments the same as in `compile'."
(interactive
(list
(let ((command (eval compile-command)))
+ (require 'compile)
(if (or compilation-read-command current-prefix-arg)
(compilation-read-command command)
command))
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 76baa44..d1871c9 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -501,6 +501,52 @@ The type returned can be `comment', `string' or `paren'."
font-lock-string-face)
font-lock-comment-face))
+(defun python--f-string-p (ppss)
+ "Return non-nil if the pos where PPSS was found is inside an f-string."
+ (and (nth 3 ppss)
+ (let ((spos (1- (nth 8 ppss))))
+ (and (memq (char-after spos) '(?f ?F))
+ (or (< (point-min) spos)
+ (not (memq (char-syntax (char-before spos)) '(?w ?_))))))))
+
+(defun python--font-lock-f-strings (limit)
+ "Mark {...} holes as being code.
+Remove the (presumably `font-lock-string-face') `face' property from
+the {...} holes that appear within f-strings."
+ ;; FIXME: This will fail to properly highlight strings appearing
+ ;; within the {...} of an f-string.
+ ;; We could presumably fix it by running
+ ;; `font-lock-fontify-syntactically-region' (as is done in
+ ;; `sm-c--cpp-fontify-syntactically', for example) after removing
+ ;; the `face' property, but I'm not sure it's worth the effort and
+ ;; the risks.
+ (let ((ppss (syntax-ppss)))
+ (while
+ (progn
+ (while (and (not (python--f-string-p ppss))
+ (re-search-forward "\\<f['\"]" limit 'move))
+ (setq ppss (syntax-ppss)))
+ (< (point) limit))
+ (cl-assert (python--f-string-p ppss))
+ (let ((send (save-excursion
+ (goto-char (nth 8 ppss))
+ (condition-case nil
+ (progn (let ((forward-sexp-function nil))
+ (forward-sexp 1))
+ (min limit (1- (point))))
+ (scan-error limit)))))
+ (while (re-search-forward "{" send t)
+ (if (eq ?\{ (char-after))
+ (forward-char 1) ;Just skip over {{
+ (let ((beg (match-beginning 0))
+ (end (condition-case nil
+ (progn (up-list 1) (min send (point)))
+ (scan-error send))))
+ (goto-char end)
+ (put-text-property beg end 'face nil))))
+ (goto-char (min limit (1+ send)))
+ (setq ppss (syntax-ppss))))))
+
(defvar python-font-lock-keywords-level-1
`((,(rx symbol-start "def" (1+ space) (group (1+ (or word ?_))))
(1 font-lock-function-name-face))
@@ -567,7 +613,8 @@ This is the medium decoration level, including everything in
builtins.")
(defvar python-font-lock-keywords-maximum-decoration
- `(,@python-font-lock-keywords-level-2
+ `((python--font-lock-f-strings)
+ ,@python-font-lock-keywords-level-2
;; Constants
(,(rx symbol-start
(or
@@ -575,7 +622,8 @@ builtins.")
;; copyright, license, credits, quit and exit are added by the site
;; module and they are not intended to be used in programs
"copyright" "credits" "exit" "license" "quit")
- symbol-end) . font-lock-constant-face)
+ symbol-end)
+ . font-lock-constant-face)
;; Decorators.
(,(rx line-start (* (any " \t")) (group "@" (1+ (or word ?_))
(0+ "." (1+ (or word ?_)))))
@@ -609,7 +657,8 @@ builtins.")
;; OS specific
"VMSError" "WindowsError"
)
- symbol-end) . font-lock-type-face)
+ symbol-end)
+ . font-lock-type-face)
;; assignments
;; support for a = b = c = 5
(,(lambda (limit)
diff --git a/lisp/replace.el b/lisp/replace.el
index e363924..3a2ab1d 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -126,6 +126,18 @@ This variable affects only `query-replace-regexp'."
:type 'boolean
:group 'matching)
+(defcustom query-replace-highlight-submatches t
+ "Whether to highlight regexp subexpressions during query replacement.
+The faces used to do the highlights are named `isearch-group-1',
+`isearch-group-2', etc. (By default, only these 2 are defined.)
+When there are more matches than faces, then faces are reused from the
+beginning, in a cyclical manner, so the `isearch-group-1' face is
+isreused for the third match. If you want to use more distinctive colors,
+you can define more of these faces using the same numbering scheme."
+ :type 'boolean
+ :group 'matching
+ :version "28.1")
+
(defcustom query-replace-lazy-highlight t
"Controls the lazy-highlighting during query replacements.
When non-nil, all text in the buffer matching the current match
@@ -894,7 +906,8 @@ and `search-upper-case' is non-nil, the matching is
case-sensitive.
Second and third arg RSTART and REND specify the region to operate on.
This command operates on (the accessible part of) all lines whose
accessible part is entirely contained in the region determined by RSTART
-and REND. (A newline ending a line counts as part of that line.)
+and REND. (A newline ending a line counts as part of that line.) If RSTART
+is non-nil, REND also has to be given.
Interactively, in Transient Mark mode when the mark is active, operate
on all lines whose accessible part is entirely contained in the region.
@@ -2403,6 +2416,7 @@ It is called with three arguments, as if it were
(funcall search-function search-string limit t)))
(defvar replace-overlay nil)
+(defvar replace-submatches-overlays nil)
(defun replace-highlight (match-beg match-end range-beg range-end
search-string regexp-flag delimited-flag
@@ -2413,6 +2427,25 @@ It is called with three arguments, as if it were
(setq replace-overlay (make-overlay match-beg match-end))
(overlay-put replace-overlay 'priority 1001) ;higher than lazy overlays
(overlay-put replace-overlay 'face 'query-replace)))
+
+ (when (and query-replace-highlight-submatches
+ regexp-flag)
+ (mapc 'delete-overlay replace-submatches-overlays)
+ (setq replace-submatches-overlays nil)
+ (let ((submatch-data (cddr (butlast (match-data t))))
+ (group 0)
+ ov face)
+ (while submatch-data
+ (setq group (1+ group))
+ (setq ov (make-overlay (pop submatch-data) (pop submatch-data))
+ face (intern-soft (format "isearch-group-%d" group)))
+ ;; Recycle faces from beginning.
+ (unless (facep face)
+ (setq group 1 face 'isearch-group-1))
+ (overlay-put ov 'face face)
+ (overlay-put ov 'priority 1002)
+ (push ov replace-submatches-overlays))))
+
(if query-replace-lazy-highlight
(let ((isearch-string search-string)
(isearch-regexp regexp-flag)
@@ -2433,6 +2466,9 @@ It is called with three arguments, as if it were
(defun replace-dehighlight ()
(when replace-overlay
(delete-overlay replace-overlay))
+ (when query-replace-highlight-submatches
+ (mapc 'delete-overlay replace-submatches-overlays)
+ (setq replace-submatches-overlays nil))
(when query-replace-lazy-highlight
(lazy-highlight-cleanup lazy-highlight-cleanup)
(setq isearch-lazy-highlight-last-string nil))
diff --git a/lisp/simple.el b/lisp/simple.el
index a24f284..bd19969 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -393,7 +393,7 @@ and TO-BUFFER is a target buffer."
(when next-error-recenter
(recenter next-error-recenter))
(funcall next-error-found-function from-buffer to-buffer)
- (next-error-message-highlight)
+ (next-error-message-highlight from-buffer)
(run-hooks 'next-error-hook))
(defun next-error-select-buffer (buffer)
@@ -478,20 +478,18 @@ buffer causes automatic display of the corresponding
source code location."
(next-error-no-select 0))
(error t))))
-(defun next-error-message-highlight ()
+(defun next-error-message-highlight (error-buffer)
"Highlight the current error message in the ‘next-error’ buffer."
(when next-error-message-highlight
- (with-current-buffer next-error-last-buffer
+ (with-current-buffer error-buffer
(when next-error--message-highlight-overlay
(delete-overlay next-error--message-highlight-overlay))
- (save-excursion
- (goto-char compilation-current-error)
- (let ((ol (make-overlay (line-beginning-position)
(line-end-position))))
- ;; do not override region highlighting
- (overlay-put ol 'priority -50)
- (overlay-put ol 'face 'next-error-message)
- (overlay-put ol 'window (get-buffer-window))
- (setf next-error--message-highlight-overlay ol))))))
+ (let ((ol (make-overlay (line-beginning-position) (line-end-position))))
+ ;; do not override region highlighting
+ (overlay-put ol 'priority -50)
+ (overlay-put ol 'face 'next-error-message)
+ (overlay-put ol 'window (get-buffer-window))
+ (setf next-error--message-highlight-overlay ol)))))
;;;
diff --git a/lisp/subr.el b/lisp/subr.el
index 5408905..8cf5b00 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -891,10 +891,6 @@ side-effects, and the argument LIST is not modified."
;;;; Keymap support.
-;; Declare before first use of `save-match-data',
-;; where it is used internally.
-(defvar save-match-data-internal)
-
(defun kbd (keys)
"Convert KEYS to the internal Emacs key representation.
KEYS should be a string in the format returned by commands such
diff --git a/lisp/type-break.el b/lisp/type-break.el
index 5877292..a9ec19b 100644
--- a/lisp/type-break.el
+++ b/lisp/type-break.el
@@ -51,8 +51,6 @@
;; this, but I think the health of my hands is far more important than a
;; few pages of virtual memory.
-;; This program has no hope of working in Emacs 18.
-
;; This package was inspired by Roland McGrath's hanoi-break.el.
;; Several people contributed feedback and ideas, including
;; Roland McGrath <roland@gnu.org>
@@ -958,11 +956,7 @@ FRAC should be the inverse of the fractional value; for
example, a value of
sum))
(defun type-break-time-stamp (&optional when)
- (if (fboundp 'format-time-string)
- (format-time-string type-break-time-stamp-format when)
- ;; Emacs 19.28 and prior do not have format-time-string.
- ;; In that case, result is not customizable. Upgrade today!
- (format "[%s] " (substring (current-time-string when) 11 16))))
+ (format-time-string type-break-time-stamp-format when))
(defun type-break-format-time (secs)
(let ((mins (/ secs 60)))
diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index f223ae4..d586afb 100644
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -83,7 +83,10 @@ When editing a diff file, the line numbers in the hunk
headers
need to be kept consistent with the actual diff. This can
either be done on the fly (but this sometimes interacts poorly with the
undo mechanism) or whenever the file is written (can be slow
-when editing big diffs)."
+when editing big diffs).
+
+If this variable is nil, the hunk header numbers are updated when
+the file is written instead."
:type 'boolean)
(defcustom diff-advance-after-apply-hunk t
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 46c44fa..39d0fab 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -2058,13 +2058,13 @@ If `F.~REV~' already exists, use it instead of checking
it out again."
(list
(vc-read-revision "Revision to visit (default is working revision): "
(list buffer-file-name)))))
- (with-current-buffer (or (buffer-base-buffer) (current-buffer))
- (vc-ensure-vc-buffer)
- (let* ((file buffer-file-name)
- (revision (if (string-equal rev "")
- (vc-working-revision file)
- rev)))
- (switch-to-buffer-other-window (vc-find-revision file revision)))))
+ (set-buffer (or (buffer-base-buffer) (current-buffer)))
+ (vc-ensure-vc-buffer)
+ (let* ((file buffer-file-name)
+ (revision (if (string-equal rev "")
+ (vc-working-revision file)
+ rev)))
+ (switch-to-buffer-other-window (vc-find-revision file revision))))
(defun vc-find-revision (file revision &optional backend)
"Read REVISION of FILE into a buffer and return the buffer.
diff --git a/src/xwidget.c b/src/xwidget.c
index 154b3e9..e63191e 100644
--- a/src/xwidget.c
+++ b/src/xwidget.c
@@ -793,7 +793,9 @@ DEFUN ("xwidget-webkit-title",
WEBKIT_FN_INIT ();
#ifdef USE_GTK
WebKitWebView *wkwv = WEBKIT_WEB_VIEW (xw->widget_osr);
- return build_string (webkit_web_view_get_title (wkwv));
+ const gchar *title = webkit_web_view_get_title (wkwv);
+
+ return build_string (title ? title : "");
#elif defined NS_IMPL_COCOA
return nsxwidget_webkit_title (xw);
#endif
diff --git a/test/lisp/bookmark-tests.el b/test/lisp/bookmark-tests.el
index c5959e4..7cfd4ac 100644
--- a/test/lisp/bookmark-tests.el
+++ b/test/lisp/bookmark-tests.el
@@ -24,24 +24,17 @@
;;; Code:
(require 'ert)
+(require 'ert-x)
(require 'bookmark)
(require 'cl-lib)
-(defvar bookmark-tests-data-dir
- (file-truename
- (expand-file-name "bookmark-resources/"
- (file-name-directory (or load-file-name
- buffer-file-name))))
- "Base directory of bookmark-tests.el data files.")
-
-(defvar bookmark-tests-bookmark-file
- (expand-file-name "test.bmk" bookmark-tests-data-dir)
+(defvar bookmark-tests-bookmark-file (ert-resource-file "test.bmk")
"Bookmark file used for testing.")
(defvar bookmark-tests-example-file
;; We use abbreviate-file-name here to match the behavior of
;; `bookmark-buffer-file-name'.
- (abbreviate-file-name (expand-file-name "example.txt"
bookmark-tests-data-dir))
+ (abbreviate-file-name (ert-resource-file "example.txt"))
"Example file used for testing.")
;; The values below should match `bookmark-tests-bookmark-file'. We cache
@@ -83,8 +76,7 @@ the lexically-bound variable `buffer'."
,@body)
(kill-buffer buffer))))
-(defvar bookmark-tests-bookmark-file-list
- (expand-file-name "test-list.bmk" bookmark-tests-data-dir)
+(defvar bookmark-tests-bookmark-file-list (ert-resource-file "test-list.bmk")
"Bookmark file used for testing a list of bookmarks.")
;; The values below should match `bookmark-tests-bookmark-file-list'
diff --git a/test/lisp/button-tests.el b/test/lisp/button-tests.el
index 11cc140..b463366 100644
--- a/test/lisp/button-tests.el
+++ b/test/lisp/button-tests.el
@@ -21,6 +21,12 @@
(require 'ert)
+(defvar button-tests--map
+ (let ((map (make-sparse-keymap)))
+ (define-key map "x" #'ignore)
+ map)
+ "Keymap for testing command substitution.")
+
(ert-deftest button-at ()
"Test `button-at' behavior."
(with-temp-buffer
@@ -41,11 +47,13 @@
"Test `button--help-echo' with strings."
(with-temp-buffer
;; Text property buttons.
- (let ((button (insert-text-button "text" 'help-echo "text help")))
- (should (equal (button--help-echo button) "text help")))
+ (let ((button (insert-text-button
+ "text" 'help-echo "text: \\<button-tests--map>\\[ignore]")))
+ (should (equal (button--help-echo button) "text: x")))
;; Overlay buttons.
- (let ((button (insert-button "overlay" 'help-echo "overlay help")))
- (should (equal (button--help-echo button) "overlay help")))))
+ (let ((button (insert-button "overlay" 'help-echo
+ "overlay: \\<button-tests--map>\\[ignore]")))
+ (should (equal (button--help-echo button) "overlay: x")))))
(ert-deftest button--help-echo-form ()
"Test `button--help-echo' with forms."
@@ -55,16 +63,17 @@
(form `(funcall (let ((,help "lexical form"))
(lambda () ,help))))
(button (insert-text-button "text" 'help-echo form)))
- (set help "dynamic form")
- (should (equal (button--help-echo button) "dynamic form")))
+ (set help "dynamic: \\<button-tests--map>\\[ignore]")
+ (should (equal (button--help-echo button) "dynamic: x")))
;; Test overlay buttons with lexical scoping.
(setq lexical-binding t)
(let* ((help (make-symbol "help"))
- (form `(funcall (let ((,help "lexical form"))
- (lambda () ,help))))
+ (form `(funcall
+ (let ((,help "lexical: \\<button-tests--map>\\[ignore]"))
+ (lambda () ,help))))
(button (insert-button "overlay" 'help-echo form)))
(set help "dynamic form")
- (should (equal (button--help-echo button) "lexical form")))))
+ (should (equal (button--help-echo button) "lexical: x")))))
(ert-deftest button--help-echo-function ()
"Test `button--help-echo' with functions."
@@ -77,9 +86,9 @@
(should (eq win owin))
(should (eq obj obuf))
(should (= pos opos))
- "text function"))
+ "text: \\<button-tests--map>\\[ignore]"))
(button (insert-text-button "text" 'help-echo help)))
- (should (equal (button--help-echo button) "text function"))
+ (should (equal (button--help-echo button) "text: x"))
;; Overlay buttons.
(setq help (lambda (win obj pos)
(should (eq win owin))
@@ -88,9 +97,9 @@
(should (eq (overlay-buffer obj) obuf))
(should (= (overlay-start obj) opos))
(should (= pos opos))
- "overlay function"))
+ "overlay: \\<button-tests--map>\\[ignore]"))
(setq opos (point))
(setq button (insert-button "overlay" 'help-echo help))
- (should (equal (button--help-echo button) "overlay function")))))
+ (should (equal (button--help-echo button) "overlay: x")))))
;;; button-tests.el ends here
diff --git a/test/lisp/calendar/todo-mode-tests.el
b/test/lisp/calendar/todo-mode-tests.el
index 1fbd394..6ed5512 100644
--- a/test/lisp/calendar/todo-mode-tests.el
+++ b/test/lisp/calendar/todo-mode-tests.el
@@ -28,19 +28,10 @@
(require 'ert-x)
(require 'todo-mode)
-(defvar todo-test-data-dir
- (file-truename
- (expand-file-name "todo-mode-resources/"
- (file-name-directory (or load-file-name
- buffer-file-name))))
- "Base directory of todo-mode.el test data files.")
-
-(defvar todo-test-file-1 (expand-file-name "todo-test-1.todo"
- todo-test-data-dir)
+(defvar todo-test-file-1 (ert-resource-file "todo-test-1.todo")
"Todo mode test file.")
-(defvar todo-test-archive-1 (expand-file-name "todo-test-1.toda"
- todo-test-data-dir)
+(defvar todo-test-archive-1 (ert-resource-file "todo-test-1.toda")
"Todo Archive mode test file.")
(defmacro with-todo-test (&rest body)
@@ -52,7 +43,7 @@
(abbreviated-home-dir nil)
(process-environment (cons (format "HOME=%s" todo-test-home)
process-environment))
- (todo-directory todo-test-data-dir)
+ (todo-directory (ert-resource-directory))
(todo-default-todo-file (todo-short-file-name
(car (funcall todo-files-function)))))
(unwind-protect
@@ -815,7 +806,7 @@ buffer from which the editing command was invoked."
"Add file FILE with category CAT to todo-files and show it.
This provides a noninteractive API for todo-add-file for use in
automatic testing."
- (let ((file0 (file-truename (concat todo-test-data-dir file ".todo")))
+ (let ((file0 (ert-resource-file (concat file ".todo")))
todo-add-item-if-new-category) ; Don't need an item in cat.
(cl-letf (((symbol-function 'todo-read-file-name)
(lambda (_prompt) file0))
diff --git a/test/lisp/custom-tests.el b/test/lisp/custom-tests.el
index 76661dc..a1451cf 100644
--- a/test/lisp/custom-tests.el
+++ b/test/lisp/custom-tests.el
@@ -20,6 +20,7 @@
;;; Code:
(require 'ert)
+(require 'ert-x)
(require 'wid-edit)
(require 'cus-edit)
@@ -100,10 +101,7 @@
(ert-deftest custom--test-theme-variables ()
"Test variables setting with enabling / disabling a custom theme."
;; We load custom-resources/custom--test-theme.el.
- (let ((custom-theme-load-path
- `(,(expand-file-name
- "custom-resources"
- (expand-file-name "lisp" (getenv "EMACS_TEST_DIRECTORY"))))))
+ (let ((custom-theme-load-path `(,(ert-resource-directory))))
(load-theme 'custom--test 'no-confirm 'no-enable)
;; The variables have still their initial values.
(should (equal custom--test-user-option 'foo))
diff --git a/test/lisp/emacs-lisp/cl-generic-tests.el
b/test/lisp/emacs-lisp/cl-generic-tests.el
index 5aa5878..9582907 100644
--- a/test/lisp/emacs-lisp/cl-generic-tests.el
+++ b/test/lisp/emacs-lisp/cl-generic-tests.el
@@ -240,7 +240,7 @@
(let ((retval (cl--generic-method-files 'cl-generic-tests--generic)))
(should (equal (length retval) 2))
(mapc (lambda (x)
- (should (equal (car x) cl-generic-tests--this-file))
+ (should (equal (file-truename (car x))
cl-generic-tests--this-file))
(should (equal (cadr x) 'cl-generic-tests--generic)))
retval)
(should-not (equal (nth 0 retval) (nth 1 retval)))))
diff --git a/test/lisp/emacs-lisp/edebug-tests.el
b/test/lisp/emacs-lisp/edebug-tests.el
index 6db07b1..8aae26a 100644
--- a/test/lisp/emacs-lisp/edebug-tests.el
+++ b/test/lisp/emacs-lisp/edebug-tests.el
@@ -36,17 +36,6 @@
(require 'edebug)
(require 'kmacro)
-;; Use `eval-and-compile' because this is used by the macro
-;; `edebug-tests-deftest'.
-(eval-and-compile
- (defvar edebug-tests-sample-code-file
- (expand-file-name
- "edebug-resources/edebug-test-code.el"
- (file-name-directory (or (bound-and-true-p byte-compile-current-file)
- load-file-name
- buffer-file-name)))
- "Name of file containing code samples for Edebug tests."))
-
(defvar edebug-tests-temp-file nil
"Name of temp file containing sample code stripped of stop point symbols.")
(defvar edebug-tests-stop-points nil
@@ -116,7 +105,8 @@ back to the top level.")
(declare (debug (body)))
`(edebug-tests-with-default-config
(let ((edebug-tests-failure-in-post-command nil)
- (edebug-tests-temp-file (make-temp-file "edebug-tests-" nil ".el")))
+ (edebug-tests-temp-file (make-temp-file "edebug-tests-" nil ".el"))
+ (find-file-suppress-same-file-warnings t))
(edebug-tests-setup-code-file edebug-tests-temp-file)
(ert-with-message-capture
edebug-tests-messages
@@ -221,6 +211,7 @@ be the same as every keystroke) execute the thunk at the
same
index."
(let* ((edebug-tests-thunks thunks)
(edebug-tests-kbd-macro-index 0)
+ (find-file-suppress-same-file-warnings t)
saved-local-map)
(with-current-buffer (find-file-noselect edebug-tests-temp-file)
(setq saved-local-map overriding-local-map)
@@ -344,7 +335,7 @@ evaluate to \"symbol\", \"symbol-1\", \"symbol-2\", etc."
Write the loadable code to a buffer for TMPFILE, and set
`edebug-tests-stop-points' to a map from defined symbols to stop
point names to positions in the file."
- (with-current-buffer (find-file-noselect edebug-tests-sample-code-file)
+ (with-current-buffer (find-file-noselect (ert-resource-file
"edebug-test-code.el"))
(let ((marked-up-code (buffer-string)))
(with-temp-file tmpfile
(insert marked-up-code))))
diff --git a/test/lisp/emacs-lisp/package-tests.el
b/test/lisp/emacs-lisp/package-tests.el
index cbb2410..155a8e6 100644
--- a/test/lisp/emacs-lisp/package-tests.el
+++ b/test/lisp/emacs-lisp/package-tests.el
@@ -39,6 +39,7 @@
(require 'package)
(require 'ert)
+(require 'ert-x)
(require 'cl-lib)
(setq package-menu-async nil)
@@ -102,13 +103,9 @@
(multi-file (0 1))))
"`package-desc' used for testing dependencies.")
-(defvar package-test-data-dir (expand-file-name "package-resources"
package-test-file-dir)
+(defvar package-test-data-dir (ert-resource-directory)
"Base directory of package test files.")
-(defvar package-test-fake-contents-file
- (expand-file-name "archive-contents" package-test-data-dir)
- "Path to a static copy of \"archive-contents\".")
-
(cl-defmacro with-package-test ((&optional &key file
basedir
install
@@ -215,20 +212,20 @@ Must called from within a `tar-mode' buffer."
(ert-deftest package-test-desc-from-buffer ()
"Parse an elisp buffer to get a `package-desc' object."
- (with-package-test (:basedir "package-resources" :file
"simple-single-1.3.el")
+ (with-package-test (:basedir (ert-resource-directory) :file
"simple-single-1.3.el")
(should (package-test--compatible-p
(package-buffer-info) simple-single-desc 'kind)))
- (with-package-test (:basedir "package-resources" :file
"simple-depend-1.0.el")
+ (with-package-test (:basedir (ert-resource-directory) :file
"simple-depend-1.0.el")
(should (package-test--compatible-p
(package-buffer-info) simple-depend-desc 'kind)))
- (with-package-test (:basedir "package-resources"
+ (with-package-test (:basedir (ert-resource-directory)
:file "multi-file-0.2.3.tar")
(tar-mode)
(should (equal (package-tar-file-info) multi-file-desc))))
(ert-deftest package-test-install-single ()
"Install a single file without using an archive."
- (with-package-test (:basedir "package-resources" :file
"simple-single-1.3.el")
+ (with-package-test (:basedir (ert-resource-directory) :file
"simple-single-1.3.el")
(should (package-install-from-buffer))
(package-initialize)
(should (package-installed-p 'simple-single))
@@ -271,7 +268,7 @@ Must called from within a `tar-mode' buffer."
(ert-deftest package-test-macro-compilation ()
"Install a package which includes a dependency."
- (with-package-test (:basedir "package-resources")
+ (with-package-test (:basedir (ert-resource-directory))
(package-install-file (expand-file-name "macro-problem-package-1.0/"))
(require 'macro-problem)
;; `macro-problem-func' uses a macro from `macro-aux'.
@@ -310,8 +307,7 @@ Must called from within a `tar-mode' buffer."
(ert-deftest package-test-install-prioritized ()
"Install a lower version from a higher-prioritized archive."
(with-package-test ()
- (let* ((newer-version (expand-file-name "package-resources/newer-versions"
- package-test-file-dir))
+ (let* ((newer-version (ert-resource-file "newer-versions"))
(package-archives `(("older" . ,package-test-data-dir)
("newer" . ,newer-version)))
(package-archive-priorities '(("older" . 100))))
@@ -326,7 +322,7 @@ Must called from within a `tar-mode' buffer."
(ert-deftest package-test-install-multifile ()
"Check properties of the installed multi-file package."
- (with-package-test (:basedir "package-resources" :install '(multi-file))
+ (with-package-test (:basedir (ert-resource-directory) :install '(multi-file))
(let ((autoload-file
(expand-file-name "multi-file-autoloads.el"
(expand-file-name
@@ -472,8 +468,7 @@ Must called from within a `tar-mode' buffer."
(package-menu-mark-install)
(package-menu-execute)
(should (package-installed-p 'simple-single))
- (let ((package-test-data-dir
- (expand-file-name "package-resources/newer-versions"
package-test-file-dir)))
+ (let ((package-test-data-dir (ert-resource-file "newer-versions")))
(setq package-archives `(("gnu" . ,package-test-data-dir)))
(revert-buffer)
@@ -512,7 +507,7 @@ Must called from within a `tar-mode' buffer."
(when (re-search-forward "Server started, \\(.*\\)\n" nil t)
(setq addr (match-string 1))))
addr)))
- (with-package-test (:basedir package-test-data-dir :location addr)
+ (with-package-test (:basedir (ert-resource-directory) :location addr)
(list-packages)
(should package--downloads-in-progress)
(should mode-line-process)
@@ -532,8 +527,7 @@ Must called from within a `tar-mode' buffer."
(ert-deftest package-test-update-archives/ignore-nil-entry ()
"Ignore any packages that are nil. Test for Bug#28502."
(with-package-test ()
- (let* ((with-nil-entry (expand-file-name "package-resources/with-nil-entry"
- package-test-file-dir))
+ (let* ((with-nil-entry (ert-resource-file "with-nil-entry"))
(package-archives `(("with-nil-entry" . ,with-nil-entry))))
(package-initialize)
(package-refresh-contents)
@@ -634,8 +628,7 @@ Must called from within a `tar-mode' buffer."
prog-alist)))
(delete-directory homedir t))))
(let* ((keyring (expand-file-name "key.pub" package-test-data-dir))
- (package-test-data-dir
- (expand-file-name "package-resources/signed" package-test-file-dir)))
+ (package-test-data-dir (ert-resource-file "signed")))
(with-package-test ()
(package-initialize)
(package-import-keyring keyring)
@@ -696,7 +689,7 @@ Must called from within a `tar-mode' buffer."
(ert-deftest package-x-test-upload-buffer ()
"Test creating an \"archive-contents\" file"
- (with-package-test (:basedir "package-resources"
+ (with-package-test (:basedir (ert-resource-directory)
:file "simple-single-1.3.el"
:upload-base t)
(package-upload-buffer)
@@ -729,7 +722,7 @@ Must called from within a `tar-mode' buffer."
(ert-deftest package-x-test-upload-new-version ()
"Test uploading a new version of a package"
- (with-package-test (:basedir "package-resources"
+ (with-package-test (:basedir (ert-resource-directory)
:file "simple-single-1.3.el"
:upload-base t)
(package-upload-buffer)
diff --git a/test/lisp/emacs-lisp/shadow-tests.el
b/test/lisp/emacs-lisp/shadow-tests.el
index 219312a..5d6215a 100644
--- a/test/lisp/emacs-lisp/shadow-tests.el
+++ b/test/lisp/emacs-lisp/shadow-tests.el
@@ -20,30 +20,23 @@
;;; Code:
(require 'ert)
+(require 'ert-x)
(require 'shadow)
(eval-when-compile (require 'cl-lib))
-(defconst shadow-tests-data-directory
- (expand-file-name "lisp/emacs-lisp/shadow-resources"
- (or (getenv "EMACS_TEST_DIRECTORY")
- (expand-file-name "../../.."
- (or load-file-name
- buffer-file-name))))
- "Directory for shadow test files.")
-
(ert-deftest shadow-case-insensitive ()
"Test shadowing for case insensitive filenames."
;; Override `file-name-case-insensitive-p' so we test the same thing
;; regardless of what file system we're running on.
(cl-letf (((symbol-function 'file-name-case-insensitive-p) (lambda (_f) t)))
- (should (equal (list (expand-file-name "p1/foo"
shadow-tests-data-directory)
- (expand-file-name "p2/FOO"
shadow-tests-data-directory))
+ (should (equal (list (ert-resource-file "p1/foo")
+ (ert-resource-file "p2/FOO"))
(load-path-shadows-find
- (list (expand-file-name "p1/" shadow-tests-data-directory)
- (expand-file-name "p2/"
shadow-tests-data-directory))))))
+ (list (ert-resource-file "p1/")
+ (ert-resource-file "p2/"))))))
(cl-letf (((symbol-function 'file-name-case-insensitive-p) (lambda (_f)
nil)))
(should-not (load-path-shadows-find
- (list (expand-file-name "p1/" shadow-tests-data-directory)
- (expand-file-name "p2/"
shadow-tests-data-directory))))))
+ (list (ert-resource-file "p1/")
+ (ert-resource-file "p2/"))))))
;;; shadow-tests.el ends here.
diff --git a/test/lisp/emacs-lisp/testcover-tests.el
b/test/lisp/emacs-lisp/testcover-tests.el
index 6870d49..9e7a3bf 100644
--- a/test/lisp/emacs-lisp/testcover-tests.el
+++ b/test/lisp/emacs-lisp/testcover-tests.el
@@ -31,26 +31,10 @@
;;; Code:
(require 'ert)
+(require 'ert-x)
(require 'testcover)
(require 'skeleton)
-;; Use `eval-and-compile' around all these definitions because they're
-;; used by the macro `testcover-tests-define-tests'.
-
-(eval-and-compile
- (defvar testcover-tests-file-dir
- (expand-file-name
- "testcover-resources/"
- (file-name-directory (or (bound-and-true-p byte-compile-current-file)
- load-file-name
- buffer-file-name)))
- "Directory of the \"testcover-tests.el\" file."))
-
-(eval-and-compile
- (defvar testcover-tests-test-cases
- (expand-file-name "testcases.el" testcover-tests-file-dir)
- "File containing marked up code to instrument and check."))
-
;; Convert Testcover's overlays to plain text.
(eval-and-compile
@@ -62,6 +46,7 @@ is working correctly on a code sample. OPTARGS are optional
arguments for `testcover-start'."
(interactive "r")
(let ((tempfile (make-temp-file "testcover-tests-" nil ".el"))
+ (find-file-suppress-same-file-warnings t)
(code (buffer-substring beg end))
(marked-up-code))
(unwind-protect
@@ -114,7 +99,8 @@ arguments for `testcover-start'."
(eval-and-compile
(defun testcover-tests-run-test-case (marked-up-code)
"Test the operation of Testcover on the string MARKED-UP-CODE."
- (let ((tempfile (make-temp-file "testcover-tests-" nil ".el")))
+ (let ((tempfile (make-temp-file "testcover-tests-" nil ".el"))
+ (find-file-suppress-same-file-warnings t))
(unwind-protect
(progn
(with-temp-file tempfile
@@ -149,7 +135,7 @@ Construct and return a list of `ert-deftest' forms. See
testcases.el
for documentation of the test definition format."
(let (results)
(with-temp-buffer
- (insert-file-contents testcover-tests-test-cases)
+ (insert-file-contents (ert-resource-file "testcases.el"))
(goto-char (point-min))
(while (re-search-forward
(concat "^;; ==== \\([^ ]+?\\) ====\n"
diff --git a/test/lisp/gnus/gnus-util-tests.el
b/test/lisp/gnus/gnus-util-tests.el
index 47f0a9c..4869d16 100644
--- a/test/lisp/gnus/gnus-util-tests.el
+++ b/test/lisp/gnus/gnus-util-tests.el
@@ -133,8 +133,6 @@
(should (equal '("1" "1") (gnus-setdiff '(2 "1" 2 "1") '(2)))))
(ert-deftest gnus-base64-repad ()
- (should-error (gnus-base64-repad "" nil nil nil)
- :type 'wrong-number-of-arguments)
(should-error (gnus-base64-repad 1)
:type 'wrong-type-argument)
diff --git a/test/lisp/help-fns-tests.el b/test/lisp/help-fns-tests.el
index 2f6abfb..d9344c3 100644
--- a/test/lisp/help-fns-tests.el
+++ b/test/lisp/help-fns-tests.el
@@ -56,32 +56,32 @@ Return first line of the output of (describe-function-1
FUNC)."
(should (string-match regexp result))))
(ert-deftest help-fns-test-lisp-macro ()
- (let ((regexp "a Lisp macro in .subr\\.el")
+ (let ((regexp "a Lisp macro in .+subr\\.el")
(result (help-fns-tests--describe-function 'when)))
(should (string-match regexp result))))
(ert-deftest help-fns-test-lisp-defun ()
(let ((regexp (if (boundp 'comp-ctxt)
- "a native compiled Lisp function in .subr\\.el"
- "a compiled Lisp function in .subr\\.el"))
+ "a native compiled Lisp function in .+subr\\.el"
+ "a compiled Lisp function in .+subr\\.el"))
(result (help-fns-tests--describe-function 'last)))
(should (string-match regexp result))))
(ert-deftest help-fns-test-lisp-defsubst ()
(let ((regexp (if (boundp 'comp-ctxt)
- "a native compiled Lisp function in .subr\\.el"
- "a compiled Lisp function in .subr\\.el"))
+ "a native compiled Lisp function in .+subr\\.el"
+ "a compiled Lisp function in .+subr\\.el"))
(result (help-fns-tests--describe-function 'posn-window)))
(should (string-match regexp result))))
(ert-deftest help-fns-test-alias-to-defun ()
- (let ((regexp "an alias for .set-file-modes. in .subr\\.el")
+ (let ((regexp "an alias for .set-file-modes. in .+subr\\.el")
(result (help-fns-tests--describe-function 'chmod)))
(should (string-match regexp result))))
(ert-deftest help-fns-test-bug23887 ()
"Test for https://debbugs.gnu.org/23887 ."
- (let ((regexp "an alias for .re-search-forward. in .subr\\.el")
+ (let ((regexp "an alias for .re-search-forward. in .+subr\\.el")
(result (help-fns-tests--describe-function 'search-forward-regexp)))
(should (string-match regexp result))))
diff --git a/test/lisp/mail/uudecode-tests.el b/test/lisp/mail/uudecode-tests.el
index 4c9650f..1756625 100644
--- a/test/lisp/mail/uudecode-tests.el
+++ b/test/lisp/mail/uudecode-tests.el
@@ -24,15 +24,9 @@
;;; Code:
(require 'ert)
+(require 'ert-x)
(require 'uudecode)
-(defvar uudecode-tests-data-dir
- (file-truename
- (expand-file-name "uudecode-resources/"
- (file-name-directory (or load-file-name
- buffer-file-name))))
- "Base directory of uudecode-tests.el test data files.")
-
(defun uudecode-tests-read-file (file)
"Read contents of FILE and return as string."
(with-temp-buffer
@@ -40,13 +34,11 @@
(buffer-string)))
(defvar uudecode-tests-encoded-str
- (uudecode-tests-read-file
- (expand-file-name "uuencoded.txt" uudecode-tests-data-dir))
+ (uudecode-tests-read-file (ert-resource-file "uuencoded.txt"))
"Uuencoded data for bookmark-tests.el
Same as `uudecode-tests-decoded-str' but uuencoded.")
(defvar uudecode-tests-decoded-str
- (uudecode-tests-read-file
- (expand-file-name "uudecoded.txt" uudecode-tests-data-dir))
+ (uudecode-tests-read-file (ert-resource-file "uudecoded.txt"))
"Plain text data for bookmark-tests.el
Same as `uudecode-tests-encoded-str' but plain text.")
diff --git a/test/lisp/net/dbus-tests.el b/test/lisp/net/dbus-tests.el
index 4d34a1a..2186d45 100644
--- a/test/lisp/net/dbus-tests.el
+++ b/test/lisp/net/dbus-tests.el
@@ -22,6 +22,7 @@
;;; Code:
(require 'ert)
+(require 'ert-x)
(require 'dbus)
(defvar dbus-debug nil)
@@ -46,13 +47,6 @@
(defconst dbus--test-interface "org.gnu.Emacs.TestDBus.Interface"
"Test interface.")
-(defconst dbus--tests-dir
- (file-truename
- (expand-file-name "dbus-resources"
- (file-name-directory (or load-file-name
- buffer-file-name))))
- "Directory containing introspection test data file.")
-
(defun dbus--test-availability (bus)
"Test availability of D-Bus BUS."
(should (dbus-list-names bus))
@@ -1555,7 +1549,7 @@ Subsequent pairs of the list are tested with
`dbus-set-property'."
(when (string-equal dbus--test-path (dbus-event-path-name last-input-event))
(with-temp-buffer
(insert-file-contents-literally
- (expand-file-name "org.gnu.Emacs.TestDBus.xml" dbus--tests-dir))
+ (ert-resource-file "org.gnu.Emacs.TestDBus.xml"))
(buffer-string))))
(defsubst dbus--test-validate-interface
diff --git a/test/lisp/net/tramp-archive-tests.el
b/test/lisp/net/tramp-archive-tests.el
index 9a23191..988288c 100644
--- a/test/lisp/net/tramp-archive-tests.el
+++ b/test/lisp/net/tramp-archive-tests.el
@@ -27,25 +27,55 @@
;; tests in tramp-tests.el.
(require 'ert)
+(require 'ert-x)
(require 'tramp-archive)
(defvar tramp-copy-size-limit)
(defvar tramp-persistency-file-name)
-(defconst tramp-archive-test-resource-directory
- (let ((default-directory
- (if load-in-progress
- (file-name-directory load-file-name)
- default-directory)))
- (cond
- ((file-accessible-directory-p (expand-file-name "resources"))
- (expand-file-name "resources"))
- ((file-accessible-directory-p (expand-file-name
"tramp-archive-resources"))
- (expand-file-name "tramp-archive-resources"))))
- "The resources directory test files are located in.")
-
-(defconst tramp-archive-test-file-archive
- (file-truename
- (expand-file-name "foo.tar.gz" tramp-archive-test-resource-directory))
+;; `ert-resource-file' was introduced in Emacs 28.1.
+(unless (macrop 'ert-resource-file)
+ (eval-and-compile
+ (defvar ert-resource-directory-format "%s-resources/"
+ "Format for `ert-resource-directory'.")
+ (defvar ert-resource-directory-trim-left-regexp ""
+ "Regexp for `string-trim' (left) used by `ert-resource-directory'.")
+ (defvar ert-resource-directory-trim-right-regexp "\\(-tests?\\)?\\.el"
+ "Regexp for `string-trim' (right) used by `ert-resource-directory'.")
+
+ (defmacro ert-resource-directory ()
+ "Return absolute file name of the resource directory for this file.
+
+The path to the resource directory is the \"resources\" directory
+in the same directory as the test file.
+
+If that directory doesn't exist, use the directory named like the
+test file but formatted by `ert-resource-directory-format' and trimmed
+using `string-trim' with arguments
+`ert-resource-directory-trim-left-regexp' and
+`ert-resource-directory-trim-right-regexp'. The default values mean
+that if called from a test file named \"foo-tests.el\", return
+the absolute file name for \"foo-resources\"."
+ `(let* ((testfile ,(or (bound-and-true-p byte-compile-current-file)
+ (and load-in-progress load-file-name)
+ buffer-file-name))
+ (default-directory (file-name-directory testfile)))
+ (file-truename
+ (if (file-accessible-directory-p "resources/")
+ (expand-file-name "resources/")
+ (expand-file-name
+ (format
+ ert-resource-directory-format
+ (string-trim testfile
+ ert-resource-directory-trim-left-regexp
+ ert-resource-directory-trim-right-regexp)))))))
+
+ (defmacro ert-resource-file (file)
+ "Return file name of resource file named FILE.
+A resource file is in the resource directory as per
+`ert-resource-directory'."
+ `(expand-file-name ,file (ert-resource-directory)))))
+
+(defconst tramp-archive-test-file-archive (ert-resource-file "foo.tar.gz")
"The test file archive.")
(defun tramp-archive-test-file-archive-hexlified ()
@@ -59,8 +89,7 @@ Do not hexlify \"/\". This hexlified string is used in
`file:///' URLs."
"The test archive.")
(defconst tramp-archive-test-directory
- (file-truename
- (expand-file-name "foo.iso" tramp-archive-test-resource-directory))
+ (file-truename (ert-resource-file "foo.iso"))
"A directory file name, which looks like an archive.")
(setq password-cache-expiry nil
diff --git a/test/lisp/pcmpl-linux-tests.el b/test/lisp/pcmpl-linux-tests.el
index cf7e628..91a9965 100644
--- a/test/lisp/pcmpl-linux-tests.el
+++ b/test/lisp/pcmpl-linux-tests.el
@@ -22,25 +22,17 @@
;;; Code:
(require 'ert)
+(require 'ert-x)
(require 'pcmpl-linux)
-(defvar pcmpl-linux-tests-data-dir
- (file-truename
- (expand-file-name "pcmpl-linux-resources/"
- (file-name-directory (or load-file-name
- buffer-file-name))))
- "Base directory of pcmpl-linux-tests.el data files.")
-
(ert-deftest pcmpl-linux-test-fs-types ()
- (let ((pcmpl-linux-fs-modules-path-format (expand-file-name "fs"
-
pcmpl-linux-tests-data-dir)))
+ (let ((pcmpl-linux-fs-modules-path-format (ert-resource-file "fs")))
;; FIXME: Shouldn't return "." and ".."
(should (equal (pcmpl-linux-fs-types)
'("." ".." "ext4")))))
(ert-deftest pcmpl-linux-test-mounted-directories ()
- (let ((pcmpl-linux-mtab-file (expand-file-name "mtab"
- pcmpl-linux-tests-data-dir)))
+ (let ((pcmpl-linux-mtab-file (ert-resource-file "mtab")))
(should (equal (pcmpl-linux-mounted-directories)
'("/" "/dev" "/dev/pts" "/dev/shm" "/home/alice/.gvfs"
"/lib/modules/2.6.24-16-generic/volatile" "/proc" "/sys"
diff --git a/test/lisp/progmodes/cperl-mode-tests.el
b/test/lisp/progmodes/cperl-mode-tests.el
index 20be7ed..e2af2b5 100644
--- a/test/lisp/progmodes/cperl-mode-tests.el
+++ b/test/lisp/progmodes/cperl-mode-tests.el
@@ -32,14 +32,7 @@
(require 'cperl-mode)
(require 'ert)
-
-(defvar cperl-mode-tests-data-directory
- (expand-file-name "lisp/progmodes/cperl-mode-resources"
- (or (getenv "EMACS_TEST_DIRECTORY")
- (expand-file-name "../../../"
- (or load-file-name
- buffer-file-name))))
- "Directory containing cperl-mode test data.")
+(require 'ert-x)
(defun cperl-test-ppss (text regexp)
"Return the `syntax-ppss' of the first character matched by REGEXP in TEXT."
@@ -149,8 +142,7 @@ These exercise some standard blocks and also the special
treatment for Perl expressions where a closing paren isn't the
end of the statement."
(skip-unless (eq cperl-test-mode #'cperl-mode))
- (let ((file (expand-file-name "cperl-indent-exp.pl"
- cperl-mode-tests-data-directory)))
+ (let ((file (ert-resource-file "cperl-indent-exp.pl")))
(with-temp-buffer
(insert-file-contents file)
(goto-char (point-min))
@@ -179,8 +171,7 @@ end of the statement."
Perl Best Practices sets some indentation values different from
the defaults, and also wants an \"else\" or \"elsif\" keyword
to align with the \"if\"."
- (let ((file (expand-file-name "cperl-indent-styles.pl"
- cperl-mode-tests-data-directory)))
+ (let ((file (ert-resource-file "cperl-indent-styles.pl")))
(with-temp-buffer
(cperl-set-style "PBP")
(insert-file-contents file)
diff --git a/test/lisp/progmodes/flymake-tests.el
b/test/lisp/progmodes/flymake-tests.el
index df72b52..c62a2db 100644
--- a/test/lisp/progmodes/flymake-tests.el
+++ b/test/lisp/progmodes/flymake-tests.el
@@ -23,17 +23,10 @@
;;; Code:
(require 'ert)
+(require 'ert-x)
(require 'flymake)
(eval-when-compile (require 'subr-x)) ; string-trim
-(defvar flymake-tests-data-directory
- (expand-file-name "lisp/progmodes/flymake-resources"
- (or (getenv "EMACS_TEST_DIRECTORY")
- (expand-file-name "../../.."
- (or load-file-name
- buffer-file-name))))
- "Directory containing flymake test data.")
-
;;
;;
@@ -63,7 +56,7 @@
"Call FN after flymake setup in FILE, using `flymake-proc`.
SEVERITY-PREDICATE is used to setup
`flymake-proc-diagnostic-type-pred'"
- (let* ((file (expand-file-name file flymake-tests-data-directory))
+ (let* ((file (ert-resource-file file))
(visiting (find-buffer-visiting file))
(buffer (or visiting (find-file-noselect file)))
(process-environment (cons "LC_ALL=C" process-environment))
diff --git a/test/lisp/progmodes/ruby-mode-tests.el
b/test/lisp/progmodes/ruby-mode-tests.el
index 6675fb2..97ac1e1 100644
--- a/test/lisp/progmodes/ruby-mode-tests.el
+++ b/test/lisp/progmodes/ruby-mode-tests.el
@@ -22,14 +22,9 @@
;;; Code:
(require 'ert)
+(require 'ert-x)
(require 'ruby-mode)
-(defvar ruby-mode-tests-data-dir
- (file-truename
- (expand-file-name "ruby-mode-resources/"
- (file-name-directory (or load-file-name
- buffer-file-name)))))
-
(defmacro ruby-with-temp-buffer (contents &rest body)
(declare (indent 1) (debug t))
`(with-temp-buffer
@@ -851,8 +846,7 @@ VALUES-PLIST is a list with alternating index and value
elements."
(ert-deftest ruby--indent/converted-from-manual-test ()
:tags '(:expensive-test)
;; Converted from manual test.
- (let ((buf (find-file-noselect (expand-file-name "ruby.rb"
- ruby-mode-tests-data-dir))))
+ (let ((buf (find-file-noselect (ert-resource-file "ruby.rb"))))
(unwind-protect
(with-current-buffer buf
(let ((orig (buffer-string)))
diff --git a/test/lisp/saveplace-tests.el b/test/lisp/saveplace-tests.el
index ae7749f..8d31e28 100644
--- a/test/lisp/saveplace-tests.el
+++ b/test/lisp/saveplace-tests.el
@@ -22,29 +22,25 @@
;;; Commentary:
(require 'ert)
+(require 'ert-x)
(require 'saveplace)
-(defvar saveplace-tests-dir
- (file-truename
- (expand-file-name "saveplace-resources"
- (file-name-directory (or load-file-name
- buffer-file-name)))))
-
(ert-deftest saveplace-test-save-place-to-alist/dir ()
(save-place-mode)
(let* ((save-place-alist nil)
(save-place-loaded t)
- (loc saveplace-tests-dir))
+ (loc (ert-resource-directory)))
(save-window-excursion
(dired loc)
(save-place-to-alist)
(should (equal save-place-alist
- `((,(concat loc "/")
- (dired-filename . ,(concat loc "/saveplace")))))))))
+ `((,loc
+ (dired-filename . ,(concat loc "saveplace")))))))))
(ert-deftest saveplace-test-save-place-to-alist/file ()
(save-place-mode)
(let* ((tmpfile (make-temp-file "emacs-test-saveplace-"))
+ (tmpfile (file-truename tmpfile))
(save-place-alist nil)
(save-place-loaded t)
(loc tmpfile)
@@ -91,7 +87,7 @@
(save-place-mode)
(let ((save-place-loaded nil)
(save-place-file
- (expand-file-name "saveplace" saveplace-tests-dir))
+ (ert-resource-file "saveplace"))
(save-place-alist nil))
(load-save-place-alist-from-file)
(should (equal save-place-alist
diff --git a/test/lisp/textmodes/css-mode-tests.el
b/test/lisp/textmodes/css-mode-tests.el
index f627d1c..476fd32 100644
--- a/test/lisp/textmodes/css-mode-tests.el
+++ b/test/lisp/textmodes/css-mode-tests.el
@@ -28,14 +28,9 @@
(require 'css-mode)
(require 'ert)
+(require 'ert-x)
(require 'seq)
-(defvar css-mode-tests-data-dir
- (file-truename
- (expand-file-name "css-mode-resources/"
- (file-name-directory (or load-file-name
- buffer-file-name)))))
-
(ert-deftest css-test-property-values ()
;; The `float' property has a flat value list.
(should
@@ -419,8 +414,7 @@
(ert-deftest css-mode-test-indent ()
(with-current-buffer
- (find-file-noselect (expand-file-name "test-indent.css"
- css-mode-tests-data-dir))
+ (find-file-noselect (ert-resource-file "test-indent.css"))
(let ((orig (buffer-string)))
(indent-region (point-min) (point-max))
(should (equal (buffer-string) orig)))))
diff --git a/test/lisp/url/url-file-tests.el b/test/lisp/url/url-file-tests.el
index e4a45fb..810504f 100644
--- a/test/lisp/url/url-file-tests.el
+++ b/test/lisp/url/url-file-tests.el
@@ -23,18 +23,11 @@
(require 'url-file)
(require 'ert)
-
-(defconst url-file-tests-data-directory
- (expand-file-name "lisp/url/url-file-resources"
- (or (getenv "EMACS_TEST_DIRECTORY")
- (expand-file-name "../../.."
- (or load-file-name
- buffer-file-name))))
- "Directory for url-file test files.")
+(require 'ert-x)
(ert-deftest url-file ()
"Test reading file via file:/// URL."
- (let* ((file (expand-file-name "file.txt" url-file-tests-data-directory))
+ (let* ((file (ert-resource-file "file.txt"))
(uri-prefix (if (eq (aref file 0) ?/) "file://" "file:///")))
(should (equal
(with-current-buffer