(shr-insert): Also remove soft hypens from non-folded text.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c6ef7177d02e81674d932b23eb8e8f84ef6cd755..1bcc4f11912f530999bf5c119b7b499e8bf21a67 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,7 @@
 2015-03-01  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * net/shr.el (shr-insert): Remove soft hyphens.
+       (shr-insert): Also remove soft hypens from non-folded text.
 
 2015-02-28  Eli Zaretskii  <eliz@gnu.org>
 

diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index 868af3837a908f2d54532fbc710a8aab4ff1ec22..9d88d1ff4419b74fa7ed81dbdf823470d39d963f 100644 (file)
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -495,7 +495,15 @@ size, and full-buffer size."
     (insert "\n"))
   (cond
    ((eq shr-folding-mode 'none)
-    (insert text))
+    (let ((start (point)))
+      (insert text)
+      (save-restriction
+       (narrow-to-region start (point))
+       ;; Remove soft hyphens.
+       (goto-char (point-min))
+       (while (search-forward "­" nil t)
+         (replace-match "" t t))
+       (goto-char (point-max)))))
    (t
     (let ((font-start (point)))
       (when (and (string-match "\\`[ \t\n\r ]" text)