Version bump.
[elpher.git] / elpher.el
index 1178bfc..2e3c5ec 100644 (file)
--- a/elpher.el
+++ b/elpher.el
@@ -20,7 +20,7 @@
 
 ;; Author: Tim Vaughan <plugd@thelambdalab.xyz>
 ;; Created: 11 April 2019
-;; Version: 3.2.1
+;; Version: 3.2.2
 ;; Keywords: comm gopher
 ;; Homepage: https://thelambdalab.xyz/elpher
 ;; Package-Requires: ((emacs "27.1"))
@@ -85,7 +85,7 @@
 ;;; Global constants
 ;;
 
-(defconst elpher-version "3.2.1"
+(defconst elpher-version "3.2.2"
   "Current version of elpher.")
 
 (defconst elpher-margin-width 6
@@ -225,7 +225,7 @@ Otherwise, \\[elpher-show-bookmarks] will visit a special elpher bookmark
 page within which all of the standard elpher keybindings are active."
   :type '(boolean))
 
-(defcustom elpher-start-page "about:welcome"
+(defcustom elpher-start-page-url "about:welcome"
   "Specify the page displayed initially by elpher.
 The default welcome screen is \"about:welcome\", while the bookmarks list
 is \"about:bookmarks\".  You can also specify local files via \"file:\".
@@ -482,9 +482,9 @@ If no address is defined, returns 0.  (This is for compatibility with the URL li
   (list display-string address))
 
 (defun elpher-make-start-page ()
-  "Create the welcome page."
+  "Create the start page."
   (elpher-make-page "Start Page"
-                    (elpher-address-from-url elpher-start-page)))
+                    (elpher-address-from-url elpher-start-page-url)))
 
 (defun elpher-page-display-string (page)
   "Retrieve the display string corresponding to PAGE."
@@ -582,7 +582,7 @@ previously-visited pages,unless NO-HISTORY is non-nil."
 
 (defun elpher-update-header ()
   "If `elpher-use-header' is true, display current page info in window header."
-  (if elpher-use-header
+  (if (and elpher-use-header elpher-current-page)
       (let* ((display-string (elpher-page-display-string elpher-current-page))
              (sanitized-display-string (replace-regexp-in-string "%" "%%" display-string))
              (address (elpher-page-address elpher-current-page))
@@ -1053,9 +1053,7 @@ displayed.  The _WINDOW argument is currently unused."
       (when button
         (let* ((page (button-get button 'elpher-page))
                (address (elpher-page-address page)))
-          (format "mouse-1, RET: open '%s'" (if (elpher-address-about-p address)
-                                                address
-                                              (elpher-address-to-url address))))))))
+          (format "mouse-1, RET: open '%s'" (elpher-address-to-url address)))))))
 
 (defun elpher-insert-index-record (display-string &optional address)
   "Function to insert an index record into the current buffer.
@@ -1721,11 +1719,12 @@ Assumes UTF-8 encoding for all text files."
    (let ((help-string "RET,mouse-1: Open bookmark list"))
      (insert-text-button "bookmark list"
                          'face 'link
-                         'action (lambda (_)
-                                   (interactive)
-                                   (call-interactively #'elpher-show-bookmarks))
+                         'action #'elpher-click-link
                          'follow-link t
-                         'help-echo help-string))
+                         'help-echo #'elpher--page-button-help
+                         'elpher-page
+                         (elpher-make-page "Elpher Bookmarks"
+                                           (elpher-make-about-address 'bookmarks))))
    (insert ".\n")
    (insert (propertize
             "(Bookmarks from legacy elpher-bookmarks files will be automatically imported.)\n"