Remove optional leader keys

3 files changed, 4 insertions, 28 deletions

diff --git a/doc/changelog.org b/doc/changelog.org
index 92151e1..37f56a7 100644
--- a/doc/changelog.org
+++ b/doc/changelog.org
@@ -5,6 +5,8 @@
   #+END_SRC
   This line is from now on required in a user config.
   
+  - Leader key bindings are removed. See [[file:example_config.el][example config]] for an example how you can set them up yourself.
+  
 * Between versions 0.1.2 and 0.6.3
   - less controversial default keybindings (see issue [[https://github.com/edwtjo/evil-org-mode/issues/13][#13]])
     t, T, O and leader bindings are no longer bound by default, but can be enabled using key themes.
diff --git a/doc/keythemes.org b/doc/keythemes.org
index 6b1fe16..6519343 100644
--- a/doc/keythemes.org
+++ b/doc/keythemes.org
@@ -5,7 +5,7 @@
   To enable all bindings use:
 
   #+begin_src emacs-lisp
-  (evil-org-set-key-theme '(textobjects insert navigation additional shift leader todo heading))
+  (evil-org-set-key-theme '(textobjects insert navigation additional shift todo heading))
   #+end_src
 
 ** Basic
@@ -129,16 +129,3 @@
    | M-o | org-insert-heading+org-metaright |
    |-----+----------------------------------|
 
-** Leader                                                        :deprecated:
-   Disabled by default.
-
-   |-----------+---------------------------|
-   | key       | function                  |
-   |-----------+---------------------------|
-   | <leader>a | org-agenda                |
-   | <leader>t | org-show-todo-tree        |
-   | <leader>c | org-archive-subtree       |
-   | <leader>l | evil-org-open-links       |
-   | <leader>o | evil-org-recompute-clocks |
-   |-----------+---------------------------|
-  
diff --git a/evil-org.el b/evil-org.el
index 923f91a..f9952c8 100644
--- a/evil-org.el
+++ b/evil-org.el
@@ -7,7 +7,7 @@
 ;; Git-Repository: git://github.com/Somelauw/evil-org-mode.git
 ;; Created: 2012-06-14
 ;; Forked-since: 2017-02-12
-;; Version: 0.7.0
+;; Version: 0.7.1
 ;; Package-Requires: ((emacs "24.4") (evil "1.0") (org "8.0.0"))
 ;; Keywords: evil vim-emulation org-mode key-bindings presets
 
@@ -41,7 +41,6 @@
 (require 'org)
 (require 'org-element)
 (require 'org-table)
-(require 'leader nil 'noerror)
 
 (defgroup evil-org nil
   "Provides integration of org-mode and evil."
@@ -561,17 +560,6 @@ If a prefix argument is given, links are opened in incognito mode."
                     (org-insert-heading))))
     (kbd "M-o") 'evil-org-insert-subheading))
 
-;; leader maps
-(defun evil-org--populate-leader-bindings ()
-  "Leader bindings (deprecated)."
-  (make-obsolete 'leader "please bind leader keys in your local config." "0.5.0")
-  (evil-leader/set-key-for-mode 'org-mode
-    "t" 'org-show-todo-tree
-    "a" 'org-agenda
-    "c" 'org-archive-subtree
-    "l" 'evil-org-open-links
-    "o" 'evil-org-recompute-clocks))
-
 ;;;###autoload
 (defun evil-org-set-key-theme (&optional theme)
   "Select what keythemes to enable.
@@ -587,7 +575,6 @@ Optional argument THEME list of themes. See evil-org-keytheme for a list of valu
     (when (memq 'shift theme) (evil-org--populate-shift-bindings))
     (when (memq 'todo theme) (evil-org--populate-todo-bindings))
     (when (memq 'heading theme) (evil-org--populate-heading-bindings))
-    (when (memq 'leader theme) (evil-org--populate-leader-bindings))
     (setcdr
      (assq 'evil-org-mode minor-mode-map-alist)
      evil-org-mode-map)))