From a5ce15f03f6de5d71c342b51a39b14ed3ea93471 Mon Sep 17 00:00:00 2001
From: syl20bnr <sylvain.benner@gmail.com>
Date: Sun, 6 Dec 2015 01:14:53 -0500
Subject: [PATCH] Revert "fixed shift+hjkl, added leader major binding,
 adjusted doc"

This reverts commit 869e529b68884cac3c86ec6aaa88a498bab35c80.

It shadows `J` in normal state which is an important key binding.
---
 layers/org/README.org                      | 16 +++++++---------
 layers/org/extensions/evil-org/evil-org.el |  7 +++----
 layers/org/packages.el                     |  8 ++++++--
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/layers/org/README.org b/layers/org/README.org
index fbe1fc93d..816402c4d 100644
--- a/layers/org/README.org
+++ b/layers/org/README.org
@@ -139,10 +139,10 @@ You can tweak the bullets displayed in the org buffer in the function
 | ~SPC m R~                                    | org-refile                                   |
 | ~SPC m s~                                    | org-schedule                                 |
 | ~SPC m T~                                    | org-show-todo-tree                           |
-| ~SPC m H~                                    | org-shiftleft                                |
-| ~SPC m J~                                    | org-shiftdown                                |
-| ~SPC m K~                                    | org-shiftup                                  |
 | ~SPC m L~                                    | org-shiftright                               |
+| ~SPC m H~                                    | org-shiftleft                                |
+| ~SPC m K~                                    | org-shiftup                                  |
+| ~SPC m J~                                    | org-shiftdown                                |
 | ~SPC m C-S-l~                                | org-shiftcontrolright                        |
 | ~SPC m C-S-h~                                | org-shiftcontrolleft                         |
 | ~SPC m C-S-j~                                | org-shiftcontroldown                         |
@@ -203,19 +203,17 @@ You can tweak the bullets displayed in the org buffer in the function
 | ~gl~        | outline-next-visible-heading    |
 | ~t~         | org-todo                        |
 | ~T~         | org-insert-todo-heading nil     |
-| ~H~         | org-shiftleft                   |
-| ~J~         | org-shiftdown                   |
-| ~K~         | org-shiftup                     |
-| ~L~         | org-shiftright                  |
+| ~H~         | org-beginning-of-line           |
+| ~L~         | org-end-of-line                 |
 | ~o~         | always-insert-item              |
 | ~O~         | org-open-above                  |
 
 | Key Binding | Description                                |
 |-------------+--------------------------------------------|
+| ~M-l~       | org-metaright                              |
 | ~M-h~       | org-metaleft                               |
 | ~M-k~       | org-metaup                                 |
 | ~M-j~       | org-metadown                               |
-| ~M-l~       | org-metaright                              |
 | ~M-L~       | org-shiftmetaright                         |
 | ~M-H~       | org-shiftmetaleft                          |
 | ~M-K~       | org-shiftmetaup                            |
@@ -261,9 +259,9 @@ The evilified org agenda supports, among others, the following bindings:
 
 | Key Binding | Description   |
 |-------------+---------------|
-| ~M-h~       | earlier view  |
 | ~M-j~       | next item     |
 | ~M-k~       | previous item |
+| ~M-h~       | earlier view  |
 | ~M-l~       | later view    |
 | ~gr~        | refresh       |
 | ~gd~        | toggle grid   |
diff --git a/layers/org/extensions/evil-org/evil-org.el b/layers/org/extensions/evil-org/evil-org.el
index 38bb5622d..1095eeddf 100644
--- a/layers/org/extensions/evil-org/evil-org.el
+++ b/layers/org/extensions/evil-org/evil-org.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2012-2014 by Edward Tjörnhammar
 ;; Author: Edward Tjörnhammar
 ;; URL: https://github.com/edwtjo/evil-org-mode.git
+;; Package-Version: 20150513.1610
 ;; Git-Repository; git://github.com/edwtjo/evil-org-mode.git
 ;; Created: 2012-06-14
 ;; Version: 0.1.1
@@ -132,10 +133,8 @@ FUN function callback"
   "gl" 'outline-next-visible-heading
   "t" 'org-todo
   "T" '(lambda () (interactive) (evil-org-eol-call (lambda() (org-insert-todo-heading nil))))
-  "H" 'org-shiftleft
-  "J" 'org-shiftdown
-  "K" 'org-shiftup
-  "L" 'org-shiftright
+  "H" 'org-beginning-of-line
+  "L" 'org-end-of-line
   "o" '(lambda () (interactive) (evil-org-eol-call 'clever-insert-item))
   "O" '(lambda () (interactive) (evil-org-eol-call 'org-insert-heading))
   "$" 'org-end-of-line
diff --git a/layers/org/packages.el b/layers/org/packages.el
index 16c291efe..fc1fbe664 100644
--- a/layers/org/packages.el
+++ b/layers/org/packages.el
@@ -127,8 +127,6 @@ Will work on both org-mode and any mode that accepts plain html."
         "f" 'org-set-effort
         "P" 'org-set-property
         ":" 'org-set-tags
-        "\\" 'org-toggle-pretty-entities
-
 
         "a" 'org-agenda
         "b" 'org-tree-to-indirect-buffer
@@ -142,6 +140,12 @@ Will work on both org-mode and any mode that accepts plain html."
         "hi" 'org-insert-heading-after-current
         "hI" 'org-insert-heading
 
+        ;; More cycling options (timestamps, headlines, items, properties)
+        "L" 'org-shiftright
+        "H" 'org-shiftleft
+        "J" 'org-shiftdown
+        "K" 'org-shiftup
+
         ;; Change between TODO sets
         "C-S-l" 'org-shiftcontrolright
         "C-S-h" 'org-shiftcontrolleft