Alex's elegant fix for the newline styling issue.

[elpher.git] / elpher.el

diff --git a/elpher.el b/elpher.el
index b4e508a..d68a718 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.0
+;; Version: 3.2.1
 ;; Keywords: comm gopher
 ;; Homepage: https://thelambdalab.xyz/elpher
 ;; Package-Requires: ((emacs "27.1"))
@@ -85,7 +85,7 @@
 ;;; Global constants
 ;;
 
-(defconst elpher-version "3.2.0"
+(defconst elpher-version "3.2.1"
   "Current version of elpher.")
 
 (defconst elpher-margin-width 6
@@ -577,13 +577,14 @@ previously-visited pages,unless NO-HISTORY is non-nil."
   "If `elpher-use-header' is true, display current page info in window header."
   (if elpher-use-header
       (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))
              (tls-string (if (and (not (elpher-address-about-p address))
                                   (member (elpher-address-protocol address)
                                           '("gophers" "gemini")))
                              " [TLS encryption]"
                            ""))
-             (header (concat display-string
+             (header (concat sanitized-display-string
                              (propertize tls-string 'face 'bold))))
         (setq header-line-format header))))
 
@@ -1132,8 +1133,8 @@ If ADDRESS is not supplied or nil the record is rendered as an
                        nil t))
                (window (get-buffer-window elpher-buffer-name)))
           (when window
-            (setf (image-property image :max-width) (window-pixel-width window))
-            (setf (image-property image :max-height) (window-pixel-height window)))
+            (setf (image-property image :max-width) (window-body-width window t))
+            (setf (image-property image :max-height) (window-body-height window t)))
           (elpher-with-clean-buffer
            (insert-image image)
            (elpher-restore-pos)))
@@ -1506,15 +1507,21 @@ by HEADER-LINE."
                                                elpher--gemini-page-headings))
       (unless (display-graphic-p)
         (insert (make-string level ?#) " "))
-      (insert (propertize header 'face face))
+      (insert (propertize header 'face face 'rear-nonsticky t))
       (newline))))
 
 (defun elpher-gemini-insert-text (text-line)
   "Insert a plain non-preformatted TEXT-LINE into a text/gemini document.
 This function uses Emacs' auto-fill to wrap text sensibly to a maximum
 width defined by `elpher-gemini-max-fill-width'."
-  (string-match "\\(^[ \t]*\\)\\(\\*[ \t]+\\|>[ \t]*\\)?" text-line)
-  (let* ((line-prefix (match-string 2 text-line))
+  (string-match
+   (rx (: line-start
+          (* (any " \t"))
+          (optional
+           (group (or (: "*" (+ (any " \t")))
+                      (: ">" (* (any " \t"))))))))
+   text-line)
+  (let* ((line-prefix (match-string 1 text-line))
          (processed-text-line
           (if line-prefix
               (cond ((string-prefix-p "*" line-prefix)
@@ -1530,8 +1537,8 @@ width defined by `elpher-gemini-max-fill-width'."
          (adaptive-fill-mode t)
         ;; fill-prefix is important for adaptive-fill-mode: without
         ;; it, multi-line list items are not indented correct
-         (fill-prefix (if (match-string 2 text-line)
-                          (replace-regexp-in-string "[>\*]" " " (match-string 0 text-line))
+         (fill-prefix (if (match-string 1 text-line)
+                          (make-string (length (match-string 0 text-line)) ?\s)
                         nil)))
     (insert (elpher-process-text-for-display processed-text-line))
     (newline)))