diff options
| author | Bastien <bzg@gnu.org> | 2018-04-28 12:11:08 +0200 |
|---|---|---|
| committer | Bastien <bzg@gnu.org> | 2018-04-28 12:11:08 +0200 |
| commit | 8f572aa23b3d21dce146bfac317a704e526d1801 (patch) | |
| tree | 05cb786c90ad3be80f2c1fdf1af01487bd620bd3 | |
| parent | 011f1c6181483aca0c0596092a464a049ab507d3 (diff) | |
| parent | 2e2b083024ee1993fff4cdacde9967039879c61d (diff) | |
| download | org-mode-8f572aa23b3d21dce146bfac317a704e526d1801.tar.gz | |
Merge branch 'master' of code.orgmode.org:bzg/org-mode
| -rw-r--r-- | lisp/org-faces.el | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lisp/org-faces.el b/lisp/org-faces.el index ef00f5b..e661207 100644 --- a/lisp/org-faces.el +++ b/lisp/org-faces.el @@ -395,8 +395,7 @@ follows a #+DATE:, #+AUTHOR: or #+EMAIL: keyword." (defface org-block '((t :inherit shadow)) "Face text in #+begin ... #+end blocks. -For source-blocks `org-src-block-faces' takes precedence. -See also `org-fontify-quote-and-verse-blocks'." +For source-blocks `org-src-block-faces' takes precedence." :group 'org-faces :version "26.1") @@ -414,11 +413,13 @@ See also `org-fontify-quote-and-verse-blocks'." :version "22.1") (defface org-quote '((t (:inherit org-block))) - "Face for #+BEGIN_QUOTE ... #+END_QUOTE blocks." + "Face for #+BEGIN_QUOTE ... #+END_QUOTE blocks. +Active when `org-fontify-quote-and-verse-blocks' is set." :group 'org-faces) (defface org-verse '((t (:inherit org-block))) - "Face for #+BEGIN_VERSE ... #+END_VERSE blocks." + "Face for #+BEGIN_VERSE ... #+END_VERSE blocks. +Active when `org-fontify-quote-and-verse-blocks' is set." :group 'org-faces) (defcustom org-fontify-quote-and-verse-blocks nil |