From: keiichi <keiichi>
Date: Fri, 14 May 1999 02:46:23 +0000 (+0000)
Subject: Sync up with gnus-6_10.
X-Git-Tag: nana-gnus-6_12_16~4
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=cd632dbeeb5f26247f7caaf1b2d18dff7b5d4576;p=elisp%2Fgnus.git-

Sync up with gnus-6_10.
---

diff --git a/README.semi.ja b/README.semi.ja
index b8c3e78..99c045a 100644
--- a/README.semi.ja
+++ b/README.semi.ja
@@ -12,7 +12,7 @@ Semi-gnus $B$H$O!)(B
 $B$K$=$l$i$r%$%s%9%H!<%k$7$F$/$@$5$$!#(BSemi-gnus 6.10 $B$O(B APEL 9.13 $B0J>e!"(B
 $B:G?7$N(B FLIM 1.12 $B$*$h$S(B SEMI 1.12 $B$rI,MW$H$7$^$9!#(B
 $B$=$l$i$N%Q%C%1!<%8$O(B
-ftp://ftp.jaist.ac.jp/pub/elisp/semi/
+ftp://ftp.jaist.ac.jp/pub/GNU/elisp/semi/
 $B$+$i<hF@$9$k$3$H$,$G$-$^$9!#I,MW$J4D6-$O(B SEMI $B$N(B README.ja $B$r;2>H$7$F(B
 $B$/$@$5$$!#(B
 
diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el
index 051c2f5..e6fde66 100644
--- a/lisp/dgnushack.el
+++ b/lisp/dgnushack.el
@@ -120,7 +120,7 @@ Modify to suit your needs."))
     (with-temp-buffer
       (let ((standard-output (current-buffer)))
 	(Custom-make-dependencies "."))
-      (message (buffer-string)))
+      (message (buffer-substring (point-min) (point-max))))
     (require 'cus-load)
     (byte-compile-file "custom-load.el")
 
diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index b67fa90..ca0a9fa 100644
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -701,8 +701,9 @@ always hide."
 	    ;; select which header lines is to remain visible in the
 	    ;; article buffer.
 	    (goto-char (point-min))
-	    (while (re-search-forward "^[^ \t]*:" nil t)
-	      (beginning-of-line)
+	    (while (memq (char-after) '(?\t ?\ ))
+	      (forward-line 1))
+	    (while (not (eobp))
 	      ;; Mark the rank of the header.
 	      (put-text-property
 	       (point) (1+ (point)) 'message-rank
@@ -711,7 +712,9 @@ always hide."
 			    (not (looking-at ignored))))
 		   (gnus-article-header-rank)
 		 (+ 2 max)))
-	      (forward-line 1))
+	      (forward-line 1)
+	      (while (memq (char-after) '(?\t ?\ ))
+		(forward-line 1)))
 	    (message-sort-headers-1)
 	    (when (setq beg (text-property-any
 			     (point-min) (point-max) 'message-rank (+ 2 max)))
@@ -746,12 +749,11 @@ always hide."
 	      (while (re-search-forward "^[^:]+:[ \t]*\n[^ \t]" nil t)
 		(forward-line -1)
 		(gnus-article-hide-text-type
-		 (progn (beginning-of-line) (point))
+		 (point)
 		 (progn
-		   (end-of-line)
-		   (if (re-search-forward "^[^ \t]" nil t)
-		       (match-beginning 0)
-		     (point-max)))
+		   (while (and (zerop (forward-line 1))
+			       (memq (char-after) '(?\t ?\ ))))
+		   (point))
 		 'boring-headers)))
 	     ;; Hide boring Newsgroups header.
 	     ((eq elem 'newsgroups)
@@ -807,10 +809,9 @@ always hide."
       (gnus-article-hide-text-type
        (progn (beginning-of-line) (point))
        (progn
-	 (end-of-line)
-	 (if (re-search-forward "^[^ \t]" nil t)
-	     (match-beginning 0)
-	   (point-max)))
+	 (while (and (zerop (forward-line 1))
+		     (memq (char-after) '(?\t ?\ ))))
+	 (point))
        'boring-headers))))
 
 (defun article-treat-dumbquotes ()
@@ -877,7 +878,7 @@ characters to translate to."
 	    (adaptive-fill-mode t))
 	(while (not (eobp))
 	  (and (>= (current-column) (min fill-column (window-width)))
-	       (not (eq (char-before) ?:))
+	       (not (eq (preceding-char) ?:))
 	       (fill-paragraph nil))
 	  (end-of-line 2))))))
 
@@ -2706,7 +2707,7 @@ groups."
   "Exit the article editing without updating."
   (interactive)
   ;; We remove all text props from the article buffer.
-  (let ((buf (format "%s" (buffer-string)))
+  (let ((buf (format "%s" (buffer-substring (point-min) (point-max))))
 	(curbuf (current-buffer))
 	(p (point))
 	(window-start (window-start)))
@@ -2815,7 +2816,7 @@ after replacing with the original article."
       (setq font-lock-defaults nil)
       (font-lock-mode 0))
     ;; We remove all text props from the article buffer.
-    (setq buf (format "%s" (buffer-string)))
+    (setq buf (format "%s" (buffer-substring (point-min) (point-max))))
     (set-buffer (get-buffer-create gnus-original-article-buffer))
     (erase-buffer)
     (insert buf)
@@ -3028,9 +3029,11 @@ do the highlighting.  See the documentation for those functions."
 	    (when (and field-face
 		       (not (memq (setq from (point)) fpoints)))
 	      (push from fpoints)
-	      (if (re-search-forward "^[^ \t]" nil t)
-		  (forward-char -2)
-		(goto-char (point-max)))
+	      (while (and (zerop (forward-line 1))
+			  (memq (char-after) '(?\t ?\ ))))
+	      (unless (eobp)
+		;; Go to the end of the previous line.
+		(end-of-line 0))
 	      (gnus-put-text-property from (point) 'face field-face))))))))
 
 (defun gnus-article-highlight-signature ()
@@ -3122,9 +3125,9 @@ specified by `gnus-button-alist'."
 	(while (re-search-forward (car entry) nil t)
 	  ;; Each header matching the entry.
 	  (setq beg (match-beginning 0))
-	  (setq end (or (and (re-search-forward "^[^ \t]" nil t)
-			     (match-beginning 0))
-			(point-max)))
+	  (while (and (zerop (forward-line 1))
+		      (memq (char-after) '(?\t ?\ ))))
+	  (setq end (point))
 	  (goto-char beg)
 	  (while (re-search-forward (nth 1 entry) end t)
 	    ;; Each match within a header.
diff --git a/lisp/gnus-kill.el b/lisp/gnus-kill.el
index abcc401..1860074 100644
--- a/lisp/gnus-kill.el
+++ b/lisp/gnus-kill.el
@@ -282,7 +282,7 @@ If NEWSGROUP is nil, the global kill file is selected."
   (if (and gnus-current-kill-article
 	   (get-buffer gnus-summary-buffer))
       ;; Assume newsgroup is selected.
-      (gnus-kill-file-apply-string (buffer-string))
+      (gnus-kill-file-apply-string (buffer-substring (point-min) (point-max)))
     (ding) (gnus-message 2 "No newsgroup is selected.")))
 
 (defun gnus-kill-file-apply-string (string)
diff --git a/lisp/gnus-mh.el b/lisp/gnus-mh.el
index fa01f5a..a82e4e2 100644
--- a/lisp/gnus-mh.el
+++ b/lisp/gnus-mh.el
@@ -76,7 +76,7 @@ Optional argument FOLDER specifies folder name."
 	  (set-buffer errbuf)
 	  (if (zerop (buffer-size))
 	      (message "Article saved in folder: %s" folder)
-	    (message "%s" (buffer-string)))
+	    (message "%s" (buffer-substring (point-min) (point-max))))
 	  (kill-buffer errbuf))))
     (setq gnus-newsgroup-last-folder folder)))
 
diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el
index 5ca0e78..e6e8ead 100644
--- a/lisp/gnus-msg.el
+++ b/lisp/gnus-msg.el
@@ -427,7 +427,7 @@ header line with the old Message-ID."
 	  (gnus-remove-text-with-property 'gnus-next)
 	  (insert
 	   (prog1
-	       (format "%s" (buffer-string))
+	       (format "%s" (buffer-substring (point-min) (point-max)))
 	     (erase-buffer)))
 	  ;; Find the original headers.
 	  (set-buffer gnus-original-article-buffer)
diff --git a/lisp/gnus-picon.el b/lisp/gnus-picon.el
index a3b5418..fba2811 100644
--- a/lisp/gnus-picon.el
+++ b/lisp/gnus-picon.el
@@ -514,7 +514,9 @@ none, and whose CDR is the corresponding element of DOMAINS."
 					nil 'quiet)
 			  (prog1 (make-glyph (vector 'xbm :file fname))
 			    (delete-file fname))))
-	(t (make-glyph (vector type :data (buffer-string))))))
+	(t (make-glyph
+	    (vector type :data
+		    (buffer-substring (point-min) (point-max)))))))
 
 ;;; Parsing of piconsearch result page.
 
diff --git a/lisp/gnus-soup.el b/lisp/gnus-soup.el
index 1fdd83f..3d97829 100644
--- a/lisp/gnus-soup.el
+++ b/lisp/gnus-soup.el
@@ -380,12 +380,12 @@ though the two last may be nil if they are missing."
 	  (push (vector (gnus-soup-field)
 			(gnus-soup-field)
 			(gnus-soup-field)
-			(and (eq (char-before) ?\t)
+			(and (eq (preceding-char) ?\t)
 			     (gnus-soup-field))
-			(and (eq (char-before) ?\t)
+			(and (eq (preceding-char) ?\t)
 			     (string-to-int (gnus-soup-field))))
 		areas)
-	  (when (eq (char-before) ?\t)
+	  (when (eq (preceding-char) ?\t)
 	    (beginning-of-line 2)))
 	(kill-buffer (current-buffer))))
     areas))
@@ -403,7 +403,7 @@ file.  The vector contain three strings, [prefix name encoding]."
 	(push (vector (gnus-soup-field) (gnus-soup-field)
 		      (gnus-soup-field))
 	      replies)
-	(when (eq (char-before) ?\t)
+	(when (eq (preceding-char) ?\t)
 	  (beginning-of-line 2)))
       (kill-buffer (current-buffer)))
     replies))
diff --git a/lisp/gnus-spec.el b/lisp/gnus-spec.el
index 2b06fa8..02acdda 100644
--- a/lisp/gnus-spec.el
+++ b/lisp/gnus-spec.el
@@ -449,7 +449,7 @@
 		  (push el flist)))
 	    (insert elem-type)
 	    (push (car elem) flist))))
-      (setq fstring (buffer-string)))
+      (setq fstring (buffer-substring (point-min) (point-max))))
 
     ;; Do some postprocessing to increase efficiency.
     (setq
diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 3854e91..2e378bb 100644
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -1101,7 +1101,7 @@ See `gnus-simplify-buffer-fuzzy' for details."
       (insert subject)
       (let ((gnus-simplify-subject-fuzzy-regexp fuzzy-regexp))
 	(inline (gnus-simplify-buffer-fuzzy)))
-      (buffer-string))))
+      (buffer-substring (point-min) (point-max)))))
 
 (defsubst gnus-simplify-subject-fully (subject)
   "Simplify a subject string according to gnus-summary-gather-subject-limit."
@@ -7035,6 +7035,7 @@ and `request-accept' functions."
 			     default-marks
 			   no-expire-marks))
 		  (to-article (cdr art-group)))
+
 	      ;; See whether the article is to be put in the cache.
 	      (when gnus-use-cache
 		(gnus-cache-possibly-enter-article
@@ -7088,7 +7089,7 @@ and `request-accept' functions."
 
 	;;;!!!Why is this necessary?
 	(set-buffer gnus-summary-buffer)
-	
+
 	(gnus-summary-goto-subject article)
 	(when (eq action 'move)
 	  (gnus-summary-mark-article article gnus-canceled-mark))))
@@ -7362,7 +7363,7 @@ groups."
 	    (save-excursion
 	      (save-restriction
 		(message-narrow-to-head)
-		(let ((head (buffer-string))
+		(let ((head (buffer-substring (point-min) (point-max)))
 		      header)
 		  (nnheader-temp-write nil
 		    (insert (format "211 %d Article retrieved.\n"
@@ -8183,15 +8184,14 @@ is non-nil or the Subject: of both articles are the same."
 	(let (gnus-mark-article-hook)
 	  (gnus-summary-select-article t t nil current-article))
 	(set-buffer gnus-original-article-buffer)
-	(let ((buf (format "%s" (buffer-string))))
+	(let ((buf (format "%s" (buffer-substring (point-min) (point-max)))))
 	  (nnheader-temp-write nil
 	    (insert buf)
 	    (goto-char (point-min))
 	    (if (re-search-forward "^References: " nil t)
 		(progn
 		  (re-search-forward "^[^ \t]" nil t)
-		  (forward-line -1)
-		  (end-of-line)
+		  (end-of-line 0) ;; Go to the end of the previous line.
 		  (insert " " message-id))
 	      (insert "References: " message-id "\n"))
 	    (unless (gnus-request-replace-article
diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el
index 6c3400e..7017aca 100644
--- a/lisp/gnus-util.el
+++ b/lisp/gnus-util.el
@@ -396,7 +396,7 @@ Cache the result as a text property stored in DATE."
     (goto-char (point-min))
     (while (search-forward "%" nil t)
       (insert "%"))
-    (buffer-string)))
+    (buffer-substring (point-min) (point-max))))
 
 ;; Make a hash table (default and minimum size is 256).
 ;; Optional argument HASHSIZE specifies the table size.
diff --git a/lisp/gnus-vm.el b/lisp/gnus-vm.el
index 3e65485..40123c4 100644
--- a/lisp/gnus-vm.el
+++ b/lisp/gnus-vm.el
@@ -1,7 +1,8 @@
 ;;; gnus-vm.el --- vm interface for Gnus
-;; Copyright (C) 1994,95,96,97,98 Free Software Foundation, Inc.
+;; Copyright (C) 1994,95,96,97,98,99 Free Software Foundation, Inc.
 
 ;; Author: Per Persson <pp@gnu.ai.mit.edu>
+;;         Katsumi Yamaoka <yamaoka@jpl.org>
 ;; Keywords: news, mail
 
 ;; This file is part of GNU Emacs.
@@ -30,31 +31,22 @@
 
 ;;; Code:
 
-(require 'sendmail)
-(require 'message)
-(require 'gnus)
-(require 'gnus-msg)
+(require 'gnus-art)
 
 (eval-when-compile
+  (require 'cl)
   (autoload 'vm-mode "vm")
-  (autoload 'vm-save-message "vm")
-  (autoload 'vm-forward-message "vm")
-  (autoload 'vm-reply "vm")
-  (autoload 'vm-mail "vm"))
-
-(defvar gnus-vm-inhibit-window-system nil
-  "Inhibit loading `win-vm' if using a window-system.
-Has to be set before gnus-vm is loaded.")
-
-(or gnus-vm-inhibit-window-system
-    (condition-case nil
-	(when window-system
-	  (require 'win-vm))
-      (error nil)))
+  (autoload 'vm-read-file-name "vm")
+  (autoload 'vm-save-message "vm"))
 
 (when (not (featurep 'vm))
   (load "vm"))
 
+(defvar vm-folder-directory)
+(defvar vm-folder-history)
+(defvar vm-primary-inbox)
+(defvar vm-use-toolbar)
+  
 (defun gnus-vm-make-folder (&optional buffer)
   (let ((article (or buffer (current-buffer)))
 	(tmp-folder (generate-new-buffer " *tmp-folder*"))
@@ -72,34 +64,99 @@ Has to be set before gnus-vm is loaded.")
     ;; insert a newline, otherwise the last line gets lost
     (goto-char (point-max))
     (insert "\n")
-    (vm-mode)
+    (let (mime-display-header-hook
+	  mime-display-text/plain-hook mime-text-decode-hook
+	  mime-view-define-keymap-hook mime-view-mode-hook)
+      (vm-mode))
     tmp-folder))
 
-(defun gnus-summary-save-article-vm (&optional arg)
+(defvar gnus-summary-save-article-vm-folder nil)
+(defvar gnus-summary-save-article-vm-count nil)
+
+(defun gnus-summary-save-article-vm (&optional arg folder)
   "Append the current article to a vm folder.
 If N is a positive number, save the N next articles.
 If N is a negative number, save the N previous articles.
 If N is nil and any articles have been marked with the process mark,
 save those articles instead."
-  (interactive "P")
-  (let ((gnus-default-article-saver 'gnus-summary-save-in-vm))
-    (gnus-summary-save-article arg)))
+  (interactive
+   (let ((prefix-arg current-prefix-arg)
+	 articles marks default-folder)
+     (setq default-folder (or (car vm-folder-history) vm-primary-inbox))
+     (if (numberp prefix-arg)
+	 (setq articles prefix-arg)
+       (setq marks (delq nil (gnus-summary-work-articles nil))
+	     articles (length marks)))
+     (list
+      prefix-arg
+      (unless (zerop articles)
+	(vm-read-file-name
+	 (format
+	  "Save %s in VM folder: "
+	  (cond ((eq 1 articles)
+		 (if (or (not marks) (eq gnus-current-article (car marks)))
+		     "this article"
+		   "the marked article"))
+		((< 0 articles)
+		 (if marks
+		     (format "the marked %d articles" articles)
+		   (format "the %d next articles" articles)))
+		((> 0 articles)
+		 (format "the %d previous articles" (- articles)))))
+	 (if default-folder "" vm-folder-directory)
+	 nil nil default-folder 'vm-folder-history)))))
+  (if (interactive-p)
+      (unless folder
+	(error "No articles to be saved"))
+    (unless (setq folder (or folder gnus-summary-save-article-vm-folder))
+      (error "No VM folder is specified")))
+  (unwind-protect
+      (progn
+	(setq gnus-summary-save-article-vm-folder folder
+	      gnus-summary-save-article-vm-count 0)
+	(let ((gnus-default-article-saver 'gnus-summary-save-in-vm)
+	      mime-display-header-hook mime-display-text/plain-hook
+	      mime-text-decode-hook mime-view-define-keymap-hook
+	      mime-view-mode-hook)
+	  (gnus-summary-save-article arg))
+	(cond ((eq 1 gnus-summary-save-article-vm-count)
+	       (message "One article is saved in %s" folder))
+	      ((< 0 gnus-summary-save-article-vm-count)
+	       (message "%d articles are saved in %s"
+			gnus-summary-save-article-vm-count folder))
+	      (t
+	       (message "Maybe no articles are saved in %s" folder))))
+    (setq gnus-summary-save-article-vm-folder nil
+	  gnus-summary-save-article-vm-count nil)))
 
 (defun gnus-summary-save-in-vm (&optional folder)
-  (interactive)
-  (setq folder
-	(gnus-read-save-file-name
-	 "Save %s in VM folder:" folder
-	 gnus-mail-save-name gnus-newsgroup-name
-	 gnus-current-headers 'gnus-newsgroup-last-mail))
+  (interactive
+   (let (default-folder)
+     (setq default-folder (or (car vm-folder-history) vm-primary-inbox))
+     (list (vm-read-file-name "Save this article in VM folder: "
+			      (if default-folder "" vm-folder-directory)
+			      nil nil default-folder 'vm-folder-history))))
+  (unless (interactive-p)
+    (setq folder (or folder gnus-summary-save-article-vm-folder)))
+  (unless folder
+    (error "No VM folder is specified"))
+  (unless (interactive-p)
+    (message "Saving the article %d in %s..." gnus-current-article folder)
+    (when (numberp gnus-summary-save-article-vm-count)
+      (incf gnus-summary-save-article-vm-count)))
   (save-window-excursion
-    (gnus-summary-select-article gnus-show-all-headers)
+    (apply 'gnus-summary-select-article gnus-show-all-headers
+	   (unless (interactive-p)
+	     (list nil nil gnus-current-article)))
     (gnus-eval-in-buffer-window gnus-original-article-buffer
       (save-excursion
 	(save-restriction
 	  (widen)
-	  (let ((vm-folder (gnus-vm-make-folder)))
+	  (let* ((vm-use-toolbar nil)
+		 (vm-folder (gnus-vm-make-folder)))
 	    (vm-save-message folder)
+	    (when (interactive-p)
+	      (message "This article is saved in %s" folder))
 	    (kill-buffer vm-folder)))))))
 
 (provide 'gnus-vm)
diff --git a/lisp/gnus-xmas.el b/lisp/gnus-xmas.el
index 26245b3..2a2899a 100644
--- a/lisp/gnus-xmas.el
+++ b/lisp/gnus-xmas.el
@@ -866,7 +866,8 @@ XEmacs compatibility workaround."
 		      (gnus-xmas-call-region "icontopbm")
 		      (gnus-xmas-call-region "ppmtoxpm")
 		      (make-glyph
-		       (vector 'xpm :data (buffer-string))))))
+		       (vector 'xpm :data
+			       (buffer-substring (point-min) (point-max)))))))
 		 (t
 		  (make-glyph [nothing]))))
 	  (ext (make-extent (progn
diff --git a/lisp/gnus.el b/lisp/gnus.el
index 6c2812c..94ac547 100644
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -794,7 +794,7 @@ used to 899, you would say something along these lines:
 	     (set-buffer (gnus-get-buffer-create " *gnus nntp*"))
 	     (buffer-disable-undo (current-buffer))
 	     (insert-file-contents gnus-nntpserver-file)
-	     (let ((name (buffer-string)))
+	     (let ((name (buffer-substring (point-min) (point-max))))
 	       (prog1
 		   (if (string-match "^[ \t\n]*$" name)
 		       nil
diff --git a/lisp/md5.el b/lisp/md5.el
index 3fabf29..e68afe7 100644
--- a/lisp/md5.el
+++ b/lisp/md5.el
@@ -391,7 +391,7 @@ hash of a portion of OBJECT."
 	      (if (<= (point-max) md5-maximum-internal-length)
 		  (mapconcat
 		   (function (lambda (node) (format "%02x" node)))
-		   (md5-encode (buffer-string))
+		   (md5-encode (buffer-substring (point-min) (point-max)))
 		   "")
 		(call-process-region (point-min) (point-max)
 				     (or shell-file-name "/bin/sh")
diff --git a/lisp/message.el b/lisp/message.el
index d00851b..aac2fa2 100644
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -1204,14 +1204,11 @@ Return the number of headers removed."
 	     ;; There might be a continuation header, so we have to search
 	     ;; until we find a new non-continuation line.
 	     (progn
-	       (forward-line 1)
-	       (if (re-search-forward "^[^ \t]" nil t)
-		   (goto-char (match-beginning 0))
-		 (point-max)))))
-	(forward-line 1)
-	(if (re-search-forward "^[^ \t]" nil t)
-	    (goto-char (match-beginning 0))
-	  (point-max))))
+	       (while (and (zerop (forward-line 1))
+			   (memq (char-after) '(?\t ?\ ))))
+	       (point))))
+	(while (and (zerop (forward-line 1))
+		    (memq (char-after) '(?\t ?\ ))))))
     number))
 
 (defun message-narrow-to-headers ()
@@ -1258,11 +1255,9 @@ Return the number of headers removed."
 
 (defun message-next-header ()
   "Go to the beginning of the next header."
-  (beginning-of-line)
-  (or (eobp) (forward-char 1))
-  (not (if (re-search-forward "^[^ \t]" nil t)
-	   (beginning-of-line)
-	 (goto-char (point-max)))))
+  (while (and (zerop (forward-line 1))
+	      (memq (char-after) '(?\t ?\ ))))
+  (not (eobp)))
 
 (defun message-sort-headers-1 ()
   "Sort the buffer as headers using `message-rank' text props."
@@ -2312,7 +2307,7 @@ This sub function is for exclusive use of `message-send-mail'."
 	      (message-remove-header message-ignored-mail-headers t))
 	    (goto-char (point-max))
 	    ;; require one newline at the end.
-	    (or (eq (char-before) ?\n)
+	    (or (bolp)
 		(insert ?\n))
 	    (when (and news
 		       (or (message-fetch-field "cc")
@@ -2342,7 +2337,7 @@ This sub function is for exclusive use of `message-send-mail'."
       (re-search-forward
        (concat "^" (regexp-quote mail-header-separator) "\n"))
       (replace-match "\n")
-      (backward-char 1)
+      (forward-char -1)
       (setq delimline (point-marker))
       (run-hooks 'message-send-mail-hook)
       ;; Insert an extra newline if we need it to work around
@@ -2469,7 +2464,7 @@ to find out how to use this."
     (re-search-forward
      (concat "^" (regexp-quote mail-header-separator) "\n"))
     (replace-match "\n")
-    (backward-char 1)
+    (forward-char -1)
     (run-hooks 'message-send-mail-hook)
     (if recipients
 	(let ((result (smtp-via-smtp user-mail-address
@@ -2548,7 +2543,7 @@ This sub function is for exclusive use of `message-send-news'."
 	      (message-remove-header message-ignored-news-headers t))
 	    (goto-char (point-max))
 	    ;; require one newline at the end.
-	    (or (eq (char-before) ?\n)
+	    (or (bolp)
 		(insert ?\n))
 	    (setq result (message-maybe-split-and-send-news method)))
 	(kill-buffer tembuf))
@@ -2568,7 +2563,7 @@ This sub function is for exclusive use of `message-send-news'."
     (re-search-forward
      (concat "^" (regexp-quote mail-header-separator) "\n"))
     (replace-match "\n")
-    (backward-char 1)
+    (forward-char -1)
     (run-hooks 'message-send-news-hook)
     ;;(require (car method))
     ;;(funcall (intern (format "%s-open-server" (car method)))
@@ -3088,7 +3083,7 @@ This sub function is for exclusive use of `message-send-news'."
       (while (re-search-forward "[\t\n]+" nil t)
 	(replace-match "" t t))
       (unless (zerop (buffer-size))
-	(buffer-string)))))
+	(buffer-substring (point-min) (point-max))))))
 
 (defun message-make-lines ()
   "Count the number of lines and return numeric string."
@@ -3206,7 +3201,7 @@ This sub function is for exclusive use of `message-send-news'."
 	    (replace-match "\\1(\\3)" t)
 	    (goto-char fullname-start)))
 	(insert ")")))
-      (buffer-string))))
+      (buffer-substring (point-min) (point-max)))))
 
 (defun message-make-sender ()
   "Return the \"real\" user address.
@@ -3792,7 +3787,8 @@ OTHER-HEADERS is an alist of header/value pairs."
 	      (while (re-search-forward "[ \t]+" nil t)
 		(replace-match " " t t))
 	      ;; Remove addresses that match `rmail-dont-reply-to-names'.
-	      (insert (prog1 (rmail-dont-reply-to (buffer-string))
+	      (insert (prog1 (rmail-dont-reply-to (buffer-substring
+						   (point-min) (point-max)))
 			(erase-buffer)))
 	      (goto-char (point-min))
 	      ;; Perhaps Mail-Copies-To: never removed the only address?
@@ -3802,7 +3798,8 @@ OTHER-HEADERS is an alist of header/value pairs."
 		    (mapcar
 		     (lambda (addr)
 		       (cons (mail-strip-quoted-names addr) addr))
-		     (message-tokenize-header (buffer-string))))
+		     (message-tokenize-header (buffer-substring
+					       (point-min) (point-max)))))
 	      (let ((s ccalist))
 		(while s
 		  (setq ccalist (delq (assoc (car (pop s)) s) ccalist))))
@@ -4093,7 +4090,7 @@ header line with the old Message-ID."
     (while (re-search-backward "[ \t]+$" nil t)
       (replace-match ""))
 
-    (buffer-string)))
+    (buffer-substring (point-min) (point-max))))
     
 ;;; Forwarding messages.
 
diff --git a/lisp/nndb.el b/lisp/nndb.el
index 007d8e5..fd26cb1 100644
--- a/lisp/nndb.el
+++ b/lisp/nndb.el
@@ -287,7 +287,7 @@ Optional LAST is ignored."
       (nntp-send-buffer "^[23].*\n"))
     
     (set-buffer nntp-server-buffer)
-    (setq msg (buffer-string (point-min) (point-max)))
+    (setq msg (buffer-substring (point-min) (point-max)))
     (or (string-match "^\\([0-9]+\\)" msg)
 	(error "nndb: %s" msg))
     (setq art (substring msg (match-beginning 1) (match-end 1)))
@@ -314,7 +314,7 @@ with the contents of the BUFFER."
 (deffoo nndb-status-message (&optional server)
   "Return server status as a string."
   (set-buffer nntp-server-buffer)
-  (buffer-string (point-min) (point-max)))
+  (buffer-substring (point-min) (point-max)))
 
 ;; Import stuff from nntp
 
diff --git a/lisp/nnheader.el b/lisp/nnheader.el
index 2267749..ba0ef2f 100644
--- a/lisp/nnheader.el
+++ b/lisp/nnheader.el
@@ -538,7 +538,7 @@ If FILE is t, return the buffer contents as a string."
 		;; Return the buffer contents.
 		((eq ,temp-file t)
 		 (set-buffer ,temp-buffer)
-		 (buffer-string))
+		 (buffer-substring (point-min) (point-max)))
 		;; Save a file.
 		(t
 		 (set-buffer ,temp-buffer)
diff --git a/lisp/nnmail.el b/lisp/nnmail.el
index 8481295..a6b2f2e 100644
--- a/lisp/nnmail.el
+++ b/lisp/nnmail.el
@@ -740,8 +740,9 @@ If this variable is `t', do not use password cache.")
 		      (delete-region (point-min) (match-end 0)))
 		    (unless (yes-or-no-p
 			     (format "movemail: %s (%d return).  Continue? "
-				     (buffer-string) result))
-		      (error "%s" (buffer-string)))
+				     (buffer-substring
+				      (point-min) (point-max)) result))
+		      (error "%s" (buffer-substring (point-min) (point-max))))
 		    (setq tofile nil)))
 		))))
 	(nnmail-set-password inbox nnmail-internal-password)
@@ -1801,9 +1802,10 @@ If ARGS, PROMPT is used as an argument to `format'."
 	;; Narrow to the status.
 	(narrow-to-region
 	 (point)
-	 (if (re-search-forward "^[^ \t]" nil t)
-	     (1- (point))
-	   (point-max)))
+	 (progn
+	   (while (and (zerop (forward-line 1))
+		       (memq (char-after) '(?\t ?\ ))))
+	   (point)))
 	;; Go through all elements and add them to the list.
 	(goto-char (point-min))
 	(while (re-search-forward "[^ \t=]+" nil t)
diff --git a/lisp/nnsoup.el b/lisp/nnsoup.el
index 76160f9..bc12423 100644
--- a/lisp/nnsoup.el
+++ b/lisp/nnsoup.el
@@ -687,7 +687,7 @@ backend for the messages.")
 	    (message-remove-header message-ignored-mail-headers t))
 	  (goto-char (point-max))
 	  ;; require one newline at the end.
-	  (or (eq (char-before) ?\n)
+	  (or (bolp)
 	      (insert ?\n))
 	  (let ((case-fold-search t))
 	    ;; Change header-delimiter to be what sendmail expects.
@@ -695,7 +695,7 @@ backend for the messages.")
 	    (re-search-forward
 	     (concat "^" (regexp-quote real-header-separator) "\n"))
 	    (replace-match "\n")
-	    (backward-char 1)
+	    (forward-char -1)
 	    (setq delimline (point-marker))
 	    ;; Insert an extra newline if we need it to work around
 	    ;; Sun's bug that swallows newlines.
diff --git a/lisp/nnspool.el b/lisp/nnspool.el
index a1154b6..b6b9ad5 100644
--- a/lisp/nnspool.el
+++ b/lisp/nnspool.el
@@ -342,7 +342,8 @@ there.")
       ;; Make status message by folding lines.
       (while (re-search-forward "[ \t\n]+" nil t)
 	(replace-match " " t t))
-      (nnheader-report 'nnspool "%s" (buffer-string))
+      (nnheader-report 'nnspool "%s" (buffer-substring
+				      (point-min) (point-max)))
       (nnheader-message 5 "nnspool: %s" nnspool-status-string)
       (ding)
       (run-hooks 'nnspool-rejected-article-hook))))
diff --git a/lisp/nntp.el b/lisp/nntp.el
index 9f2be03..a123a33 100644
--- a/lisp/nntp.el
+++ b/lisp/nntp.el
@@ -906,7 +906,7 @@ password contained in '~/.nntp-authinfo'."
 (defun nntp-read-server-type ()
   "Find out what the name of the server we have connected to is."
   ;; Wait for the status string to arrive.
-  (setq nntp-server-type (buffer-string))
+  (setq nntp-server-type (buffer-substring (point-min) (point-max)))
   (let ((alist nntp-server-action-alist)
 	(case-fold-search t)
 	entry)
@@ -956,7 +956,7 @@ password contained in '~/.nntp-authinfo'."
 
 (defun nntp-snarf-error-message ()
   "Save the error message in the current buffer."
-  (let ((message (buffer-string)))
+  (let ((message (buffer-substring (point-min) (point-max))))
     (while (string-match "[\r\n]+" message)
       (setq message (replace-match " " t t message)))
     (nnheader-report 'nntp message)
diff --git a/lisp/pop3-fma.el b/lisp/pop3-fma.el
index 96a82c0..89a05a1 100644
--- a/lisp/pop3-fma.el
+++ b/lisp/pop3-fma.el
@@ -248,7 +248,7 @@ If there is any problem , please set this variable to nil(default).
 				      pop3-fma-movemail-program)
 		       nil movemail-output-buffer nil
 		       pop3-fma-commandline-arguments)
-		(let ((string (buffer-string)))
+		(let ((string (buffer-substring (point-min) (point-max))))
 		  (if (> (length string) 0)
 		      (progn
 			(if (y-or-n-p
diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index 757bc19..239a919 100644
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -1761,13 +1761,14 @@ Gnus $B$ODL>o!"(B@code{gnus-activate-level} $B$+$=$l$h$j>.$5$$%l%Y%k$N%0%k!<%
 $B$i$$IQHK$KFI$`$+$K$h$C$F%0%k!<%W%P%C%U%!$r%=!<%H$7$?$$$J$"!"$J$s(B
 $B$F;W$o$J$$!)M}$K$+$J$C$F$k$G$7$g!)(B
 
-$B%0%k!<%W%9%3%"(B @dfn{group score} $B$O$=$N$?$a$N$b$N$G$9!#$=$l$>$l$N%0%k!<(B
-$B%W$KBP$7$F%9%3%"$r;XDj$9$k$3$H$,$G$-$^$9!#$=$7$F%0%k!<%W%P%C%U%!$r$3$N%9(B
-$B%3%"$r4p$K%=!<%H$9$k$3$H$,$G$-$^$9!#$"$k$$$O!"%9%3%"=g$G%=!<%H$7$F$=$N8e(B
-$B%l%Y%k$G%=!<%H$9$k$3$H$b$G$-$^$9!#!J%l%Y%k$H%9%3%"$r$R$H$^$H$a$K$7$F!"%0(B
-$B%k!<%W$N(B@dfn{$B%i%s%/(B} (@dfn{rank}) $B$H8F$S$^$9!#%l%Y%k$,(B 4 $B$G%9%3%"$,(B 1 $B$N(B
-$B%0%k!<%W$O!"%l%Y%k$,(B 5 $B$G%9%3%"$,(B 300 $B$N%0%k!<%W$h$j$b9b$$%i%s%/$H$J$j$^(B
-$B$9!#!J%l%Y%k$NJ}$,=EMWEY$,9b$/!"%9%3%"$NJ}$O=EMWEY$,Dc$/$J$j$^$9!#!K!K(B
+@dfn{$B%0%k!<%W%9%3%"(B} (@dfn{group score}) $B$O$=$N$?$a$N$b$N$G$9!#$=$l$>$l(B
+$B$N%0%k!<%W$KBP$7$F%9%3%"$r;XDj$9$k$3$H$,$G$-$^$9!#$=$7$F%0%k!<%W%P%C%U%!(B
+$B$r$3$N%9%3%"$r4p$K%=!<%H$9$k$3$H$,$G$-$^$9!#$"$k$$$O!"%9%3%"=g$G%=!<%H$7(B
+$B$F$=$N8e%l%Y%k$G%=!<%H$9$k$3$H$b$G$-$^$9!#!J%l%Y%k$H%9%3%"$r$R$H$^$H$a$K(B
+$B$7$F!"%0%k!<%W$N(B@dfn{$B%i%s%/(B} (@dfn{rank}) $B$H8F$S$^$9!#%l%Y%k$,(B 4 $B$G%9%3(B
+$B%"$,(B 1 $B$N%0%k!<%W$O!"%l%Y%k$,(B 5 $B$G%9%3%"$,(B 300 $B$N%0%k!<%W$h$j$b9b$$%i%s(B
+$B%/$H$J$j$^$9!#!J%l%Y%k$NJ}$,=EMWEY$,9b$/!"%9%3%"$NJ}$O=EMWEY$,Dc$/$J$j$^(B
+$B$9!#!K!K(B
 
 @findex gnus-summary-bubble-group
 $BIQHK$KFI$`%0%k!<%W$K!"$a$C$?$KFI$^$J$$%0%k!<%W$h$j$b9b$$%9%3%"$rM?$($?$$$H(B
@@ -1784,10 +1785,10 @@ Gnus $B$ODL>o!"(B@code{gnus-activate-level} $B$+$=$l$h$j>.$5$$%l%Y%k$N%0%k!<%
 @section $B%0%k!<%W$X$N0u(B
 @cindex marking groups
 
-$B$b$7$$$/$D$+$N%0%k!<%W$KBP$7$F2?$i$+$NL?Na$r<B9T$7$?$$>l9g$G!"$=$l$i$,%0%k!<(B
-$B%W%P%C%U%!$KO"B3$7$F$"$k>l9g$K$O!"DL>oDL$jL?Na$KBP$7$F?t;z%W%l%U%#%C%/%9$r(B
-$BM?$($k$@$1$G$9!#$=$&$9$l$P$[$H$s$I$N%0%k!<%W%3%^%s%I$O!"$3$l$i$N%0%k!<%W$K(B
-$BBP$7$F$"$J$?$NL?Na$K=>$$$^$9!#(B
+$B$b$7$$$/$D$+$N%0%k!<%W$KBP$7$F2?$i$+$NL?Na$r<B9T$7$?$$>l9g$G!"$=$l$i$,%0(B
+$B%k!<%W%P%C%U%!$KO"B3$7$F$"$k>l9g$K$O!"DL>oDL$jL?Na$KBP$7$F?t;z@\F,<-$rM?(B
+$B$($k$@$1$G$9!#$=$&$9$l$P$[$H$s$I$N%0%k!<%WL?Na$O!"$3$l$i$N%0%k!<%W$KBP$7(B
+$B$F$"$J$?$NL?Na$K=>$$$^$9!#(B
 
 $B$7$+$7$=$l$i$N%0%k!<%W$,=gHV$KJB$s$G$$$J$$>l9g$K$*$$$F$b!"$$$/$D$+$N%0%k!<(B
 $B%W$KBP$7$FL?Na$r<B9T$9$k$3$H$,$G$-$^$9!#C1$K;O$a$K%W%m%;%90u$G%0%k!<%W$K(B
@@ -1817,23 +1818,23 @@ Gnus $B$ODL>o!"(B@code{gnus-activate-level} $B$+$=$l$h$j>.$5$$%l%Y%k$N%0%k!<%
 @item M w
 @kindex M w (Group)
 @findex gnus-group-mark-region
-$B%]%$%s%H$H%^!<%/$K4V$NA4$F$N%0%k!<%W$K0u$r$D$1$k(B
+$B%]%$%s%H$H%^!<%/$N4V$NA4$F$N%0%k!<%W$K0u$r$D$1$k(B 
 (@code{gnus-group-mark-region})$B!#(B
 
 @item M b
 @kindex M b (Group)
 @findex gnus-group-mark-buffer
-$B%P%C%U%!Fb$NA4$F$N%0%k!<%W$K0u$r$D$1$k(B
+$B%P%C%U%!Fb$NA4$F$N%0%k!<%W$K0u$r$D$1$k(B 
 (@code{gnus-group-mark-buffer})$B!#(B
 
 @item M r
 @kindex M r (Group)
 @findex gnus-group-mark-regexp
-$B$"$k@55,I=8=$K%^%C%A$9$kA4$F$N%0%k!<%W$K0u$r$D$1$k(B
+$B$"$k@55,I=8=$K9gCW$9$kA4$F$N%0%k!<%W$K0u$r$D$1$k(B 
 (@code{gnus-group-mark-regexp})$B!#(B
 @end table
 
-@pxref{Process/Prefix} $B$b;2>H$7$F$/$@$5$$!#(B
+@ref{Process/Prefix} $B$b;2>H$7$F$/$@$5$$!#(B
 
 @findex gnus-group-universal-argument
 $B%W%m%;%90u$,IU$1$i$l$F$$$kA4$F$N%0%k!<%W$KBP$7$F2?$+$NL?Na$r<B9T$7$?$$(B
@@ -1845,9 +1846,9 @@ Gnus $B$ODL>o!"(B@code{gnus-activate-level} $B$+$=$l$h$j>.$5$$%l%Y%k$N%0%k!<%
 @section $B30It%0%k!<%W(B
 @cindex foreign groups
 
-$B0J2<$G$O!"0lHLE*$J30It%0%k!<%W$N:n@.!"JQ99$r9T$&%0%k!<%W%b!<%I$NL?Na$r$$$/(B
-$B$D$+!"$*$h$SFCJL$JL\E*$N%0%k!<%W$N4JC1$K:n@.$9$kL?Na$r>R2p$7$^$9!#$3$l$i$N(B
-$BL?Na$OA4$F!"?75,$K:n@.$7$?%0%k!<%W$r%]%$%s%H0LCV$KA^F~$7$^$9!=!=(B
+$B0J2<$G$O!"0lHLE*$J30It%0%k!<%W$N:n@.!"JQ99$r9T$&%0%k!<%W%b!<%I$NL?Na$r$$(B
+$B$/$D$+!"$*$h$SFCJL$JL\E*$N%0%k!<%W$r4JC1$K:n@.$9$kL?Na$r>R2p$7$^$9!#$3$l(B
+$B$i$NL?Na$OA4$F!"?75,$K:n@.$7$?%0%k!<%W$r%]%$%s%H0LCV$KA^F~$7$^$9!=!=(B
 @code{gnus-subscribe-newsgroup-method} $B$O;2>H$5$l$^$;$s!#(B
 
 @table @kbd
@@ -1859,7 +1860,7 @@ Gnus $B$ODL>o!"(B@code{gnus-activate-level} $B$+$=$l$h$j>.$5$$%l%Y%k$N%0%k!<%
 $B?7$7$$%0%k!<%W$r:n@.$7$^$9(B (@code{gnus-group-make-group})$B!#(BGnus $B$O%W%m%s(B
 $B%W%H$rI=<($7$F!"L>A0$HJ}K!$H!">l9g$K$h$C$F$O(B @dfn{address} $B$NF~NO$r(B
 $B5a$a$F$-$^$9!#$h$j4JC1$K(B @sc{nntp} $B%0%k!<%W$r9XFI$9$kJ}K!$O!"(B 
-@pxref{Browse Foreign Server} $B$r;2>H$7$F$/$@$5$$!#(B
+@pxref{Browse Foreign Server}$B!#(B
 
 @item G r
 @kindex G r (Group)
@@ -1900,7 +1901,7 @@ Gnus $B$ODL>o!"(B@code{gnus-activate-level} $B$+$=$l$h$j>.$5$$%l%Y%k$N%0%k!<%
 @findex gnus-group-make-directory-group
 @cindex nndir
 $B%G%#%l%/%H%j%0%k!<%W$r:n@.$7$^$9(B (@pxref{Directory Groups})$B!#%G%#%l%/%H%j(B
-$BL>$r%W%m%s%W%HF~NO$7$^$9(B (@code{gnus-group-make-directory-group})$B!#(B
+$BL>$r%W%m%s%W%H$GF~NO$7$^$9(B (@code{gnus-group-make-directory-group})$B!#(B
 
 @item G h
 @kindex G h (Group)
@@ -1927,9 +1928,9 @@ Gnus $B%"!<%+%$%V%0%k!<%W$r:n@.$7$^$9(B
 @kindex G k (Group)
 @findex gnus-group-make-kiboze-group
 @cindex nnkiboze
-kiboze $B%0%k!<%W$r:n@.$7$^$9!#%W%m%s%W%H$GL>A0$H!"(Bkiboze $B%0%k!<%W$K!V4^$a$?(B
-$B$$!W%0%k!<%W$K%^%C%A$9$k@55,I=8=$H!"%X%C%@$H%^%C%A$9$kJ8;zNs$NAH$rF~NO$7(B
-$B$^$9(B (@code{gnus-group-make-kiboze-group})$B!#(B@xref{Kibozed Groups}$B!#(B
+kiboze $B%0%k!<%W$r:n@.$7$^$9!#%W%m%s%W%H$GL>A0$H!"(Bkiboze $B%0%k!<%W$K!V4^$a(B
+$B$?$$!W%0%k!<%W$K9g$&@55,I=8=$H!"%X%C%@!<$K9g$&J8;zNs$NAH$rF~NO$7$^$9(B 
+(@code{gnus-group-make-kiboze-group})$B!#(B@xref{Kibozed Groups}.
 
 @item G D
 @kindex G D (Group)
@@ -1945,13 +1946,13 @@ kiboze $B%0%k!<%W$r:n@.$7$^$9!#%W%m%s%W%H$GL>A0$H!"(Bkiboze $B%0%k!<%W$K!V4^$
 @cindex ClariNet Briefs
 @cindex nndoc
 $B%U%!%$%k$J$I$r$b$H$K%0%k!<%W$r:n@.$7$^$9(B
-(@code{gnus-group-make-doc-group})$B!#$3$N%3%^%s%I$K%W%l%U%#%C%/%9$rM?$($?>l(B
-$B9g!"%U%!%$%kL>$H%U%!%$%k%?%$%W$r%W%m%s%W%H$GF~NO$7$^$9!#8=:_%5%]!<%H$5$l$F(B
-$B$$$k%U%!%$%k%?%$%W$O!"(B@code{babyl}, @code{mbox}, @code{digest},
-@code{mmdf}, @code{news}, @code{rnews}, @code{clari-briefs},
-@code{rfc934}, @code{rfc822-forward}, @code{forward} $B$G$9!#%W%l%U%#%C%/%9(B
-$B$J$7$G$3$N%3%^%s%I$r<B9T$9$k$H!"(Bgnus $B$O%U%!%$%k%?%$%W$r?dB,$7$^$9!#(B
-@xref{Document Groups}$B!#(B
+(@code{gnus-group-make-doc-group})$B!#$3$N%3%^%s%I$K@\F,<-$rM?$($?>l9g!"%U%!(B
+$B%$%kL>$H%U%!%$%k%?%$%W$r%W%m%s%W%H$GF~NO$7$^$9!#8=:_%5%]!<%H$5$l$F$$$k%U%!(B
+$B%$%k%?%$%W$O!"(B@code{babyl}, @code{mbox}, @code{digest}, @code{mmdf},
+@code{news}, @code{rnews}, @code{clari-briefs}, @code{rfc934},
+@code{rfc822-forward}, @code{forward} $B$G$9!#@\F,<-$J$7$G$3$N%3%^(B
+$B%s%I$r<B9T$9$k$H!"(Bgnus $B$O%U%!%$%k%?%$%W$r?dB,$7$^$9!#(B@xref{Document
+Groups}$B!#(B
 
 @item G u
 @kindex G u (Group)
@@ -1968,22 +1969,22 @@ kiboze $B%0%k!<%W$r:n@.$7$^$9!#%W%m%s%W%H$GL>A0$H!"(Bkiboze $B%0%k!<%W$K!V4^$
 @cindex InReference
 @cindex nnweb
 $B%&%'%V8!:w7k2L$r$b$H$K0l;~E*$J%0%k!<%W$r:n@.$7$^$9(B
-(@code{gnus-group-make-web-group})$B!#$3$N%3%^%s%I$K%W%l%U%#%C%/%9$rM?$($k$H!"(B
+(@code{gnus-group-make-web-group})$B!#$3$N%3%^%s%I$K@\F,<-$rM?$($k$H!"(B
 $B0l;~E*$G$O$J$/8GDj$7$?%0%k!<%W$r:n@.$7$^$9!#%W%m%s%W%H$G8!:w5!4X$N<oN`(B 
 (search engine type) $B$H8!:wJ8;zNs$rF~NO$7$^$9!#M-8z$J8!:w5!4X$N<oN`$K$O(B
 @code{dejanews}, @code{altavista}, @code{reference} $B$,$"$j$^$9!#(B
 @xref{Web Searches}.
 
 $B$b$7!"(B@code{dejanews} $B8!:w5!4X$rMQ$$$k>l9g$K$O!"(B@samp{~g
-alt.sysadmin.recovery shaving} $B$N$h$&$J%^%C%A$9$kJ8;zNs$rMQ$$$k$3$H$K$h$C(B
+alt.sysadmin.recovery shaving} $B$N$h$&$J9gCW$9$kJ8;zNs$rMQ$$$k$3$H$K$h$C(B
 $B$F!"8!:wBP>]$rFCDj$N%0%k!<%W$K8BDj$9$k$3$H$,2DG=$G$9!#(B
 
 @item G DEL
 @kindex G DEL (Group)
 @findex gnus-group-delete-group
-$B$3$N4X?t$O8=:_$N%0%k!<%W$r:o=|$7$^$9(B (@code{gnus-group-delete-group})$B!#%W(B
-$B%l%U%#%C%/%9$,M?$($i$l$k$H!"$3$N4X?t$O$=$N%0%k!<%WFb$NA45-;v$rK\Ev$K:o=|$7!"(B
-$B%0%k!<%W<+?H$r$3$N@$$+$i6/@)E*$KKu;&$7$F$7$^$$$^$9!#%W%l%U%#%C%/%9$O!"$"$J(B
+$B$3$N4X?t$O8=:_$N%0%k!<%W$r:o=|$7$^$9(B (@code{gnus-group-delete-group})$B!#(B
+$B@\F,<-$,M?$($i$l$k$H!"$3$N4X?t$O$=$N%0%k!<%WFb$NA45-;v$rK\Ev$K:o=|$7!"(B
+$B%0%k!<%W<+?H$r$3$N@$$+$i6/@)E*$KKu;&$7$F$7$^$$$^$9!#@\F,<-$O!"$"$J(B
 $B$?$,2?$r$d$m$&$H$7$F$$$k$+!"K\Ev$K<+?.$,$"$k$H$-$K$N$_;H$C$F$/$@$5$$!#$^$"!"(B
 $B$3$N%3%^%s%I$O!J(B@code{nntp} $B%0%k!<%W$N$h$&$J!KFI$_=P$7@lMQ%0%k!<%W$K$O;H$((B
 $B$^$;$s$1$I!#(B
@@ -2019,7 +2020,7 @@ alt.sysadmin.recovery shaving} $B$N$h$&$J%^%C%A$9$kJ8;zNs$rMQ$$$k$3$H$K$h$C(B
 @section $B%0%k!<%W%Q%i%a!<%?(B
 @cindex group parameters
 
-$B%0%k!<%W%Q%i%a!<%?$O!"$"$kFCDj$N%0%k!<%W%m!<%+%k$J>pJs$r3JG<$7$^$9!#0J2<$O(B
+$B%0%k!<%W%Q%i%a!<%?$O!"$"$kFCDj$N%0%k!<%W$K8GM-$J>pJs$r3JG<$7$^$9!#0J2<$O(B
 $B%0%k!<%W%Q%i%a!<%?%j%9%H$NNc$G$9!'(B
 
 @example
@@ -2042,11 +2043,11 @@ alt.sysadmin.recovery shaving} $B$N$h$&$J%^%C%A$9$kJ8;zNs$rMQ$$$k$3$H$K$h$C(B
 (to-address .  "some@@where.com")
 @end example
 
-$B$3$l$O<g$K!"%/%m!<%:%I$J%a!<%j%s%0%j%9%H$rI=$o$9%a!<%k%0%k!<%W$K$*$$$FJXMx(B
-$B$J$b$N$G$9!=!=$9$J$o$A%a!<%j%s%0%j%9%H$KEj9F$9$k?M$OA4$F$=$l$r9XFI$7$F$$$k(B
-$B$O$:!"$H$$$&%a!<%j%s%0%j%9%H$N$3$H$G$9!#$3$N%Q%i%a!<%?$r;HMQ$9$k$H!"%a!<%k(B
-$B$O$=$N%a!<%j%s%0%j%9%H$K$7$+Ej9F$5$l$J$$$3$H$,J]>Z$5$l$k$N$G!";22C<T$O$"$J(B
-$B$?$N%U%)%m!<%"%C%W5-;v$r(B2$BDL<u$1<h$k$3$H$O$"$j$^$;$s!#(B
+$B$3$l$O<g$K!"JD$8$?%a!<%j%s%0%j%9%H$rI=$o$9%a!<%k%0%k!<%W$K$*$$$FJXMx$J$b(B
+$B$N$G$9!=!=$9$J$o$A%a!<%j%s%0%j%9%H$KEj9F$9$k?M$OA4$F$=$l$r9XFI$7$F$$$k$O(B
+$B$:!"$H$$$&%a!<%j%s%0%j%9%H$N$3$H$G$9!#$3$N%Q%i%a!<%?$r;HMQ$9$k$H!"%a!<%k(B
+$B$O$=$N%a!<%j%s%0%j%9%H$K$7$+Ej9F$5$l$J$$$3$H$,J]>Z$5$l$k$N$G!";22C<T$O$"(B
+$B$J$?$N%U%)%m!<%"%C%W5-;v$r(B2$BDL<u$1<h$k$3$H$O$"$j$^$;$s!#(B
 
 @code{to-address} $B$r;XDj$9$k$H!"$=$N%0%k!<%W$,30It%0%k!<%W$G$"$k$+$I$&$+(B
 $B$K4X$o$i$:M-8z$K$J$j$^$9!#Nc$($P(B @samp{fa.4ad-l} $B$H$$$&%0%k!<%W$,%5!<%P(B
@@ -2098,9 +2099,9 @@ alt.sysadmin.recovery shaving} $B$N$h$&$J%^%C%A$9$kJ8;zNs$rMQ$$$k$3$H$K$h$C(B
 
 @item newsgroup
 @cindex newsgroup
-$B%0%k!<%W%Q%i%a!<%?%j%9%H$K(B @code{(newsgroup . t)} $B$,$"$l$P!"(Bgnus $B$OA4$F$N(B
-$B%l%9%]%s%9$r%K%e!<%95-;v$KBP$9$k%l%9%]%s%9$G$"$k$+$N$h$&$K07$$$^$9!#$3$l$O(B
-$B<B:]$K$O%K%e!<%9%0%k!<%W$N%_%i!<$G$"$k%a!<%k%0%k!<%W$KBP$7$FM-8z$G$9!#(B
+$B%0%k!<%W%Q%i%a!<%?%j%9%H$K(B @code{(newsgroup . t)} $B$,$"$l$P!"(Bgnus $B$OA4$F(B
+$B$N1~Ez$r%K%e!<%95-;v$KBP$9$k1~Ez$G$"$k$+$N$h$&$K07$$$^$9!#$3$l$O<B:]$K$O(B
+$B%K%e!<%9%0%k!<%W$N%_%i!<$G$"$k%a!<%k%0%k!<%W$KBP$7$FM-8z$G$9!#(B
 
 @item gcc-self
 @cindex gcc-self
@@ -2114,35 +2115,35 @@ alt.sysadmin.recovery shaving} $B$N$h$&$J%^%C%A$9$kJ8;zNs$rMQ$$$k$3$H$K$h$C(B
 @item auto-expire
 @cindex auto-expire
 $B%0%k!<%W%Q%i%a!<%?$K(B @code{(auto-expire . t)} $B$N$h$&$JMWAG$,$"$l$P!"A4$F(B
-$B$N4{FI5-;v$O%(%/%9%Q%$%"$5$l$k$h$&$K%^!<%/$5$l$^$9!#B>$NJ}K!$K$D$$$F$O(B
-@pxref{Expiring Mail} $B$r;2>H$7$F$/$@$5$$!#(B
+$B$N4{FI5-;v$O;~8B>C5n$5$l$k$h$&$K0u$rIU$1$i$l$^$9!#B>$NJ}K!$O!"(B
+@pxref{Expiring Mail}$B!#(B
 
 @item total-expire
 @cindex total-expire
 $B%0%k!<%W%Q%i%a!<%?$K(B @code{(total-expire . t)} $B$N$h$&$JMWAG$,$"$l$P!"4{(B
-$BFI5-;v$O!"%(%/%9%Q%$%"$N%^!<%/$,$D$$$F$$$J$/$H$bA4$F%(%/%9%Q%$%"=hM}$r;\(B
-$B$5$l$^$9!#Cm0U$7$F;HMQ$7$F$/$@$5$$!#L$FI5-;v!"0uIU$-5-;v!"J]N15-;v$O%(%/(B
-$B%9%Q%$%"$5$l$^$;$s!#(B
+$BFI5-;v$O!";~8B>C5n$N0u$,$D$$$F$$$J$/$H$bA4$F;~8B>C5n=hM}$r;\$5$l$^$9!#Cm(B
+$B0U$7$F;HMQ$7$F$/$@$5$$!#L$FI5-;v!"0uIU$-5-;v!"J]N15-;v$O;~8B>C5n$5$l$^$;(B
+$B$s!#(B
 
 @item expiry-wait
 @cindex expiry-wait
 @vindex nnmail-expiry-wait-function
-$B%0%k!<%W%Q%i%a!<%?$K(B @code{(expiry-wait . 10)} $B$N$h$&$JMWAG$,$"$l$P!"$3$N(B
-$BCM$O5-;v$r%(%/%9%Q%$%"$9$k$H$-$K(B @code{nnmail-expiry-wait} $B$H(B
-@code{nnmail-expiry-wait-function} $B$N@_Dj$h$j$bM%@h$5$l$^$9!#$3$NCM$O%(%/(B
-$B%9%Q%$%"$NF|?t!J@0?t$G$"$kI,MW$O$J$$!K$+$b$7$/$O(B @code{never} $B$+(B
+$B%0%k!<%W%Q%i%a!<%?$K(B @code{(expiry-wait . 10)} $B$N$h$&$JMWAG$,$"$l$P!"$3(B
+$B$NCM$O5-;v$r;~8B>C5n$9$k$H$-$K(B @code{nnmail-expiry-wait} $B$H(B 
+@code{nnmail-expiry-wait-function} $B$N@_Dj$h$j$bM%@h$5$l$^$9!#$3$NCM$O;~(B
+$B8B>C5n$NF|?t!J@0?t$G$"$kI,MW$O$J$$!K$+$b$7$/$O(B @code{never} $B$+(B 
 @code{immediate} $B$N%7%s%\%k$r;XDj$G$-$^$9!#(B
 
 @item score-file
 @cindex score file group parameter
-@code{(score-file . "file")} $B$N$h$&$JMWAG$O!"(B@file{file} $B$r8=:_$N%0%k!<%W(B
-$B$KE,MQ$5$l$k%9%3%"%U%!%$%k$K$7$^$9!#E,MQ$5$l$k%9%3%"%(%s%H%j$OA4$F$3$N%U%!(B
+@code{(score-file . "file")} $B$N$h$&$JMWAG$O!"(B@file{file} $B$r8=:_$N%0%k!<(B
+$B%W$KE,MQ$5$l$k%9%3%"%U%!%$%k$K$7$^$9!#E,MQ$5$l$k%9%3%"EPO?$OA4$F$3$N%U%!(B
 $B%$%k$KF~$j$^$9!#(B
 
 @item adapt-file
 @cindex adapt file group parameter
 @code{(adapt-file . "file")} $B$N$h$&$JMWAG$O!"(B@file{file} $B$r8=:_$N%0%k!<%W(B
-$B$NE,MQ%U%!%$%k$K$7$^$9!#A4$F$NE,MQ%9%3%"%(%s%H%j$O$3$N%U%!%$%k$KF~$j$^$9!#(B
+$B$NE,1~%U%!%$%k$K$7$^$9!#A4$F$NE,1~%9%3%"EPO?$O$3$N%U%!%$%k$KF~$j$^$9!#(B
 
 @item admin-address
 $B%a!<%j%s%0%j%9%H$+$iC&2q$9$k$H$-$O!"C&2qDLCN%a!<%k$r$=$N%a!<%j%s%0%j%9%H(B
@@ -2200,7 +2201,7 @@ alt.sysadmin.recovery shaving} $B$N$h$&$J%^%C%A$9$kJ8;zNs$rMQ$$$k$3$H$K$h$C(B
 @kindex l (Group)
 @findex gnus-group-list-groups
 $BL$FI5-;v$r;}$DA4$F$N%0%k!<%W$rI=<($7$^$9(B (@code{gnus-group-list-groups})$B!#(B
-$B?t;z%W%l%U%#%C%/%9$r;H$&$H!"$3$N%3%^%s%I$O0z?t$N?t$+$=$l$h$j$b>.$5$$%l%Y%k(B
+$B?t;z@\F,0z?t$r;H$&$H!"$3$N%3%^%s%I$O0z?t$N?t$+$=$l$h$j$b>.$5$$%l%Y%k(B
 $B$N%0%k!<%W$N$_$rI=<($7$^$9!#=i4|@_Dj$G$O!"$3$l$O%l%Y%k(B 5$B!J$D$^$j(B
 @code{gnus-group-default-list-level}$B!K$+$=$l$h$j>.$5$$%l%Y%k!J$9$J$o$A9XFI(B
 $B$7$F$$$k%0%k!<%W$N$_!K$rI=<($7$^$9!#(B
@@ -2211,7 +2212,7 @@ alt.sysadmin.recovery shaving} $B$N$h$&$J%^%C%A$9$kJ8;zNs$rMQ$$$k$3$H$K$h$C(B
 @kindex L (Group)
 @findex gnus-group-list-all-groups
 $BL$FI5-;v$N$"$k$J$7$K4X$o$i$:!"A4$F$N%0%k!<%W$rI=<($7$^$9(B 
-(@code{gnus-group-list-all-groups})$B!#?t;z%W%l%U%#%C%/%9$r;HMQ$9$k$H!"$3(B
+(@code{gnus-group-list-all-groups})$B!#?t;z@\F,0z?t$r;HMQ$9$k$H!"$3(B
 $B$N%3%^%s%I$O0z?t$N?t$+$=$l$h$j$b>.$5$$%l%Y%k$N%0%k!<%W$N$_$rI=<($7$^$9!#(B
 $B=i4|@_Dj$G$O(B 7 $B$+$=$l$h$j$b>.$5$$%l%Y%k$N%0%k!<%W!J$9$J$o$A9XFI!"Hs9XFI(B
 $B$N%0%k!<%W$N$_!K$,I=<($5$l$^$9!#(B
@@ -2220,14 +2221,14 @@ alt.sysadmin.recovery shaving} $B$N$h$&$J%^%C%A$9$kJ8;zNs$rMQ$$$k$3$H$K$h$C(B
 @kindex A l (Group)
 @findex gnus-group-list-level
 $B$"$kFCDj$N%l%Y%k$NL$FI5-;v$N$"$k%0%k!<%W$rI=<($7$^$9(B 
-(@code{gnus-group-list-level})$B!#%W%l%U%#%C%/%9$rM?$($k$H!"L$FI5-;v$N$J$$(B
+(@code{gnus-group-list-level})$B!#@\F,<-$rM?$($k$H!"L$FI5-;v$N$J$$(B
 $B%0%k!<%W$b4^$a$FI=<($7$^$9!#(B
 
 @item A k
 @kindex A k (Group)
 @findex gnus-group-list-killed
-kill $B$5$l$?%0%k!<%W$rA4$FI=<($7$^$9(B (@code{gnus-group-list-killed})$B!#%W(B
-$B%l%U%#%C%/%90z?t$rM?$($k$H!"8=:_9XFI!"Hs9XFI$H$J$C$F$$$J$$A4$F$NMxMQ2DG=(B
+kill $B$5$l$?%0%k!<%W$rA4$FI=<($7$^$9(B (@code{gnus-group-list-killed})$B!#@\(B
+$BF,0z?t$rM?$($k$H!"8=:_9XFI!"Hs9XFI$H$J$C$F$$$J$$A4$F$NMxMQ2DG=(B
 $B$J%0%k!<%W$rI=<($7$^$9!#$3$l$O%5!<%P$+$i%"%/%F%#%V%U%!%$%k$rFI$`$3$H$K$J(B
 $B$k$G$7$g$&!#(B
 
@@ -2239,13 +2240,13 @@ kill $B$5$l$?%0%k!<%W$rA4$FI=<($7$^$9(B (@code{gnus-group-list-killed})$B!#%W
 @item A m
 @kindex A m (Group)
 @findex gnus-group-list-matching
-$B@55,I=8=$K%^%C%A$9$kL>A0$r;}$D%0%k!<%W$G!"L$FI5-;v$N$"$k9XFI%0%k!<%W$rA4(B
+$B@55,I=8=$K9gCW$9$kL>A0$r;}$D%0%k!<%W$G!"L$FI5-;v$N$"$k9XFI%0%k!<%W$rA4(B
 $B$FI=<($7$^$9(B (@code{gnus-group-list-matching})$B!#(B
 
 @item A M
 @kindex A M (Group)
 @findex gnus-group-list-all-matching
-$B@55,I=8=$K%^%C%A$9$k%0%k!<%W$rI=<($9$k(B
+$B@55,I=8=$K9gCW$9$k%0%k!<%W$rI=<($9$k(B
 (@code{gnus-group-list-all-matching})$B!#(B
 
 @item A A
@@ -2253,28 +2254,28 @@ kill $B$5$l$?%0%k!<%W$rA4$FI=<($7$^$9(B (@code{gnus-group-list-killed})$B!#%W
 @findex gnus-group-list-active
 $B:#@\B3$7$F$$$k%5!<%P$N%"%/%F%#%V%U%!%$%k$K$"$k%0%k!<%W$r!"K\Ev$KA4ItI=<($7(B
 $B$^$9(B (@code{gnus-group-list-active})$B!#$3$l$O$7$P$i$/;~4V$,$+$+$k$3$H$bM-$j(B
-$BF@$^$9!#$?$V$s(B @kbd{A M} $B$r<B9T$7$F!"%^%C%A$5$;$?$$ItJ,$r(B @samp{.} $B$H$7$F(B
-$BA4$F$N%^%C%A$9$k%j%9%H$rI=<($5$;$?J}$,NI$$$G$7$g$&!#$^$?!"$3$N%3%^%s%I$O(B
+$BF@$^$9!#$?$V$s(B @kbd{A M} $B$r<B9T$7$F!"9gCW$5$;$?$$ItJ,$r(B @samp{.} $B$H$7$F(B
+$BA4$F$N9gCW$9$k%j%9%H$rI=<($5$;$?J}$,NI$$$G$7$g$&!#$^$?!"$3$N%3%^%s%I$O(B
 $B!J$^$@!KB8:_$7$J$$%0%k!<%W$bI=<($9$k$+$bCN$l$^$;$s!=!=$3$l$O(B kill $B$5$l$?%0(B
 $B%k!<%W$G$"$k$+$N$h$&$KI=<($5$l$^$9!#=PNO$OB?>/3d$j0z$$$F<u$1<h$C$F$M!#(B
 
 @item A a
 @kindex A a (Group)
 @findex gnus-group-apropos
-$B@55,I=8=$K%^%C%A$9$kL>A0$r;}$D%0%k!<%W$rA4$FI=<($9$k(B
+$B@55,I=8=$K9gCW$9$kL>A0$r;}$D%0%k!<%W$rA4$FI=<($9$k(B
 (@code{gnus-group-apropos})$B!#(B
 
 @item A d
 @kindex A d (Group)
 @findex gnus-group-description-apropos
-$B@55,I=8=$K%^%C%A$9$kL>A0$+@bL@J8$r;}$D%0%k!<%W$rA4$FI=<($9$k(B
+$B@55,I=8=$K9gCW$9$kL>A0$+@bL@J8$r;}$D%0%k!<%W$rA4$FI=<($9$k(B
 (@code{gnus-group-description-apropos})$B!#(B
 
 @end table
 
 @vindex gnus-permanently-visible-groups
 @cindex visible group parameter
-@code{gnus-permanently-visible-groups} $B@55,I=8=$K%^%C%A$9$k%0%k!<%W$O!"(B
+@code{gnus-permanently-visible-groups} $B@55,I=8=$K9gCW$9$k%0%k!<%W$O!"(B
 $BL$FI5-;v$,$"$k$+$J$$$+$K4X$o$i$:>o$KI=<($5$l$^$9!#$"$k$$$O%0%k!<%W%Q%i%a!<(B
 $B%?$K$*$$$F(B @code{visible} $BMWAG$rDI2C$9$k$3$H$G$bF1MM$N8z2L$rF@$k$3$H$,$G(B
 $B$-$^$9!#(B
@@ -2377,7 +2378,7 @@ kill $B$5$l$?%0%k!<%W$rA4$FI=<($7$^$9(B (@code{gnus-group-list-killed})$B!#%W
 
 @end table
 
-$B%W%l%U%#%C%/%9$rM?$($?$H$-$O!"$3$l$i$NL?Na$OA4$F5U=g$KJB$YBX$($^$9!#(B
+$B@\F,<-$rM?$($?$H$-$O!"$3$l$i$NL?Na$OA4$F5U=g$KJB$YBX$($^$9!#(B
 
 $B$^$?!"%0%k!<%W$N0lIt$rJB$YBX$($k$3$H$b$G$-$^$9!#(B
 
@@ -8278,7 +8279,7 @@ Gnus $B$O30$X=P$F9T$/A4$F$N%a%C%;!<%8$K!"0l$D$+$=$l0J>e$N$=$N%5!<%P!<$N%0%k!<(
 $B$G$J$$CM$r5"$;$P!"MM<0$O(B @code{$B9gCW$7$?(B} $B$H8@$$$^$9!#(B
 
 $B$=$l$>$l$NMM<0$OG$0U$NNL$N(B @dfn{$BB0@-(B} $B$r;}$D;v$,$G$-$^$9!#$=$l$>$l$NB0@-(B
-$B$O(B @var{(name . value)} $B$NBP$K$h$j@.$jN)$C$F$$$^$9!#B0@-L>$O!"(B
+$B$O(B @var{(name value)} $B$NBP$K$h$j@.$jN)$C$F$$$^$9!#B0@-L>$O!"(B
 @code{signature}, @code{signature-file}, @code{organization},
 @code{address}, @code{name}, @code{body} $B$N$I$l$+$G$"$k;v$,$G$-$^$9!#B0(B
 $B@-L>$OJ8;zNs$G$"$k;v$b$G$-$^$9!#$=$N>l9g$O!"$3$l$O%X%C%@!<L>$H$7$F;H$o$l!"(B
@@ -9745,7 +9746,7 @@ Gnus $B$KK>$^$7$/$J$$%a!<%k$r:o=|$5$;$k$?$a$K$O!"5-;v$r(B @dfn{$B4|8B@Z$l>C5n
 $B$G$"$k$H(B ``$B$7$J$$(B'' $B$J$i!"(Bgnus $B$O(B ``$B7h$7$F(B'' $B$=$l$i$N(B ``$B5-;v(B'' $B$r>C5n$7(B
 $B$^$;$s!#(B
 
-@vindex gnus-auto-expirable-newgroups
+@vindex gnus-auto-expirable-newsgroups
 $B<j$G5-;v$K4|8B@Z$l>C5n2DG=$N0u$rIU$1$J$1$l$P$J$i$J$$$o$G$G$O$"$j$^$;$s!#(B
 $B@55,I=8=(B @code{gnus-auto-expirable-newsgroups} $B$K9gCW$9$k%0%k!<%W$OA4$F(B
 $B$N4{FI5-;v$K<+F0E*$K4|8B@Z$l>C5n2DG=$N0u$,IU$1$i$l$^$9!#A4$F$N4|8B@Z$l>C(B
@@ -9772,7 +9773,7 @@ Gnus $B$KK>$^$7$/$J$$%a!<%k$r:o=|$5$;$k$?$a$K$O!"5-;v$r(B @dfn{$B4|8B@Z$l>C5n
 $B2DG=$K$7$^$9!#(B
 
 @lisp
-(setq gnus-auto-expirable-newgroups
+(setq gnus-auto-expirable-newsgroups
       "mail.nosense-list\\|mail.nice-list")
 @end lisp
 
@@ -11642,15 +11643,15 @@ $ emacs -batch -l ~/.gnus.el -f gnus-agent-batch-fetch
 @node Agent Expiry
 @subsection $B%(!<%8%'%s%H4|8B@Z$l>C5n(B
 
-@vindex gnus-agent-expiry-days
-@findex gnus-agent-expiry
-@kindex M-x gnus-agent-expiry
-@cindex Agent expiry
-@cindex Gnus Agent expiry
+@vindex gnus-agent-expire-days
+@findex gnus-agent-expire
+@kindex M-x gnus-agent-expire
+@cindex Agent expire
+@cindex Gnus Agent expire
 @cindex expiry
 
 @code{nnagent} $B$O4|8B@Z$l>C5n$r07$$$^$;$s!#$=$NBe$o$j$K!"FCJL$J(B
-@code{gnus-agent-expiry} $BL?Na$,(B @code{gnus-agent-expiry-days} $BF|(B
+@code{gnus-agent-expire} $BL?Na$,(B @code{gnus-agent-expire-days} $BF|(B
 $B$h$j$b8E$$4{FI5-;v$rA4$F>C5n$7$^$9!#$3$l$O$"$J$?$,%G%#%9%/MFNL$r(B
 $B;H$$@Z$j$=$&$@$H;W$C$?$H$-$K$$$D$G$b<B9T$9$k$3$H$,$G$-$^$9!#$3$l(B
 $B$OFC$KB.$/$b$J$/8zN(E*$G$b$J$/!"0lC6;O$a$F$7$^$C$?$i(B (@kbd{C-g}
diff --git a/texi/gnus.texi b/texi/gnus.texi
index 11ee55a..5b74f3f 100644
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -8396,7 +8396,7 @@ any case, if this returns a non-@code{nil} value, then the style is said
 to @dfn{match}.
 
 Each style may contain a arbitrary amount of @dfn{attributes}.  Each
-attribute consists of a @var{(name . value)} pair.  The attribute name
+attribute consists of a @var{(name value)} pair.  The attribute name
 can be one of @code{signature}, @code{signature-file},
 @code{organization}, @code{address}, @code{name} or @code{body}.  The
 attribute name can also be a string.  In that case, this will be used as