X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?p=elpher.git;a=blobdiff_plain;f=elpher.el;h=f47dfa0985a80392fde6182955982cd73dc97916;hp=1c4293760451a07e6e2636fa8aaffd8f7393063d;hb=3035057fb699a56b7ea89108d26d046213ee5cd0;hpb=297f223afe310a0acbe395c79c4c13b1257b0d0c

diff --git a/elpher.el b/elpher.el
index 1c42937..f47dfa0 100644
--- a/elpher.el
+++ b/elpher.el
@@ -19,7 +19,7 @@
 
 ;; Author: Tim Vaughan <plugd@thelambdalab.xyz>
 ;; Created: 11 April 2019
-;; Version: 3.0.0
+;; Version: 3.1.0
 ;; Keywords: comm gopher
 ;; Homepage: https://thelambdalab.xyz/elpher
 ;; Package-Requires: ((emacs "27.1"))
@@ -84,7 +84,7 @@
 ;;; Global constants
 ;;
 
-(defconst elpher-version "3.0.0"
+(defconst elpher-version "3.1.0"
   "Current version of elpher.")
 
 (defconst elpher-margin-width 6
@@ -587,6 +587,7 @@ previously-visited pages,unless NO-HISTORY is non-nil."
 
 (defmacro elpher-with-clean-buffer (&rest args)
   "Evaluate ARGS with a clean *elpher* buffer as current."
+  (declare (debug (body))) ;; Allow edebug to step through body
   `(with-current-buffer elpher-buffer-name
      (unless (eq major-mode 'elpher-mode)
        ;; avoid resetting buffer-local variables
@@ -1863,14 +1864,14 @@ To bookmark the link at point use \\[elpher-bookmark-link]."
   (elpher-with-clean-buffer
    (insert " ---- Elpher Bookmarks ---- \n\n")
    (bookmark-maybe-load-default-file)
-   (let ((bookmarks (bookmark-maybe-sort-alist)))
-     (if bookmarks
-         (dolist (bookmark bookmarks)
-           (let* ((name (car bookmark))
-                  (url (alist-get 'location (cdr bookmark)))
-                  (address (elpher-address-from-url url)))
-             (elpher-insert-index-record name address)))
-       (insert "No bookmarked pages found.\n")))
+   (dolist (bookmark (bookmark-maybe-sort-alist))
+     (when (eq #'elpher-bookmark-jump (alist-get 'handler (cdr bookmark)))
+       (let* ((name (car bookmark))
+              (url (alist-get 'location (cdr bookmark)))
+              (address (elpher-address-from-url url)))
+         (elpher-insert-index-record name address))))
+   (when (<= (line-number-at-pos) 3)
+     (insert "No bookmarked pages found.\n"))
    (insert "\n --------------------------\n\n"
            "Select an entry or press 'u' to return to the previous page.\n\n"
            "Bookmarks can be renamed or deleted via the ")
@@ -2016,6 +2017,12 @@ supports the old protocol elpher, where the link is self-contained."
 (setq mu4e~view-beginning-of-url-regexp
       "\\(?:https?\\|gopher\\|finger\\|gemini\\)://\\|mailto:")
 
+;;; eww:
+
+;; Let elpher handle gemini, gopher links in eww buffer.
+(setq eww-use-browse-url
+      "\\`mailto:\\|\\(\\`gemini\\|\\`gopher\\|\\`finger\\)://")
+
 ;;; Interactive procedures
 ;;