From: Lars Magne Ingebrigtsen Date: Sun, 1 Mar 2015 11:21:43 +0000 (+0100) Subject: (shr-insert): Also remove soft hypens from non-folded text. X-Git-Tag: emacs-25.0.90~2564^2~267 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bb13183c1bb56724fc3c4ab5ed8f1eaf6ed5338d;p=emacs.git (shr-insert): Also remove soft hypens from non-folded text. --- 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 * net/shr.el (shr-insert): Remove soft hyphens. + (shr-insert): Also remove soft hypens from non-folded text. 2015-02-28 Eli Zaretskii 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)