Merge branch 'master' into master

Author: milanglacier

DOCS.md

@@ -23,6 +23,7 @@
 9. [User interface](#user-interface)
    1. [Colors](#colors)
    2. [Menu](#menu)
+   3. [Folds](#folds)
 10. [Advanced search](#advanced-search)
 11. [Notifications (experimental)](#notifications-experimental)
 12. [Clocking](#clocking)
@@ -1859,6 +1860,21 @@ Each menu item `MenuItem` is one of two types: `MenuOption` and `MenuSeparator`.
 
 In order for the menu to work as expected, the handler must call `action` from `MenuItem`.
 
+### Folds
+In Neovim 0.10+, folds are colored with the same highlight as when they are expanded.
+This is enabled by default to be in line with how Emacs work.
+
+To use the old way of highlighting folds with `Folded` highlight group, add this to config:
+```lua
+require('orgmode').setup({
+  ui = {
+    folds = {
+      colored = false
+    }
+  }
+})
+```
+
 ## Advanced search
 
 Part of [Advanced search](https://orgmode.org/worg/org-tutorials/advanced-searching.html) functionality

doc/orgmode.txt

@@ -182,6 +182,7 @@ CONTENTS                                                        *orgmode-content
         1.9.1. Colors.............................................|orgmode-colors|
             1.9.1.1. Overriding colors.................|orgmode-overriding_colors|
         1.9.2. Menu.................................................|orgmode-menu|
+        1.9.3. Folds...............................................|orgmode-folds|
     1.10. Advanced search................................|orgmode-advanced_search|
     1.11. Notifications (experimental)......|orgmode-notifications_(experimental)|
         1.11.1. Cron................................................|orgmode-cron|
@@ -228,6 +229,7 @@ TABLE OF CONTENT                                        *orgmode-table_of_conten
 9.  User interface (#user-interface)
     1.  Colors (#colors)
     2.  Menu (#menu)
+    3.  Folds (#folds)
 10. Advanced search (#advanced-search)
 11. Notifications (experimental) (#notifications-experimental)
 12. Clocking (#clocking)
@@ -2023,6 +2025,22 @@ Each menu item `MenuItem` is one of two types: `MenuOption` and `MenuSeparator`.
 
 In order for the menu to work as expected, the handler must call `action` from `MenuItem`.
 
+FOLDS                                                              *orgmode-folds*
+
+In Neovim 0.10+, folds are colored with the same highlight as when they are expanded.
+This is enabled by default to be in line with how Emacs work.
+
+To use the old way of highlighting folds with `Folded` highlight group, add this to config:
+>
+    require('orgmode').setup({
+      ui = {
+        folds = {
+          colored = false
+        }
+      }
+    })
+<
+
 --------------------------------------------------------------------------------
 ADVANCED SEARCH                                          *orgmode-advanced_search*
 

ftplugin/org.lua

@@ -24,7 +24,7 @@ vim.bo.modeline = false
 vim.opt_local.fillchars:append('fold: ')
 vim.opt_local.foldmethod = 'expr'
 vim.opt_local.foldexpr = 'v:lua.require("orgmode.org.fold").foldexpr()'
-if utils.has_version_10() then
+if utils.has_version_10() and config.ui.folds.colored then
   vim.opt_local.foldtext = ''
 else
   vim.opt_local.foldtext = 'v:lua.require("orgmode.org.indent").foldtext()'

lua/orgmode/config/defaults.lua

@@ -200,6 +200,9 @@ local DefaultConfig = {
     config_path = '$HOME/.emacs.d/init.el',
   },
   ui = {
+    folds = {
+      colored = true,
+    },
     menu = {
       handler = nil,
     },