src/gemini-viewer.lisp

@@ -406,8 +406,8 @@
               (if (not (downloading-allowed-p wrapper-object))
                   (ui:notify (_ "Gemini document downloading aborted"))
                   (progn
-                    (maybe-render-toc)
                     (ui:notify (_ "Gemini document downloading completed"))
+                    (maybe-render-toc)
                     (setf (stream-status wrapper-object) :completed)))
               ;; (allow-downloading wrapper-object)
               (gemini-client:close-ssl-socket download-socket))))))))
@@ -770,8 +770,7 @@
 (defun load-gemini-url (url &key
                               (priority program-events:+standard-event-priority+)
                               (give-focus-to-message-window t)
-                              (use-cached-file-if-exists nil)
+                              (use-cached-file-if-exists nil))
-                              (enqueue                   nil))
   "Load `url', that  is a web resource or a  local file. This function
 can be  used only when  the event polling  is enabled (e.g.  from user
 command) otherwise  te actual code to  get the resource will  never be
@@ -780,6 +779,5 @@ executed."
                                :give-focus-to-message-window give-focus-to-message-window
                                :priority priority
                                :use-cached-file-if-exists use-cached-file-if-exists
-                               :enqueue                   enqueue
+                               :url      url)))
-                               :url                       url)))
     (program-events:push-event event)))

src/message-window.lisp

@@ -546,7 +546,9 @@
                                  (loop for i from (- level 2 ) downto 0
                                        when (= (elt toc-number i) 0) do
                                          (setf (elt toc-number i) 1))
-                                 (list :header (first (gemini-parser:lines header))
+                                 (list :header (regex-replace "^\\P{Letter}+"
+                                                              (first (gemini-parser:lines header))
+                                                              "")
                                        :group-id gid
                                        :number   (subseq toc-number
                                                          0

src/open-message-link-window.lisp

@@ -84,9 +84,8 @@
          (db:gemlog-mark-as-seen url)
          (gemini-viewer:ensure-just-one-stream-rendering)
          (program-events:push-event event)
-         (gemini-viewer:load-gemini-url url
+         (gemini-viewer:request url :enqueue                   enqueue
-                                        :enqueue                   enqueue
+                                    :use-cached-file-if-exists t)))
-                                        :use-cached-file-if-exists t)))
       ((fs:dirp decoded-path)
        (let ((program-events:*process-events-immediately* t)
              (event (make-instance 'program-events:gemini-push-behind-downloading-event

src/program-events.lisp

@@ -1002,18 +1002,13 @@
     :initform t
     :initarg :give-focus-to-message-window
     :reader  give-focus-to-message-window-p
-    :writer  (setf give-focus-to-message-window))
+    :writer  (setf give-focus-to-message-window))))
-   (enqueue
-    :initform nil
-    :initarg :enqueue
-    :accessor enqueue)))
 
 (defmethod process-event ((object gemini-request-event))
   (tui:with-notify-errors
     (with-accessors ((url                            url) ; if a local file *not* percent encoded
                      (give-focus-to-message-window-p give-focus-to-message-window-p)
-                     (use-cached-file-if-exists      use-cached-file-if-exists)
+                     (use-cached-file-if-exists      use-cached-file-if-exists)) object
-                     (enqueue                        enqueue)) object
       (let ((window     specials:*message-window*)
             (local-path (if (text-utils:percent-encoded-p url)
                             (complete:tilde-expand-string (text-utils:percent-decode url))
@@ -1026,9 +1021,7 @@
           ((text-utils:string-empty-p url)
            (ui:error-message (_ "Empty address")))
           ((gemini-client:absolute-gemini-url-p url)
-           (gemini-viewer:request url
+           (gemini-viewer:request url :use-cached-file-if-exists use-cached-file-if-exists))
-                                  :enqueue                   enqueue
-                                  :use-cached-file-if-exists use-cached-file-if-exists))
           ((fs:dirp local-path)
            (let* ((index-path (uri:normalize-path (fs:prepend-pwd local-path)))
                   (all-paths  (mapcar #'uri:normalize-path
@@ -1133,6 +1126,8 @@
         (when (and (gemini-viewer:downloading-allowed-p wrapper-object)
                    (not (skip-rendering-p object))
                    (message-window:display-gemini-text-p win))
+          (setf (windows:keybindings win)
+                keybindings:*gemini-message-keymap*)
           (refresh-gemini-message-window links source ir-line append-text)
           (windows:draw win))))))