From: Tim Vaughan <vaughant@bs-mbpr538.d.ethz.ch>
Date: Wed, 6 Oct 2021 10:43:18 +0000 (+0200)
Subject: Explicitly disable adaptive (not auto) fill mode for gemini maps.
X-Git-Tag: v3.3.0~6
X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?p=elpher.git;a=commitdiff_plain;h=7ac8997eb71a5f5b914bdd4a99317588ba076727;hp=fbf5fbcd3e0d82c9d7de7d4db5166620dbb31791

Explicitly disable adaptive (not auto) fill mode for gemini maps.
---

diff --git a/elpher.el b/elpher.el
index 6bb36b3..3d8e77f 100644
--- a/elpher.el
+++ b/elpher.el
@@ -1569,7 +1569,6 @@ This function uses Emacs' auto-fill to wrap text sensibly to a maximum
 width defined by `elpher-gemini-max-fill-width'."
   (string-match
    (rx (: line-start
-          (* (any " \t"))
           (optional
            (group (or (: "*" (+ (any " \t")))
                       (: ">" (* (any " \t"))))))))
@@ -1587,10 +1586,7 @@ width defined by `elpher-gemini-max-fill-width'."
                      (propertize text-line 'face 'elpher-gemini-quoted))
                     (t text-line))
             text-line))
-         (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 1 text-line)
+         (fill-prefix (if line-prefix
                           (make-string (length (match-string 0 text-line)) ?\s)
                         nil)))
     (insert (elpher-process-text-for-display processed-text-line))
@@ -1599,8 +1595,9 @@ width defined by `elpher-gemini-max-fill-width'."
 (defun elpher-render-gemini-map (data _parameters)
   "Render DATA as a gemini map file, PARAMETERS is currently unused."
   (elpher-with-clean-buffer
-   (let ((preformatted nil))
-     (auto-fill-mode 1)
+   (auto-fill-mode 1)
+   (let ((preformatted nil)
+         (adaptive-fill-mode nil)) ;Prevent automatic setting of fill-prefix
      (setq-local fill-column (min (window-width) elpher-gemini-max-fill-width))
      (dolist (line (split-string data "\n"))
        (cond