Merge remote-tracking branch 'upstream/patch_emacs_tty' into main

diff --cc elpher.el
index 5b75ce3,92215fa..edde2f6
--- 1/elpher.el
--- 2/elpher.el
+++ b/elpher.el
@@@ -1396,12 -1366,16 +1396,16 @@@ The gemini map file line describing th
  by HEADER-LINE."
    (when (string-match "^\\(#+\\)[ \t]*" header-line)
      (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 (if (display-graphic-p)
 -                         (/ (* fill-column
 -                              (font-get (font-spec :name (face-font 'default)) :size))
 -                           (font-get (font-spec :name (face-font face)) :size)) fill-column)))
 +           (header (substring header-line (match-end 0)))
 +           (face (pcase level
 +                   (1 'elpher-gemini-heading1)
 +                   (2 'elpher-gemini-heading2)
 +                   (3 'elpher-gemini-heading3)
-                    (_ 'default))))
++                   (_ 'default)))
++         (fill-column (if (display-graphic-p)
++                          (/ (* fill-column
++                                (font-get (font-spec :name (face-font 'default)) :size))
++                             (font-get (font-spec :name (face-font face)) :size)) fill-column)))
        (unless (display-graphic-p)
          (insert (make-string level ?#) " "))
        (insert (propertize header 'face face))