branch: externals/org-modern
commit fe226e8bc11ab7985918e5407868bff642c4fb87
Author: JD Smith <93749+jdtsm...@users.noreply.github.com>
Commit: Daniel Mendler <m...@daniel-mendler.de>
Move README indent section, do not yet bump version
---
CHANGELOG.org | 4 +---
README.org | 20 ++++++++++----------
org-modern-indent.el | 6 ++----
3 files changed, 13 insertions(+), 17 deletions(-)
diff --git a/CHANGELOG.org b/CHANGELOG.org
index 359dede5ef..c25a84ba62 100644
--- a/CHANGELOG.org
+++ b/CHANGELOG.org
@@ -86,7 +86,7 @@
2. Caches all prefix strings for lower memory usage/GC churn.
3. No more "runaway" formatting when partial blocks are created:
only _real_ blocks (according to ~org-element~) are
-
+
Note that v0.5 implements indented block styling using display
properties on the indentation text, so navigation will "skip over"
it.
@@ -98,5 +98,3 @@
2. Eliminates the "race" between font-locking and applying the prefix text
properties.
3. Enables in-text bracket decorations for "bulk-indented" blocks, for
example blocks situated
in an arbitrarily-nested plain list item.
-
-
diff --git a/README.org b/README.org
index 9753947dc6..1c87a05c18 100644
--- a/README.org
+++ b/README.org
@@ -33,6 +33,16 @@ recommend variants of the
[[https://github.com/be5invis/Iosevka][Iosevka]] font,
the Org buffer. Larger values of =line-spacing= are not recommended, since
Emacs
does not center the text vertically (see Emacs
[[https://debbugs.gnu.org/cgi/bugreport.cgi?bug=76390][bug#76390]]).
+* Indent
+
+Since version 2.0, this package also incorporates ~org-modern-indent~, which
provides block bracket styling when ~org-indent~ is enabled, including support
for "bulk-indented" blocks nested within plain lists:
+
+#+html: <img width="716" alt="image"
src="https://github.com/user-attachments/assets/7ca42ce7-dcfb-4c66-b5f4-1798a4fd4df5";
/>
+
+~org-modern-indent~ is enabled by ~org-modern~ by default if you use
~org-indent~; configure ~org-modern-indent-block=nil~ to disable this behavior.
To activate ~org-indent-mode~ in all org files, set ~org-startup-indented=t~.
+
+*Note*: Non-nil ~line-spacing~ is not recommended with ~org-modern-indent~, as
it leads to gaps in the vertical bars drawn to indicate blocks.
+
* Configuration
The package is available on GNU ELPA and MELPA. You can install the package
with
@@ -121,16 +131,6 @@ An alternative setup, using ~use-package~ and modifying
some of the display enti
#+end_src
-* Indent
-
-Since version 2.0, this package incorporates ~org-modern-indent~, which
provides block bracket styling when ~org-indent~ is enabled, including support
for "bulk-indented" blocks nested within plain lists:
-
-#+html: <img width="716" alt="image"
src="https://github.com/user-attachments/assets/7ca42ce7-dcfb-4c66-b5f4-1798a4fd4df5";
/>
-
-~org-modern-indent~ is enabled by ~org-modern~ by default if you use
~org-indent~; configure ~org-modern-indent-block=nil~ to disable this behavior.
To activate ~org-indent-mode~ in all org files, set ~org-startup-indented=t~.
-
-*Note*: Non-nil ~line-spacing~ is not recommended with ~org-modern-indent~, as
it leads to gaps in the vertical bars drawn to indicate blocks.
-
* Incompatibilities
- =org-num-mode= interferes with the =org-modern= prettification of TODO
keywords.
diff --git a/org-modern-indent.el b/org-modern-indent.el
index 11dfaf58ef..0f70513852 100644
--- a/org-modern-indent.el
+++ b/org-modern-indent.el
@@ -4,9 +4,6 @@
;; Author: J.D. Smith
;; Created 2022
-;; Version: 0.6
-;; Package-Requires: ((emacs "27.1") (org "9.6") (compat "30"))
-;; URL: https://github.com/jdtsmith/org-modern-indent
;; Keywords: convenience, text
;; This file is part of GNU Emacs.
@@ -28,7 +25,8 @@
;; `org-modern-indent' is an `org-modern' extension which approximates
;; the block highlighting style of `org-modern'. By default, it is
-;; activated when `org-indent' is is active in the buffer.
+;; activated when `org-indent' is is active in the buffer. It was
+;; merged into `org-modern' as of v2.0.
;;; Code:
(require 'compat)
