diff options
Diffstat (limited to 'lib/doc/jao-doc-view.el')
| -rw-r--r-- | lib/doc/jao-doc-view.el | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/lib/doc/jao-doc-view.el b/lib/doc/jao-doc-view.el index fe26c1d..74c4751 100644 --- a/lib/doc/jao-doc-view.el +++ b/lib/doc/jao-doc-view.el @@ -1,6 +1,6 @@ ;;; jao-doc-view.el -- extensions for doc-view -*- lexical-binding: t; -*- -;; Copyright (c) 2013, 2015, 2017, 2018, 2019, 2021, 2022 Jose Antonio Ortega Ruiz +;; Copyright (c) 2013, 2015, 2017, 2018, 2019, 2021, 2022, 2026 Jose Antonio Ortega Ruiz ;; This file is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by @@ -18,9 +18,15 @@ ;; Author: Jose Antonio Ortega Ruiz <jao@gnu.org> ;; Start date: Fri Feb 15, 2013 01:21 +(require 'browse-url) +(require 'thingatpt) (require 'doc-view) (require 'jao-pdf) +(declare-function pdf-view-image-size "pdf-view") +(declare-function pdf-view-goto-page "pdf-view") +(declare-function pdf-view-current-page "pdf-view") + ;;; Utilities (defmacro jao-doc-view--funcall (a b &rest args) @@ -39,8 +45,7 @@ ;;; imenu (defun jao-doc-view-enable-imenu (file-name goto-page) - (let ((ifun (lambda () (doc-view-imenu-index file-name goto-page))) - (doc-view-imenu-enabled t)) + (let ((ifun (lambda () (doc-view-imenu-index file-name goto-page)))) (doc-view-imenu-setup) (setq-local imenu-create-index-function ifun))) @@ -48,21 +53,21 @@ (defvar-local jao-doc-view--trail-back ()) (defvar-local jao-doc-view--trail-fwd ()) -(defun jao-doc-view--trail-push (dest-page) - (when-let (page (jao-doc-view-current-page)) +(defun jao-doc-view--trail-push (_dest-page) + (when-let* ((page (jao-doc-view-current-page))) (unless (eq (car jao-doc-view--trail-back) page) - (push page jao-doc-view--trail-back)))) + (cl-pushnew page jao-doc-view--trail-back)))) (defun jao-doc-view-back () (interactive nil doc-view-mode) - (if-let (p (pop jao-doc-view--trail-back)) - (progn (push (jao-doc-view-current-page) jao-doc-view--trail-fwd) + (if-let* ((p (pop jao-doc-view--trail-back))) + (progn (cl-pushnew (jao-doc-view-current-page) jao-doc-view--trail-fwd) (jao-doc-view-goto-page p)) (message "No more back marks."))) (defun jao-doc-view-forward () (interactive nil doc-view-mode) - (if-let (p (pop jao-doc-view--trail-fwd)) + (if-let* ((p (pop jao-doc-view--trail-fwd))) (progn (push (jao-doc-view-current-page) jao-doc-view--trail-back) (jao-doc-view-goto-page p)) (message "No more forward marks."))) @@ -115,8 +120,8 @@ (cond ((eq 'wait urls) (message "Extracting text, please wait and retry.")) ((zerop (length urls)) (message "No URLs in this %s" (if all "document" "page"))) - (t (when-let (url (completing-read "URL: " urls nil nil - (when (null (cdr urls)) (car urls)))) + (t (when-let* ((url (completing-read "URL: " urls nil nil + (when (null (cdr urls)) (car urls))))) (browse-url url)))))) ;;; . |