Merge branch 'master' of https://github.com/Somelauw/evil-org-mode

4 files changed, 17 insertions, 12 deletions

diff --git a/README.org b/README.org
index 630ea5e..a5603f8 100644
--- a/README.org
+++ b/README.org
@@ -131,14 +131,14 @@ See [[file:doc/changelog.org][changelog]] for a history of changes.
 
 *** Manual installation
     #+BEGIN_SRC sh
-    mkdir -p ~/.emacs.d/plugins; git clone
-    git://github.com/somelauw/evil-org.git ~/.emacs.d/plugins/evil-org
+    mkdir -p ~/.emacs.d/plugins; git clone \
+    git://github.com/somelauw/evil-org-mode.git ~/.emacs.d/plugins/evil-org-mode
     #+END_SRC
 
 **** Configuration emacs.el
 
     #+BEGIN_SRC emacs-lisp
-    (add-to-list 'load-path "~/.emacs.d/plugins/evil-org")
+    (add-to-list 'load-path "~/.emacs.d/plugins/evil-org-mode")
     (require 'evil-org)
     (add-hook 'org-mode-hook 'evil-org-mode)
     (evil-org-set-key-theme '(navigation insert textobjects additional calendar))
diff --git a/evil-org-agenda.el b/evil-org-agenda.el
index 433089e..3ce27b2 100644
--- a/evil-org-agenda.el
+++ b/evil-org-agenda.el
@@ -50,9 +50,10 @@
 
     ;; open
     (kbd "<tab>") 'org-agenda-goto
-    (kbd "<return>") 'org-agenda-switch-to
     (kbd "S-<return>") 'org-agenda-goto
-    (kbd "M-<return>") 'org-agenda-recenter
+    (kbd "g TAB") 'org-agenda-goto
+    (kbd "RET") 'org-agenda-switch-to
+    (kbd "M-RET") 'org-agenda-recenter
 
     (kbd "SPC") 'org-agenda-show-and-scroll-up
     (kbd "<delete>") 'org-agenda-show-scroll-down
@@ -63,6 +64,9 @@
     "k" 'org-agenda-previous-line
     "gj" 'org-agenda-next-item
     "gk" 'org-agenda-previous-item
+    "gH" 'evil-window-top
+    "gM" 'evil-window-middle
+    "gL" 'evil-window-bottom
     (kbd "C-j") 'org-agenda-next-item
     (kbd "C-k") 'org-agenda-previous-item
     (kbd "[") 'org-agenda-earlier
@@ -125,7 +129,7 @@
     ;; 'org-agenda-day-view
     ;; 'org-agenda-week-view
     ;; 'org-agenda-year-view
-    "z" 'org-agenda-view-mode-dispatch
+    "gD" 'org-agenda-view-mode-dispatch
     "ZD" 'org-agenda-dim-blocked-tasks
 
     ;; filter
diff --git a/evil-org-test.el b/evil-org-test.el
index 9c5c963..d8fec1e 100644
--- a/evil-org-test.el
+++ b/evil-org-test.el
@@ -120,7 +120,7 @@
                  (evil-org-with
                   "* |Funny heading with some text                                     :testcase:"
                   (let ((w (evil-a-word)))
-                    (evil-org-delete (first w) (second w)))))))
+                    (evil-org-delete (cl-first w) (cl-second w)))))))
 
 ;; TODO test x and X
 ;; TODO test < and >
diff --git a/evil-org.el b/evil-org.el
index 296a13c..17bba19 100644
--- a/evil-org.el
+++ b/evil-org.el
@@ -414,7 +414,7 @@ Argument END, second column
 If ARG > 0, move column BEG to END.
 If ARG < 0, move column END to BEG"
   (let* ((text (buffer-substring beg end))
-         (n-cells-selected (max 1 (count ?| text)))
+         (n-cells-selected (max 1 (cl-count ?| text)))
          (n-columns-to-move (* n-cells-selected (abs arg)))
          (move-left-p (< arg 0)))
     (goto-char (if move-left-p end beg))
@@ -591,7 +591,7 @@ Includes tables, list items and subtrees."
   (save-excursion
     (when beg (goto-char beg))
     (let ((element (org-element-at-point)))
-      (when (or (not (memq (first element) org-element-greater-elements))
+      (when (or (not (memq (cl-first element) org-element-greater-elements))
                 (and end (>= end (org-element-property :end element))))
         (setq element (evil-org-parent element)))
       (dotimes (_ (1- count))
@@ -605,7 +605,7 @@ Includes tables, list items and subtrees."
   (save-excursion
     (when beg (goto-char beg))
     (let ((element (org-element-at-point)))
-      (unless (memq (first element) org-element-greater-elements)
+      (unless (memq (cl-first element) org-element-greater-elements)
         (setq element (evil-org-parent element)))
       (dotimes (_ (1- count))
         (setq element (evil-org-parent element)))
@@ -657,7 +657,8 @@ Includes tables, list items and subtrees."
                           org-insert-todo-heading-respect-content))
   (evil-define-key '(normal visual) evil-org-mode-map
     (kbd "<tab>") 'org-cycle
-    (kbd "<S-tab>") 'org-shifttab
+    (kbd "g TAB") 'org-cycle
+    (kbd "<backtab>") 'org-shifttab
     (kbd "<") 'evil-org-<
     (kbd ">") 'evil-org->))
 
@@ -777,7 +778,7 @@ Includes tables, list items and subtrees."
 
 (defun evil-org-set-key-theme (&optional theme)
   "Select what keythemes to enable.
-Optional argument THEME list of themes. See evil-org-keytheme for a list of values."
+Optional argument THEME list of themes. See evil-org-key-theme for a list of values."
   (let ((theme (or theme evil-org-key-theme)))
     (setq evil-org-mode-map (make-sparse-keymap))
     (evil-org--populate-base-bindings)