Merge branch 'master' of https://git.gnus.org/gnus

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 09edbdd..481244a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -33,6 +33,10 @@
 
 2010-09-19  Julien Danjou  <julien@danjou.info>
 
+       * gnus-sum.el (gnus-summary-update-mark): Use `subst-char-in-string'
+       rather than `subst-char-in-region' in order to be able to replace ASCII
+       char by UTF-8 ones.
+
        * gnus-html.el (gnus-html-prefetch-images): Use `url-retrieve' rather
        than curl.
        (gnus-html-image-fetched): Fix `gnus-html-put-image' call not setting

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index e09c3a5..c35cb25 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -10768,7 +10768,11 @@ If NO-EXPIRE, auto-expiry will be inhibited."
        ;; Go to the right position on the line.
        (goto-char (+ forward (point)))
        ;; Replace the old mark with the new mark.
-       (subst-char-in-region (point) (1+ (point)) (char-after) mark)
+        (let ((to-insert
+               (subst-char-in-string (char-after) mark
+                                     (buffer-substring (point) (1+ (point))))))
+          (delete-region (point) (1+ (point)))
+          (insert to-insert))
        ;; Optionally update the marks by some user rule.
        (when (eq type 'unread)
          (gnus-data-set-mark