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