diff options
author | Bastien Guerry <bastien.guerry@data.gouv.fr> | 2020-09-10 11:19:55 +0200 |
---|---|---|
committer | Bastien Guerry <bastien.guerry@data.gouv.fr> | 2020-09-10 11:19:55 +0200 |
commit | 8a083514a766abb601c50283c05c3f49805e0f66 (patch) | |
tree | 57328fecc974b164f3f0d99908ad1155b335e009 | |
parent | dcb6eb613a665434c153cca31c00f5db78280b36 (diff) | |
download | org-mode-8a083514a766abb601c50283c05c3f49805e0f66.tar.gz |
org-faces.el (org-block): Enhance docstring
* lisp/org-faces.el (org-block): Enhance docstring.
* lisp/org.el (org-fontify-meta-lines-and-blocks-1): Clean up some
comments.
See 7769518f3, which was wrong.
-rw-r--r-- | lisp/org-faces.el | 11 | ||||
-rw-r--r-- | lisp/org.el | 18 |
2 files changed, 20 insertions, 9 deletions
diff --git a/lisp/org-faces.el b/lisp/org-faces.el index 4e4dc68..c0556b8 100644 --- a/lisp/org-faces.el +++ b/lisp/org-faces.el @@ -410,8 +410,15 @@ follows a #+DATE:, #+AUTHOR: or #+EMAIL: keyword." (defface org-block `((t :inherit shadow ,@(and (>= emacs-major-version 27) '(:extend t)))) - "Face text in #+begin ... #+end blocks. -For source-blocks `org-src-block-faces' takes precedence." + "Face used for text inside various blocks. + +It is always used for source blocks. You can refine what face +should be used depending on the source block language by setting, +`org-src-block-faces', which takes precedence. + +When `org-fontify-quote-and-verse-blocks' is not nil, text inside +verse and quote blocks are fontified using the `org-verse' and +`org-quote' faces, which inherit from `org-block'." :group 'org-faces :version "26.1") diff --git a/lisp/org.el b/lisp/org.el index 8913fa8..5fb01b5 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -5231,9 +5231,11 @@ by a #." limit t) (let ((beg (match-beginning 0)) (end-of-beginline (match-end 0)) - (block-start (match-end 0)) ; includes the \n at end of #+begin line - (block-end nil) ; will include \n after end of block content - (lang (match-string 7)) ; the language, if it is an src block + ;; Including \n at end of #+begin line will include \n + ;; after the end of block content. + (block-start (match-end 0)) + (block-end nil) + (lang (match-string 7)) ; The language, if it is a source block. (bol-after-beginline (line-beginning-position 2)) (dc1 (downcase (match-string 2))) (dc3 (downcase (match-string 3))) @@ -5243,7 +5245,8 @@ by a #." ((and (match-end 4) (equal dc3 "+begin")) ;; Truly a block (setq block-type (downcase (match-string 5)) - quoting (member block-type org-protecting-blocks)) ; src, example, export, maybe more + ;; Src, example, export, maybe more. + quoting (member block-type org-protecting-blocks)) (when (re-search-forward (rx-to-string `(group bol (or (seq (one-or-more "*") space) (seq (zero-or-more blank) @@ -5251,12 +5254,13 @@ by a #." ,(match-string 4) word-end (zero-or-more any))))) - nil t) ;; on purpose, we look further than LIMIT - ;; We do have a matching #+end line + ;; We look further than LIMIT on purpose. + nil t) + ;; We do have a matching #+end line. (setq beg-of-endline (match-beginning 0) end-of-endline (match-end 0) nl-before-endline (1- (match-beginning 0))) - (setq block-end (match-beginning 0)) ; includes the final newline. + (setq block-end (match-beginning 0)) ; Include the final newline. (when quoting (org-remove-flyspell-overlays-in bol-after-beginline nl-before-endline) (remove-text-properties beg end-of-endline |