[elpa] externals/org-modern 78e9f60aeb 7/7: Go back to 6be89091569a83bacaa45e62d7965e74ad1cbbf7

[ELPA Syncer]

branch: externals/org-modern
commit 78e9f60aebb937e3e1670ab5db0b225f6b602647
Author: Daniel Mendler <mail@daniel-mendler.de>
Commit: Daniel Mendler <mail@daniel-mendler.de>

    Go back to 6be89091569a83bacaa45e62d7965e74ad1cbbf7
---
 org-modern.el | 75 +++++++++--------------------------------------------------
 1 file changed, 11 insertions(+), 64 deletions(-)

diff --git a/org-modern.el b/org-modern.el
index 2ca6a7674c..0b48bf803c 100644
--- a/org-modern.el
+++ b/org-modern.el
@@ -157,27 +157,8 @@ and faces in the cdr. Example:
   "Prettify tags in headlines, e.g., :tag1:tag2:."
   :type 'boolean)
 
-(defcustom org-modern-block-name t
-  "Prettify blocks names, i.e. #+begin_NAME and #+end_NAME lines.
-If set to a list of two strings, e.g. (\"‣\" \"‣\"), the strings are
-used as replacements for the #+begin_ and #+end_ prefixes, respectively.
-
-If set to an alist of block names and cons cells of strings, the associated
-strings will be used as a replacements for the whole of #+begin_NAME and
-#+end_NAME, respectively, and the association with t treated as the value for
-all other blocks."
-  :type '(choice (boolean :tag "Hide #+begin_ and #+end_ prefixes")
-                 (cons (string :tag "#+begin_ replacement")
-                       (string :tag "#+end_ replacement"))
-                 (const :tag "Triangle bullets" ("‣" . "‣"))
-                 (alist :key-type (choice (string :tag "Block")
-                                          (const :tag "Default" t))
-                        :value-type (choice (list (string :tag "#+begin_NAME 
replacement")
-                                                  (string :tag "#+end_NAME 
replacement"))
-                                            (boolean :tag "Hide #+begin_ and 
#+end_ prefixes")))))
-
-(defcustom org-modern-block-fringe t
-  "Add a bitmap fringe to blocks."
+(defcustom org-modern-block t
+  "Prettify blocks, wrapped by #+begin and #+end keywords."
   :type 'boolean)
 
 (defcustom org-modern-keyword t
@@ -226,7 +207,7 @@ You can specify a font `:family'. The font families 
`Iosevka', `Hack' and
   `((t :height 0.9 :width condensed :weight regular :underline nil))
   "Parent face for labels.")
 
-(defface org-modern-block-name
+(defface org-modern-block-keyword
   '((t :height 0.8 :weight light))
   "Face used for block keywords.")
 
@@ -297,26 +278,6 @@ You can specify a font `:family'. The font families 
`Iosevka', `Hack' and
 (defvar-local org-modern--keywords nil
   "List of font lock keywords.")
 
-(defun org-modern--block-name ()
-  "Prettify block according to `org-modern-block-name'."
-  (let ((beg (match-beginning 1))
-        (beg-name (match-beginning 2))
-        (end (match-end 2))
-        (end-rep (match-end 2))
-        (rep (assoc (match-string 2) org-modern-block-name)))
-    (unless rep
-      (setq rep (assq t org-modern-block-name)
-            end-rep beg-name))
-    (when (consp (cdr rep))
-      (setcdr rep (if (= 7 (length (match-string 1))) (cadr rep) (caddr rep))))
-    (pcase (cdr rep)
-      ('t
-       (put-text-property beg beg-name 'invisible t)
-       (add-face-text-property beg-name end 'org-modern-block-name 'append))
-      ((pred stringp)
-       (put-text-property beg end-rep 'display
-                          (propertize rep 'face 'org-modern-symbol))))))
-
 (defun org-modern--checkbox ()
   "Prettify checkboxes according to `org-modern-checkbox'."
   (let ((beg (match-beginning 1))
@@ -586,28 +547,14 @@ You can specify a font `:family'. The font families 
`Iosevka', `Hack' and
         '(("^-\\{5,\\}$" 0 '(face org-modern-horizontal-rule display (space 
:width text)))))
       (when org-modern-table
         '(("^[ \t]*\\(|.*|\\)[ \t]*$" (0 (org-modern--table)))))
-      (when org-modern-block-fringe
-        '("^[ \t]*#\\+\\(?:begin\\|BEGIN\\)_\\S-" (0 
(org-modern--block-fringe))))
-      (when-let ((block-specs
-                  (cond
-                   ((eq org-modern-block-name t) ; hide
-                    '(((1 '(face nil invisible t))
-                       (2 'org-modern-block-name append)) .
-                       ((1 '(face nil invisible t))
-                        (2 'org-modern-block-name append))))
-                   ((and (consp org-modern-block-name) ; static replacement
-                         (stringp (car org-modern-block-name)))
-                    `(((1 '(face nil display ,(car org-modern-block-name)))
-                       (2 'org-modern-block-name append)) .
-                       ((1 '(face nil display ,(cadr org-modern-block-name)))
-                        (2 'org-modern-block-name append))))
-                   ((and (consp org-modern-block-name) ; dynamic replacement
-                         (consp (car org-modern-block-name)))
-                    '(((0 (org-modern--block-name))) . ((0 
(org-modern--block-name))))))))
-        `(("^[ \t]*\\(#\\+\\(?:begin\\|BEGIN\\)_\\)\\(\\S-+\\).*"
-           ,@(car block-specs))
-          ("^[ \t]*\\(#\\+\\(?:end\\|END\\)_\\)\\(\\S-+\\).*"
-           ,@(cdr block-specs))))
+      (when org-modern-block
+        '(("^[ \t]*#\\+\\(?:begin\\|BEGIN\\)_\\S-" (0 
(org-modern--block-fringe)))
+          ("^\\([ \t]*#\\+\\(?:begin\\|BEGIN\\)_\\)\\(\\S-+\\).*"
+           (1 '(face nil display (space :width (3))))
+           (2 'org-modern-block-keyword append))
+          ("^\\([ \t]*#\\+\\(?:end\\|END\\)_\\)\\(\\S-+\\).*"
+           (1 '(face nil display (space :width (3))))
+           (2 'org-modern-block-keyword append))))
       (when org-modern-tag
         `((,(concat "^\\*+.*?\\( \\)\\(:\\(?:" org-tag-re ":\\)+\\)[ \t]*$")
            (0 (org-modern--tag)))))