From ec6ac028fcfecf9d4b40af8b49ab3c814bdf6cc3 Mon Sep 17 00:00:00 2001 From: James Nguyen Date: Thu, 9 Mar 2023 14:20:21 -0500 Subject: Remove pdf workaround (#152) --- modes/pdf/evil-collection-pdf.el | 34 ++++------------------------------ 1 file changed, 4 insertions(+), 30 deletions(-) diff --git a/modes/pdf/evil-collection-pdf.el b/modes/pdf/evil-collection-pdf.el index 3700774..d76f7bc 100644 --- a/modes/pdf/evil-collection-pdf.el +++ b/modes/pdf/evil-collection-pdf.el @@ -50,32 +50,6 @@ (defvar pdf-outline-buffer-mode-map) (defvar pdf-occur-buffer-mode-map) -;; TODO: The following 2 functions are workarounds for -;; 'pdf-view-next-line-or-next-page' and -;; 'pdf-view-previous-line-or-previous-page' not playing well with -;; EVIL. The root cause should be found and fixed instead. -;; See https://github.com/emacs-evil/evil-collection/pull/137 for -;; details. -(defun evil-collection-pdf-view-next-line-or-next-page (&optional count) - "Wrap `pdf-view-next-line-or-next-page' with `evil'. - -Consider COUNT." - (interactive "P") - (if count - (dotimes (_ count nil) - (pdf-view-next-line-or-next-page 1)) - (pdf-view-next-line-or-next-page 1))) - -(defun evil-collection-pdf-view-previous-line-or-previous-page (&optional count) - "Wrap `pdf-view-previous-line-or-previous-page' with `evil'. - -Consider COUNT." - (interactive "P") - (if count - (dotimes (_ count nil) - (pdf-view-previous-line-or-previous-page 1)) - (pdf-view-previous-line-or-previous-page 1))) - (defun evil-collection-pdf-view-goto-page (&optional page) "`evil' wrapper around `pdf-view-last-page'." (interactive "P") @@ -118,8 +92,8 @@ Consider COUNT." (evil-collection-define-key 'normal 'pdf-view-mode-map ;; motion (kbd "RET") 'image-next-line - "j" 'evil-collection-pdf-view-next-line-or-next-page - "k" 'evil-collection-pdf-view-previous-line-or-previous-page + "j" 'pdf-view-next-line-or-next-page + "k" 'pdf-view-previous-line-or-previous-page (kbd "SPC") 'pdf-view-scroll-up-or-next-page (kbd "S-SPC") 'pdf-view-scroll-down-or-previous-page (kbd "") 'pdf-view-scroll-down-or-previous-page @@ -133,8 +107,8 @@ Consider COUNT." "gk" 'pdf-view-previous-page-command (kbd "") 'forward-page (kbd "") 'backward-page - (kbd "") 'evil-collection-pdf-view-next-line-or-next-page - (kbd "") 'evil-collection-pdf-view-previous-line-or-previous-page + (kbd "") 'pdf-view-next-line-or-next-page + (kbd "") 'pdf-view-previous-line-or-previous-page "gg" 'evil-collection-pdf-view-goto-first-page "G" 'evil-collection-pdf-view-goto-page -- cgit v1.0