From: Tim Vaughan <plugd@thelambdalab.xyz>
Date: Sat, 19 Sep 2020 10:08:06 +0000 (+0200)
Subject: Merged Alex Schroeder's header-filling patch.  Thanks!!
X-Git-Tag: v2.10.2~1
X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?p=elpher.git;a=commitdiff_plain;h=b0582668d08172a2f17e016940dd745a76baa7b2;hp=2c17a690daa544a4c9e7da150748a7e64bf660aa

Merged Alex Schroeder's header-filling patch.  Thanks!!
---

diff --git a/elpher.el b/elpher.el
index 5807200..be4a04a 100644
--- a/elpher.el
+++ b/elpher.el
@@ -1365,17 +1365,20 @@ treatment that a separate function is warranted."
 The gemini map file line describing the header is given
 by HEADER-LINE."
   (when (string-match "^\\(#+\\)[ \t]*" header-line)
-    (let ((level (length (match-string 1 header-line)))
-          (header (substring header-line (match-end 0))))
+    (let* ((level (length (match-string 1 header-line)))
+           (header (substring header-line (match-end 0)))
+	   (face (pcase level
+                   (1 'elpher-gemini-heading1)
+                   (2 'elpher-gemini-heading2)
+                   (3 'elpher-gemini-heading3)
+                   (_ 'default)))
+	   (fill-column (/ (* fill-column
+			      (font-get (font-spec :name (face-font 'default)) :size))
+			   (font-get (font-spec :name (face-font face)) :size))))
       (unless (display-graphic-p)
         (insert (make-string level ?#) " "))
-      (insert (propertize header 'face
-                          (pcase level
-                            (1 'elpher-gemini-heading1)
-                            (2 'elpher-gemini-heading2)
-                            (3 'elpher-gemini-heading3)
-                            (_ 'default)))
-              "\n"))))
+      (insert (propertize header 'face face))
+      (newline))))
 
 (defun elpher-gemini-insert-text (text-line)
   "Insert a plain non-preformatted TEXT-LINE into a text/gemini document.