From 7769518f3a1a43e8e63dd0dcf5e74d6fb98b6ebc Mon Sep 17 00:00:00 2001 From: Bastien Date: Mon, 7 Sep 2020 07:31:11 +0200 Subject: [PATCH] Use the `org-block' face for every true blocks MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * lisp/org-faces.el (org-block): Tiny docstring enhancement. * lisp/org.el (org-fontify-meta-lines-and-blocks-1): Use the `org-block' face for every true blocks. Reported-by: Sébastien Miquel https://orgmode.org/list/42749c98-ddfe-bad4-43a5-1119e24972bd@posteo.eu --- lisp/org-faces.el | 2 +- lisp/org.el | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/lisp/org-faces.el b/lisp/org-faces.el index ff2b0e611..3afe2ecf3 100644 --- a/lisp/org-faces.el +++ b/lisp/org-faces.el @@ -396,7 +396,7 @@ 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." +For source-blocks, `org-src-block-faces' takes precedence." :group 'org-faces :version "26.1") diff --git a/lisp/org.el b/lisp/org.el index 175070d81..dff486f00 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -5263,9 +5263,9 @@ 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-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 + (lang (match-string 7)) ; the language, if it is an src block. (bol-after-beginline (line-beginning-position 2)) (dc1 (downcase (match-string 2))) (dc3 (downcase (match-string 3))) @@ -5283,12 +5283,12 @@ 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 + nil t) ; On purpose, we look further than LIMIT. + ;; 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)) ; Includes the final newline. (when quoting (org-remove-flyspell-overlays-in bol-after-beginline nl-before-endline) (remove-text-properties beg end-of-endline @@ -5317,7 +5317,10 @@ by a #." ((string= block-type "verse") (add-face-text-property bol-after-beginline beg-of-endline 'org-verse t))) - ;; Fontify the #+begin and #+end lines of the blocks + ;; Use the org-block face for all true blocks. + (add-text-properties + bol-after-beginline beg-of-endline (list 'face 'org-block)) + ;; Fontify the #+begin and #+end lines of the blocks. (add-text-properties beg (if whole-blockline bol-after-beginline end-of-beginline) '(face org-block-begin-line))