From 9d258931e551fe4d834df79350da5ed4dfa2f09a Mon Sep 17 00:00:00 2001 From: Terry Sun Date: Thu, 2 Jan 2020 22:46:21 -0800 Subject: Update repo name in manual install instructions --- README.org | 6 +++--- 1 file changed, 3 insertions(+), 3 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)) -- cgit v1.0 From d950ed3f6892236efbb51c2229a50a6d33e92318 Mon Sep 17 00:00:00 2001 From: crocket <748856+crocket@users.noreply.github.com> Date: Fri, 31 Jan 2020 21:44:55 +0900 Subject: Add `g TAB` as a fallback for ``. Make RET bindings work. * `g TAB` is a good fallback for `` in terminal environments. * `RET` can take care of Enter on GUI and in terminal environments. * `M-RET` can take care of Alt+Enter on GUI and in terminal environments. * `S-` is removed because it is redundant. --- evil-org-agenda.el | 5 +++-- evil-org.el | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/evil-org-agenda.el b/evil-org-agenda.el index 433089e..be53e92 100644 --- a/evil-org-agenda.el +++ b/evil-org-agenda.el @@ -50,9 +50,10 @@ ;; open (kbd "") 'org-agenda-goto - (kbd "") 'org-agenda-switch-to (kbd "S-") 'org-agenda-goto - (kbd "M-") '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 "") 'org-agenda-show-scroll-down diff --git a/evil-org.el b/evil-org.el index 9bf7ff6..8057cb0 100644 --- a/evil-org.el +++ b/evil-org.el @@ -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 "") 'org-cycle - (kbd "") 'org-shifttab + (kbd "g TAB") 'org-cycle + (kbd "") 'org-shifttab (kbd "<") 'evil-org-< (kbd ">") 'evil-org->)) -- cgit v1.0 From a7ae9986d4bc56b1d44cafe8c9755a4290c2b7eb Mon Sep 17 00:00:00 2001 From: Christopher League Date: Tue, 12 May 2020 14:20:57 -0400 Subject: Replace count, first, second with cl- aliases. These no longer work in emacs-27.0.91. --- evil-org-test.el | 2 +- evil-org.el | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) 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 9bf7ff6..d74c2eb 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))) -- cgit v1.0 From c462c59700ff009151969c17dceea602fb2845ff Mon Sep 17 00:00:00 2001 From: David Florness Date: Sat, 30 May 2020 18:22:10 -0600 Subject: Fix typo --- evil-org.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evil-org.el b/evil-org.el index 9bf7ff6..5e06f64 100644 --- a/evil-org.el +++ b/evil-org.el @@ -777,7 +777,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) -- cgit v1.0 From 042f4e0e21e788defdc39d90f50aa211df23f5e7 Mon Sep 17 00:00:00 2001 From: crocket <748856+crocket@users.noreply.github.com> Date: Thu, 6 Aug 2020 13:49:36 +0900 Subject: Revive zz, zt, and zb. Revive H, M, and L with `g` prefix. Moving org-agenda-view-mode-dispatch from z to gD results in revival of zz, zt, and zb. gH, gM, and gL are useful shortcuts for cursor movement. --- evil-org-agenda.el | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/evil-org-agenda.el b/evil-org-agenda.el index be53e92..3ce27b2 100644 --- a/evil-org-agenda.el +++ b/evil-org-agenda.el @@ -64,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 @@ -126,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 -- cgit v1.0