From 304b49cbd229fc71e30e88aba7cf85eeed75f596 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Thu, 8 Jan 2004 22:29:21 +0000 Subject: [PATCH] Synch to No Gnus 200401081739. --- lisp/ChangeLog | 10 ++++++++++ lisp/gnus-group.el | 13 ++++++------- lisp/gnus-util.el | 10 +--------- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 771376b..21de9bb 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,13 @@ +2004-01-08 Jesper Harder + + * gnus-sum.el (gnus-summary-update-mark): Revert previous change. + + * gnus-group.el (gnus-group-mark-group): Fix for multibyte marks. + + * gnus-sum.el (gnus-summary-update-mark): Fix for multibyte marks. + + * gnus-util.el (gnus-replace-in-string): Remove Emacs 20 code. + 2003-11-15 Simon Josefsson * pgg-gpg.el (pgg-gpg-lookup-all-secret-keys) diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el index 526a1e9..64e4459 100644 --- a/lisp/gnus-group.el +++ b/lisp/gnus-group.el @@ -1728,15 +1728,14 @@ If FIRST-TOO, the current line is also eligible as a target." ;; Go to the mark position. (beginning-of-line) (forward-char (or (cdr (assq 'process gnus-group-mark-positions)) 2)) - (subst-char-in-region - (point) (1+ (point)) (char-after) - (if unmark - (progn - (setq gnus-group-marked (delete group gnus-group-marked)) - ? ) + (delete-char 1) + (if unmark + (progn + (setq gnus-group-marked (delete group gnus-group-marked)) + (insert-char ? 1 t)) (setq gnus-group-marked (cons group (delete group gnus-group-marked))) - gnus-process-mark))) + (insert-char gnus-process-mark 1 t))) (unless no-advance (gnus-group-next-group 1)) (decf n)) diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el index 5427912..6bbcc70 100644 --- a/lisp/gnus-util.el +++ b/lisp/gnus-util.el @@ -60,15 +60,7 @@ (defalias 'gnus-replace-in-string 'replace-in-string)) ((fboundp 'replace-regexp-in-string) (defun gnus-replace-in-string (string regexp newtext &optional literal) - (replace-regexp-in-string regexp newtext string nil literal))) - (t - (defun gnus-replace-in-string (string regexp newtext &optional literal) - (let ((start 0) tail) - (while (string-match regexp string start) - (setq tail (- (length string) (match-end 0))) - (setq string (replace-match newtext nil literal string)) - (setq start (- (length string) tail)))) - string)))) + (replace-regexp-in-string regexp newtext string nil literal))))) ;;; bring in the netrc functions as aliases (defalias 'gnus-netrc-get 'netrc-get) -- 1.7.10.4