From 321fce9349c6ac37de5376c9484f0aa48d507c19 Mon Sep 17 00:00:00 2001 From: Katsumi Yamaoka Date: Mon, 20 Sep 2010 01:57:46 +0000 Subject: [PATCH] Make Gnus work for Emacs 22 and XEmacs. --- lisp/gnus/ChangeLog | 7 +++++++ lisp/gnus/gnus-html.el | 2 +- lisp/gnus/gnus-sum.el | 5 +++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 1fac9cd37c5..bfccc8c5f6f 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,10 @@ +2010-09-20 Katsumi Yamaoka + + * 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 * nnimap.el (nnimap-wait-for-connection): Avoid a race condition while diff --git a/lisp/gnus/gnus-html.el b/lisp/gnus/gnus-html.el index 819a6d6f31a..78bb7ca18b5 100644 --- a/lisp/gnus/gnus-html.el +++ b/lisp/gnus/gnus-html.el @@ -339,7 +339,7 @@ fit these criteria." (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 --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el index c35cb2584c5..d0c50c8fec0 100644 --- a/lisp/gnus/gnus-sum.el +++ b/lisp/gnus/gnus-sum.el @@ -10769,8 +10769,9 @@ If NO-EXPIRE, auto-expiry will be inhibited." (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. -- 2.39.5