summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog1
-rw-r--r--lisp/net/shr.el10
2 files changed, 10 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c6ef7177d02..1bcc4f11912 100644
--- 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 868af3837a9..9d88d1ff441 100644
--- 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)