shr space widths fixup

* lisp/net/shr.el (shr-insert): Make sure the space inserted has the
right font (for width).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index eee6744b15ea892a773cbca45ef235ac5a2f2268..7274c9da8f2718e14a1d8bbba32a1f18f70f9c34 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-11  Lars Ingebrigtsen  <larsi@gnus.org>
+
+       * net/shr.el (shr-insert): Make sure the space inserted has the
+       right font (for width).
+
 2015-02-10  Lars Ingebrigtsen  <larsi@gnus.org>
 
        * net/shr.el (shr-use-fonts): New variable.

diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index a65f7923f57ba8382c7ecf5ace6386c611cd5601..a4320853fd13c6bb52d267b8ca8b851a5e64e8c8 100644 (file)
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -494,31 +494,32 @@ size, and full-buffer size."
    ((eq shr-folding-mode 'none)
     (insert text))
    (t
-    (when (and (string-match "\\`[ \t\n\r ]" text)
-              (not (bolp))
-              (not (eq (char-after (1- (point))) ? )))
-      (insert " "))
-    (let ((start (point))
-         (bolp (bolp)))
-      (insert text)
-      (save-restriction
-       (narrow-to-region start (point))
-       (goto-char start)
-       (when (looking-at "[ \t\n\r ]+")
-         (replace-match "" t t))
-       (while (re-search-forward "[ \t\n\r ]+" nil t)
-         (replace-match " " t t))
-       (goto-char (point-max)))
-      ;; We may have removed everything we inserted if if was just
-      ;; spaces.
-      (unless (= start (point))
-       ;; Mark all lines that should possibly be folded afterwards.
-       (when bolp
-         (shr-mark-fill start))
-       (when shr-use-fonts
-         (put-text-property start (point)
-                            'face
-                            (or shr-current-font 'variable-pitch))))))))
+    (let ((font-start (point)))
+      (when (and (string-match "\\`[ \t\n\r ]" text)
+                (not (bolp))
+                (not (eq (char-after (1- (point))) ? )))
+       (insert " "))
+      (let ((start (point))
+           (bolp (bolp)))
+       (insert text)
+       (save-restriction
+         (narrow-to-region start (point))
+         (goto-char start)
+         (when (looking-at "[ \t\n\r ]+")
+           (replace-match "" t t))
+         (while (re-search-forward "[ \t\n\r ]+" nil t)
+           (replace-match " " t t))
+         (goto-char (point-max)))
+       ;; We may have removed everything we inserted if if was just
+       ;; spaces.
+       (unless (= font-start (point))
+         ;; Mark all lines that should possibly be folded afterwards.
+         (when bolp
+           (shr-mark-fill start))
+         (when shr-use-fonts
+           (put-text-property font-start (point)
+                              'face
+                              (or shr-current-font 'variable-pitch)))))))))
 
 (defun shr-fill-lines (start end)
   (if (<= shr-internal-width 0)