# HG changeset patch
# User Katsumi Yamaoka <yamaoka@jpl.org>
# Date 1284947866 0
# Node ID de3a95d0864927b7cfa686e2e9d4b229b9273a51
# Parent  7f85b522c27e96887bfedec988ff0337254450e1
Make Gnus work for Emacs 22 and XEmacs.

diff -r 7f85b522c27e -r de3a95d08649 lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Mon Sep 20 03:20:32 2010 +0200
+++ b/lisp/gnus/ChangeLog	Mon Sep 20 01:57:46 2010 +0000
@@ -1,3 +1,10 @@
+2010-09-20  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* gnus-html.el (gnus-html-image-fetched): Pass arg to kill-buffer.
+
+	* gnus-sum.el (gnus-summary-update-mark): Replace subst-char-in-string
+	by mm-subst-char-in-string.
+
 2010-09-19  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* nnimap.el (nnimap-wait-for-connection): Avoid a race condition while
diff -r 7f85b522c27e -r de3a95d08649 lisp/gnus/gnus-html.el
--- a/lisp/gnus/gnus-html.el	Mon Sep 20 03:20:32 2010 +0200
+++ b/lisp/gnus/gnus-html.el	Mon Sep 20 01:57:46 2010 +0000
@@ -339,7 +339,7 @@
     (when (search-forward "\n\n" nil t)
       ;; Write region (image data) silently
       (write-region (point) (point-max) file nil 1)
-      (kill-buffer)
+      (kill-buffer (current-buffer))
       (when (and (buffer-live-p buffer)
 		 ;; If the `image' has no marker, do not replace anything
 		 (cadr image)
diff -r 7f85b522c27e -r de3a95d08649 lisp/gnus/gnus-sum.el
--- a/lisp/gnus/gnus-sum.el	Mon Sep 20 03:20:32 2010 +0200
+++ b/lisp/gnus/gnus-sum.el	Mon Sep 20 01:57:46 2010 +0000
@@ -10769,8 +10769,9 @@
 	(goto-char (+ forward (point)))
 	;; Replace the old mark with the new mark.
         (let ((to-insert
-               (subst-char-in-string (char-after) mark
-                                     (buffer-substring (point) (1+ (point))))))
+               (mm-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.