From f7e1410f0947e54a0634ad092fc1a5ba65e97c49 Mon Sep 17 00:00:00 2001
From: Alex Vear <av@axvr.io>
Date: Sun, 22 Sep 2019 22:58:54 +0100
Subject: [PATCH] Remove `org_clean_folds' and `org_highlight_table_background'
 options

Both of these options were pointless and
`org_highlight_table_background' had visual issues.
---
 doc/org.txt        | 34 ----------------------------------
 ftplugin/org.vim   |  7 -------
 syntax/org.vim     |  3 ---
 syntax/outline.vim |  2 +-
 4 files changed, 1 insertion(+), 45 deletions(-)

diff --git a/doc/org.txt b/doc/org.txt
index 93c90cf..3381ab3 100644
--- a/doc/org.txt
+++ b/doc/org.txt
@@ -79,24 +79,6 @@ an |autocmd| like so.
 >
     autocmd FileType org setlocal conceallevel=2 concealcursor=nc
 <
-------------------------------------------------------------------------------
-                                     *'b:org_clean_folds'*  *'g:org_clean_folds'*
-Value: numeric~
-Default: 0~
-
-By default folds in Vim look extremely ugly in comparison to folds in Emacs'
-Org and Outline mode. When this option is enabled, it will make folds (in Org
-or Outline mode buffers) look similar to those in Emacs.
-
-To enable these nicer looking folds for all Org and Outline mode files. place
-the following line in your vimrc:
->
-    let g:org_clean_folds = 1
-<
-To enable them only for a specific files, you can use this instead:
->
-    let b:org_clean_folds = 1
-<
 ------------------------------------------------------------------------------
                                      *'b:org_use_italics'*  *'g:org_use_italics'*
 Value: numeric~
@@ -117,22 +99,6 @@ To enable italics only in a single buffer, use this instead:
 >
     let b:org_use_italics = 1
 <
-------------------------------------------------------------------------------
-       *'b:org_highlight_table_background'*  *'g:org_highlight_table_background'*
-Value: numeric~
-Default: 1~
-
-This option allows you to disable the highlighting of table backgrounds, as
-the default may not look great with your chosen |colorscheme|.
-
-To disable this feature place the following line in your vimrc:
->
-    let g:org_highlight_table_background = 0
-<
-To disable for a single buffer use this instead:
->
-    let b:org_highlight_table_background = 0
-<
 ==============================================================================
  5. LEGAL                                                           *org-legal*
 
diff --git a/ftplugin/org.vim b/ftplugin/org.vim
index 040c7e0..70650e1 100644
--- a/ftplugin/org.vim
+++ b/ftplugin/org.vim
@@ -28,10 +28,3 @@ if org#option('org_conceal_links', 1)
     setlocal conceallevel=2
     setlocal concealcursor=nc
 endif
-
-" Make Vim fold's look more like Org mode folds.
-if org#option('org_clean_folds', 0)
-    setlocal foldtext=getline(v:foldstart)
-    setlocal fillchars-=fold:-
-    setlocal fillchars+=fold:\ 
-endif
diff --git a/syntax/org.vim b/syntax/org.vim
index f75ebe9..d1173e4 100644
--- a/syntax/org.vim
+++ b/syntax/org.vim
@@ -103,9 +103,6 @@ highlight def link orgHyperlink Underlined
 
 " Tables
 syntax match orgTable /^|.*$/ contains=@Spell,orgBold,orgItalic,orgUnderline,orgVerbatim,orgCode
-if org#option('org_hightlight_table_background', 1)
-    highlight def link orgTable ColorColumn
-endif
 
 
 let b:current_syntax = 'org'
diff --git a/syntax/outline.vim b/syntax/outline.vim
index a228935..21ab723 100644
--- a/syntax/outline.vim
+++ b/syntax/outline.vim
@@ -32,4 +32,4 @@ hi def link outlineHeading4 outlineHeading3
 hi def link outlineHeading5 outlineHeading4
 hi def link outlineHeading6 outlineHeading5
 
-let b:current_syntax = 'org'
+let b:current_syntax = 'outline'