Merge branch 'bugfix'

This commit is contained in:
Bastien 2022-04-19 11:27:03 +02:00
commit bee31004bc
2 changed files with 11 additions and 12 deletions

View File

@ -586,6 +586,9 @@ This is the CSS class name to use for the top level content wrapper.
*** New option ~org-babel-plantuml-svg-text-to-path~
** New features
*** =ob-python= improvements to =:return= header argument
This option, nil by default, allows to add a SVG-specific post-export
step that runs inkscape text-to-path replacement over the output file.

View File

@ -38,8 +38,7 @@
:group 'org-faces)
(defface org-hide
'((default :inherit fixed-pitch)
(((background light)) (:foreground "white"))
'((((background light)) (:foreground "white"))
(((background dark)) (:foreground "black")))
"Face used to hide leading stars in headlines.
The foreground color of this face should be equal to the background
@ -202,8 +201,7 @@ set the properties in the `org-column' face. For example, set
:group 'org-faces)
(defface org-date
'((default :inherit fixed-pitch)
(((class color) (background light)) (:foreground "Purple" :underline t))
'((((class color) (background light)) (:foreground "Purple" :underline t))
(((class color) (background dark)) (:foreground "Cyan" :underline t))
(t (:underline t)))
"Face for date/time stamps."
@ -379,8 +377,7 @@ changes."
(sexp :tag "Face")))))
(defface org-table ;Copied from `font-lock-function-name-face'
'((default :inherit fixed-pitch)
(((class color) (min-colors 88) (background light)) (:foreground "Blue1"))
'((((class color) (min-colors 88) (background light)) (:foreground "Blue1"))
(((class color) (min-colors 88) (background dark)) (:foreground "LightSkyBlue"))
(((class color) (min-colors 16) (background light)) (:foreground "Blue"))
(((class color) (min-colors 16) (background dark)) (:foreground "LightSkyBlue"))
@ -396,8 +393,7 @@ changes."
:group 'org-faces)
(defface org-formula
'((default :inherit fixed-pitch)
(((class color) (min-colors 88) (background light)) (:foreground "Firebrick"))
'((((class color) (min-colors 88) (background light)) (:foreground "Firebrick"))
(((class color) (min-colors 88) (background dark)) (:foreground "chocolate1"))
(((class color) (min-colors 8) (background light)) (:foreground "red"))
(((class color) (min-colors 8) (background dark)) (:foreground "red"))
@ -405,12 +401,12 @@ changes."
"Face for formulas."
:group 'org-faces)
(defface org-code '((t :inherit (fixed-pitch shadow)))
(defface org-code '((t :inherit shadow))
"Face for fixed-width text like code snippets."
:group 'org-faces
:version "22.1")
(defface org-meta-line '((t :inherit (fixed-pitch font-lock-comment-face)))
(defface org-meta-line '((t :inherit font-lock-comment-face))
"Face for meta lines starting with \"#+\"."
:group 'org-faces
:version "22.1")
@ -437,7 +433,7 @@ This face applies to the #+TITLE:, #+SUBTITLE:, #+AUTHOR:,
#+EMAIL: and #+DATE: keywords."
:group 'org-faces)
(defface org-block `((t :inherit (fixed-pitch shadow)
(defface org-block `((t :inherit shadow
,@(and (>= emacs-major-version 27) '(:extend t))))
"Face used for text inside various blocks.
@ -463,7 +459,7 @@ verse and quote blocks are fontified using the `org-verse' and
"Face used for inline source blocks as a whole."
:group 'org-faces)
(defface org-verbatim '((t (:inherit (fixed-pitch shadow))))
(defface org-verbatim '((t (:inherit shadow)))
"Face for fixed-with text like code snippets."
:group 'org-faces
:version "22.1")