emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/devdocs ca94548c0f 2/4: Display page name (rather than


From: ELPA Syncer
Subject: [elpa] externals/devdocs ca94548c0f 2/4: Display page name (rather than number) in header line
Date: Thu, 24 Feb 2022 12:57:28 -0500 (EST)

branch: externals/devdocs
commit ca94548c0fe94d0565085901dace638049cbe477
Author: Augusto Stoffel <arstoffel@gmail.com>
Commit: Augusto Stoffel <arstoffel@gmail.com>

    Display page name (rather than number) in header line
---
 devdocs.el | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/devdocs.el b/devdocs.el
index b03be2b437..1a26de7920 100644
--- a/devdocs.el
+++ b/devdocs.el
@@ -275,7 +275,7 @@ This is an alist containing `entries', `pages' and `types'."
   '(:eval (let-alist (car devdocs--stack)
             (concat (devdocs--doc-title .doc)
                     (and .type devdocs-separator) .type
-                    (and .name devdocs-separator) .name))))
+                    devdocs-separator (or .name .path)))))
 
 (define-derived-mode devdocs-mode special-mode "DevDocs"
   "Major mode for viewing DevDocs documents."
@@ -334,12 +334,13 @@ with the order of appearance in the text."
   (interactive "p")
   (let-alist (car devdocs--stack)
     (let* ((pages (alist-get 'pages (devdocs--index .doc)))
-           (page (+ count (seq-position pages (devdocs--path-file .path))))
-           (path (or (ignore-error 'args-out-of-range (elt pages page))
-                     (user-error (if (< count 0) "No previous page" "No next 
page")))))
-      (devdocs--render `((doc . ,.doc)
-                         (path . ,path)
-                         (name . ,(format "%s/%s" (1+ page) (length 
pages))))))))
+           (target (+ count (seq-position pages (devdocs--path-file .path))))
+           (path (or (ignore-error 'args-out-of-range (elt pages target))
+                     (user-error "No %s page" (if (< count 0) "previous" 
"next"))))
+           (entry (or (seq-find (lambda (entry) (string= (alist-get 'path 
entry) path))
+                                (alist-get 'entries (devdocs--index .doc)))
+                      `((doc . ,.doc) (path . ,path)))))
+      (devdocs--render entry))))
 
 (defun devdocs-previous-page (count)
   "Go backward COUNT entries in this document."
@@ -543,9 +544,7 @@ If INITIAL-INPUT is not nil, insert it into the minibuffer."
   (interactive (list (devdocs--read-document "Peruse documentation: ")))
   (let ((pages (alist-get 'pages (devdocs--index doc))))
     (pop-to-buffer
-     (devdocs--render `((path . ,(seq-first pages))
-                        (doc . ,doc)
-                        (name . ,(format "%s/%s" 1 (length pages))))))))
+     (devdocs--render `((doc . ,doc) (path . ,(seq-first pages)))))))
 
 ;;; Compatibility with the old devdocs package
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]