From: yamaoka <yamaoka>
Date: Mon, 26 Feb 2001 00:50:33 +0000 (+0000)
Subject: Synch with Oort Gnus.
X-Git-Tag: t-gnus-6_15_0-09-quimby~12
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e5e2ba3b220fcc4e669158f75a649ede5d17228;p=elisp%2Fgnus.git-

Synch with Oort Gnus.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index eb40e35..3a67b9c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,8 +1,56 @@
+2001-02-25 10:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+	From NAGY Andras <nagya@inf.elte.hu>.
+
+	* gnus.el (gnus-parameters): Typo.
+
+2001-02-24 00:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+	* gnus.el (gnus-read-method): Remove redundancy.
+
+2001-02-23 23:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+	* nnslashdot.el (nnslashdot-backslash-url): New.
+	(nnslashdot-request-list): Use it.
+
+2001-02-23 22:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+	* nnml.el (nnml-generate-active-info): Fix the case when there is
+	no file.
+
+	* gnus-sum.el (gnus-summary-import-article): Display it. Enable edit. 
+	(gnus-summary-create-article): New.
+
+	* gnus-group.el (gnus-group-mark-article-read): New.
+
+	* gnus-msg.el (gnus-inews-do-gcc): Use it.
+
+	* gnus-art.el (gnus-article-edit-article): Set modified-p nil.
+
+2001-02-23 17:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+	* gnus-art.el (gnus-article-edit-done): Don't use
+	gnus-article-edit-exit.
+	(gnus-article-edit-exit): Confirm and insert original-article-buffer.
+
+	* gnus.el (gnus-parameters): New. 
+	Suggested by NAGY Andras <nagya@inf.elte.hu>.
+	(gnus-parameters-get-parameter): New.
+	(gnus-group-find-parameter): Use it.
+
+2001-02-23  Simon Josefsson  <simon@josefsson.org>
+
+	* gnus-msg.el (gnus-post-method): Fix documentation to reflect
+	change of default value to `current'.
+
+2001-02-23 08:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+	* nneething.el (nneething-get-head): Insert unreadable file too.
+
 2001-02-22 23:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
 	* gnus-sum.el (gnus-summary-insert-articles): Remove fetched headers.
 
-	* webmail.el (webmail-type-definition): Deja is brought by google.
+	* webmail.el (webmail-type-definition): Deja is bought by google.
 
 2001-02-22 22:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index e77d3cd..724a92b 100644
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -4970,6 +4970,7 @@ groups."
     (set-buffer gnus-article-buffer)
     (gnus-article-edit-mode)
     (funcall start-func)
+    (set-buffer-modified-p nil)
     (gnus-configure-windows 'edit-article)
     (setq gnus-article-edit-done-function exit-func)
     (setq gnus-prev-winconf winconf)
@@ -4985,7 +4986,20 @@ groups."
 	(start (window-start)))
     (remove-hook 'gnus-article-mode-hook
 		 'gnus-article-mime-edit-article-unwind)
-    (gnus-article-edit-exit)
+    ;; We remove all text props from the article buffer.
+    (let ((content
+	   (buffer-substring-no-properties (point-min) (point-max)))
+	  (p (point)))
+      (erase-buffer)
+      (insert content)
+      (let ((winconf gnus-prev-winconf))
+	(gnus-article-mode)
+	(set-window-configuration winconf)
+	;; Tippy-toe some to make sure that point remains where it was.
+	(save-current-buffer
+	  (set-buffer buf)
+	  (set-window-start (get-buffer-window (current-buffer)) start)
+	  (goto-char p))))
     (save-excursion
       (set-buffer buf)
       (let ((buffer-read-only nil))
@@ -5009,21 +5023,22 @@ groups."
 (defun gnus-article-edit-exit ()
   "Exit the article editing without updating."
   (interactive)
-  ;; We remove all text props from the article buffer.
-  (let ((buf (buffer-substring-no-properties (point-min) (point-max)))
-	(curbuf (current-buffer))
-	(p (point))
-	(window-start (window-start)))
-    (erase-buffer)
-    (insert buf)
-    (let ((winconf gnus-prev-winconf))
-      (gnus-article-mode)
-      (set-window-configuration winconf)
-      ;; Tippy-toe some to make sure that point remains where it was.
-      (save-current-buffer
-	(set-buffer curbuf)
-	(set-window-start (get-buffer-window (current-buffer)) window-start)
-	(goto-char p)))))
+  (when (or (not (buffer-modified-p))
+	    (yes-or-no-p "Article modified; kill anyway? "))
+    (let ((curbuf (current-buffer))
+	  (p (point))
+	  (window-start (window-start)))
+      (erase-buffer)
+      (if (gnus-buffer-live-p gnus-original-article-buffer)
+	  (insert-buffer gnus-original-article-buffer))
+      (let ((winconf gnus-prev-winconf))
+	(gnus-article-mode)
+	(set-window-configuration winconf)
+	;; Tippy-toe some to make sure that point remains where it was.
+	(save-current-buffer
+	  (set-buffer curbuf)
+	  (set-window-start (get-buffer-window (current-buffer)) window-start)
+	  (goto-char p))))))
 
 (defun gnus-article-edit-full-stops ()
   "Interactively repair spacing at end of sentences."
@@ -5051,7 +5066,7 @@ groups."
     (message ""))
   (when (featurep 'font-lock)
     (setq font-lock-defaults nil)
-    (font-lock-mode 0)))
+    (font-lock-mode -1)))
 
 (defun gnus-article-mime-edit-article-setup ()
   "Convert current buffer to MIME-Edit buffer and turn on MIME-Edit mode
@@ -5070,7 +5085,7 @@ after replacing with the original article."
 	       (replace-match "")))
 	   (when (featurep 'font-lock)
 	     (setq font-lock-defaults nil)
-	     (font-lock-mode 0))
+	     (font-lock-mode -1))
 	   (apply ,gnus-article-edit-done-function args)
 	   (set-buffer gnus-original-article-buffer)
 	   (erase-buffer)
@@ -5106,7 +5121,7 @@ after replacing with the original article."
 	(replace-match "")))
     (when (featurep 'font-lock)
       (setq font-lock-defaults nil)
-      (font-lock-mode 0))
+      (font-lock-mode -1))
     ;; We remove all text props from the article buffer.
     (setq buf (buffer-substring-no-properties (point-min) (point-max)))
     (set-buffer (get-buffer-create gnus-original-article-buffer))
diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index 2bebb8a..ef7a37e 100644
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -3972,6 +3972,30 @@ This command may read the active file."
   (let ((gnus-group-list-option 'limit))
     (gnus-group-list-plus args)))
 
+(defun gnus-group-mark-article-read (group article)
+  "Mark ARTICLE read." 
+  (gnus-activate-group group)
+  (let ((buffer (gnus-summary-buffer-name group))
+	(mark gnus-read-mark))
+    (unless
+	(and
+	 (get-buffer buffer)
+	 (with-current-buffer buffer
+	   (when gnus-newsgroup-prepared
+	     (when (and gnus-newsgroup-auto-expire
+			(memq mark gnus-auto-expirable-marks))
+	       (setq mark gnus-expirable-mark))
+	     (setq mark (gnus-request-update-mark
+			 group article mark))
+	     (gnus-mark-article-as-read article mark)
+	     (setq gnus-newsgroup-active (gnus-active group))
+	     t)))
+      (gnus-group-make-articles-read group
+				     (list article))
+      (when (gnus-group-auto-expirable-p group)
+	(gnus-add-marked-articles
+	 group 'expire (list article))))))
+
 (provide 'gnus-group)
 
 ;;; gnus-group.el ends here
diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el
index f66f7df..22a3631 100644
--- a/lisp/gnus-msg.el
+++ b/lisp/gnus-msg.el
@@ -42,8 +42,8 @@
 (defcustom gnus-post-method 'current
   "*Preferred method for posting USENET news.
 
-If this variable is `current', Gnus will use the \"current\" select
-method when posting.  If it is nil (which is the default), Gnus will
+If this variable is `current' (which is the default), Gnus will use
+the \"current\" select method when posting.  If it is nil, Gnus will
 use the native select method when posting.
 
 This method will not be used in mail groups and the like, only in
@@ -1238,28 +1238,7 @@ this is a reply."
 				group (gnus-status-message method))
 		  (sit-for 2))
 		(when (and group-art gnus-inews-mark-gcc-as-read)
-		  (gnus-activate-group group)
-		  (let ((buffer (gnus-summary-buffer-name group))
-			(mark gnus-read-mark)
-			(article (cdr group-art)))
-		    (unless
-			(and
-			 (get-buffer buffer)
-			 (with-current-buffer buffer
-			   (when gnus-newsgroup-prepared
-			     (when (and gnus-newsgroup-auto-expire
-					(memq mark gnus-auto-expirable-marks))
-			       (setq mark gnus-expirable-mark))
-			     (setq mark (gnus-request-update-mark
-					 group article mark))
-			     (gnus-mark-article-as-read article mark)
-			     (setq gnus-newsgroup-active (gnus-active group))
-			     t)))
-		      (gnus-group-make-articles-read group
-						     (list article))
-		      (when (gnus-group-auto-expirable-p group)
-			(gnus-add-marked-articles
-			 group 'expire (list article))))))
+		  (gnus-group-mark-article-read group (cdr group-art)))
 		(kill-buffer (current-buffer))))))))))
 
 (defun gnus-inews-insert-gcc ()
diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 8d768c1..06cde23 100644
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -1741,6 +1741,7 @@ increase the score of each group you read."
     "q" gnus-summary-respool-query
     "t" gnus-summary-respool-trace
     "i" gnus-summary-import-article
+    "I" gnus-summary-create-article
     "p" gnus-summary-article-posted-p)
 
   (gnus-define-keys (gnus-summary-save-map "O" gnus-summary-mode-map)
@@ -1880,6 +1881,7 @@ increase the score of each group you read."
                (gnus-check-backend-function
                 'request-replace-article gnus-newsgroup-name)]
               ["Import file..." gnus-summary-import-article t]
+              ["Create article..." gnus-summary-create-article t]
               ["Check if posted" gnus-summary-article-posted-p t]
               ["Edit article" gnus-summary-edit-article
                (not (gnus-group-read-only-p))]
@@ -8117,12 +8119,12 @@ latter case, they will be copied into the relevant groups."
       (gnus-summary-move-article n nil method)
     (gnus-summary-copy-article n nil method)))
 
-(defun gnus-summary-import-article (file)
+(defun gnus-summary-import-article (file &optional edit)
   "Import an arbitrary file into a mail newsgroup."
-  (interactive "fImport file: ")
+  (interactive "fImport file: \nP")
   (let ((group gnus-newsgroup-name)
 	(now (current-time))
-	atts lines)
+	atts lines group-art)
     (unless (gnus-check-backend-function 'request-accept-article group)
       (error "%s does not support article importing" group))
     (or (file-readable-p file)
@@ -8139,13 +8141,41 @@ latter case, they will be copied into the relevant groups."
 	      lines (count-lines (point-min) (point-max)))
 	(insert "From: " (read-string "From: ") "\n"
 		"Subject: " (read-string "Subject: ") "\n"
-		"Date: " (message-make-date (nth 5 atts))
-		"\n"
+		"Date: " (message-make-date (nth 5 atts)) "\n"
 		"Message-ID: " (message-make-message-id) "\n"
 		"Lines: " (int-to-string lines) "\n"
 		"Chars: " (int-to-string (nth 7 atts)) "\n\n"))
-      (gnus-request-accept-article group nil t)
-      (kill-buffer (current-buffer)))))
+      (setq group-art (gnus-request-accept-article group nil t))
+      (kill-buffer (current-buffer)))
+    (setq gnus-newsgroup-active (gnus-activate-group group))
+    (forward-line 1)
+    (gnus-summary-goto-article (cdr group-art) nil t)
+    (when edit
+      (gnus-summary-edit-article))))
+
+(defun gnus-summary-create-article ()
+  "Create an article in a mail newsgroup."
+  (interactive)
+  (let ((group gnus-newsgroup-name)
+	(now (current-time))
+	group-art)
+    (unless (gnus-check-backend-function 'request-accept-article group)
+      (error "%s does not support article importing" group))
+    (save-excursion
+      (set-buffer (gnus-get-buffer-create " *import file*"))
+      (erase-buffer)
+      (goto-char (point-min))
+      ;; This doesn't look like an article, so we fudge some headers.
+      (insert "From: " (read-string "From: ") "\n"
+	      "Subject: " (read-string "Subject: ") "\n"
+	      "Date: " (message-make-date now) "\n"
+	      "Message-ID: " (message-make-message-id) "\n")
+      (setq group-art (gnus-request-accept-article group nil t))
+      (kill-buffer (current-buffer)))
+    (setq gnus-newsgroup-active (gnus-activate-group group))
+    (forward-line 1)
+    (gnus-summary-goto-article (cdr group-art) nil t)
+    (gnus-summary-edit-article)))
 
 (defun gnus-summary-article-posted-p ()
   "Say whether the current (mail) article is available from news as well.
diff --git a/lisp/gnus.el b/lisp/gnus.el
index 37f33ce..772c0b8 100644
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -877,6 +877,20 @@ be set in `.emacs' instead."
 (require 'gnus-util)
 (require 'nnheader)
 
+(defvar gnus-parameters nil
+  "Alist of group parameters.
+
+For example:
+   ((\"mail\\\\..*\"  (gnus-show-threads nil)
+                  (gnus-use-scoring nil)
+                  (gnus-summary-line-format
+                        \"%U%R%z%I%(%[%d:%ub%-20,20f%]%) %s\\n\")
+                  (gcc-self . t)
+                  (display . all))
+     (\"mail\\\\.me\" (gnus-use-scoring  t))
+     (\"list\\\\..*\" (total-expire . t)
+                  (broken-reply-to . t)))")
+
 (defvar gnus-group-parameters-more nil)
 
 (condition-case nil
@@ -2749,12 +2763,28 @@ You should probably use `gnus-find-method-for-group' instead."
   "Say whether the group is secondary or not."
   (gnus-secondary-method-p (gnus-find-method-for-group group)))
 
+(defun gnus-parameters-get-parameter (group)
+  "Return the group parameters for GROUP from `gnus-parameters'."
+  (let ((alist gnus-parameters)
+	params-list)
+    (while alist
+      (when (string-match (caar alist) group)
+	(setq params-list 
+	      (nconc (copy-sequence (cdar alist))
+		     params-list)))
+      (pop alist))
+    params-list))
+
 (defun gnus-group-find-parameter (group &optional symbol allow-list)
   "Return the group parameters for GROUP.
 If SYMBOL, return the value of that symbol in the group parameters."
   (save-excursion
     (set-buffer gnus-group-buffer)
-    (let ((parameters (funcall gnus-group-get-parameter-function group)))
+    (let ((parameters 
+	   (nconc
+	    (copy-sequence
+	     (funcall gnus-group-get-parameter-function group))
+	    (gnus-parameters-get-parameter group))))
       (if symbol
 	  (gnus-group-parameter-value parameters symbol allow-list)
 	parameters))))
@@ -3044,11 +3074,19 @@ Disallow invalid group names."
 (defun gnus-read-method (prompt)
   "Prompt the user for a method.
 Allow completion over sensible values."
-  (let* ((servers
-	  (append gnus-valid-select-methods
-		  (mapcar (lambda (i) (list (format "%s:%s" (caar i)
-						    (cadar i))))
-			  gnus-opened-servers)
+  (let* ((open-servers 
+	  (mapcar (lambda (i) (cons (format "%s:%s" (caar i) (cadar i)) i))
+		  gnus-opened-servers))
+	 (valid-methods
+	  (let (methods)
+	    (dolist (method gnus-valid-select-methods)
+	      (if (or (memq 'prompt-address method)
+		      (not (assoc (format "%s:" (car method)) open-servers)))
+		  (push method methods)))
+	    methods))
+	 (servers
+	  (append valid-methods
+		  open-servers
 		  gnus-predefined-server-alist
 		  gnus-server-alist))
 	 (method
@@ -3063,13 +3101,7 @@ Allow completion over sensible values."
 			       (assoc method gnus-valid-select-methods))
 			 (read-string "Address: ")
 		       "")))
-	(or (let ((opened gnus-opened-servers))
-	      (while (and opened
-			  (not (equal (format "%s:%s" method address)
-				      (format "%s:%s" (caaar opened)
-					      (cadaar opened)))))
-		(pop opened))
-	      (caar opened))
+	(or (cadr (assoc (format "%s:%s" method address) open-servers))
 	    (list (intern method) address))))
      ((assoc method servers)
       method)
diff --git a/lisp/nneething.el b/lisp/nneething.el
index a9c3bb6..1d83717 100644
--- a/lisp/nneething.el
+++ b/lisp/nneething.el
@@ -1,6 +1,6 @@
 ;;; nneething.el --- arbitrary file access for Gnus
 
-;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000
+;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001
 ;;	Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -272,11 +272,11 @@ included.")
     (insert-buffer-substring nneething-work-buffer)
     (goto-char (point-max))))
 
-(defun nneething-make-head (file &optional buffer)
+(defun nneething-make-head (file &optional buffer extra-msg)
   "Create a head by looking at the file attributes of FILE."
   (let ((atts (file-attributes file)))
     (insert
-     "Subject: " (file-name-nondirectory file) "\n"
+     "Subject: " (file-name-nondirectory file) (or extra-msg "") "\n"
      "Message-ID: <nneething-"
      (int-to-string (incf nneething-message-id-number))
      "@" (system-name) ">\n"
@@ -344,18 +344,22 @@ included.")
       (nneething-make-head file) t)
      (t
       ;; We examine the file.
-      (nnheader-insert-head file)
-      (if (nnheader-article-p)
-	  (delete-region
-	   (progn
-	     (goto-char (point-min))
-	     (or (and (search-forward "\n\n" nil t)
+      (condition-case ()
+	  (progn
+	    (nnheader-insert-head file)
+	    (if (nnheader-article-p)
+		(delete-region
+		 (progn
+		   (goto-char (point-min))
+		   (or (and (search-forward "\n\n" nil t)
 		      (1- (point)))
-		 (point-max)))
-	   (point-max))
-	(goto-char (point-min))
-	(nneething-make-head file (current-buffer))
-	(delete-region (point) (point-max)))
+		       (point-max)))
+		 (point-max))
+	      (goto-char (point-min))
+	      (nneething-make-head file (current-buffer))
+	      (delete-region (point) (point-max))))
+	(file-error
+	 (nneething-make-head file (current-buffer) " (unreadable)")))
       t))))
 
 (defun nneething-file-name (article)
diff --git a/lisp/nnml.el b/lisp/nnml.el
index 2c05a5e..e045c2e 100644
--- a/lisp/nnml.el
+++ b/lisp/nnml.el
@@ -760,15 +760,18 @@ all.  This may very well take some time.")
 (eval-when-compile (defvar files))
 (defun nnml-generate-active-info (dir)
   ;; Update the active info for this group.
-  (let ((group (nnheader-file-to-group
-		(directory-file-name dir) nnml-directory)))
-    (setq nnml-group-alist
-	  (delq (assoc group nnml-group-alist) nnml-group-alist))
+  (let* ((group (nnheader-file-to-group
+		 (directory-file-name dir) nnml-directory))
+	 (entry (assoc group nnml-group-alist))
+	 (last (or (caadr entry) 0)))
+    (setq nnml-group-alist (delq entry nnml-group-alist))
     (push (list group
-		(cons (caar files)
-		      (let ((f files))
-			(while (cdr f) (setq f (cdr f)))
-			(caar f))))
+		(cons (or (caar files) (1+ last))
+		      (max last
+			   (or (let ((f files))
+				 (while (cdr f) (setq f (cdr f)))
+				 (caar f))
+			       0))))
 	  nnml-group-alist)))
 
 (defun nnml-generate-nov-file (dir files)
diff --git a/lisp/nnslashdot.el b/lisp/nnslashdot.el
index cd628a8..dab4d90 100644
--- a/lisp/nnslashdot.el
+++ b/lisp/nnslashdot.el
@@ -58,6 +58,9 @@
     "http://slashdot.org/article.pl?sid=%s&mode=nocomment"
   "Where nnslashdot will fetch the article from.")
 
+(defvoo nnslashdot-backslash-url "http://slashdot.org/slashdot.xml"
+  "Where nnslashdot will fetch the stories from.")
+
 (defvoo nnslashdot-threshold -1
   "The article threshold.")
 
@@ -388,7 +391,7 @@
         ;; First we do the Ultramode to get info on all the latest groups.
 	(progn
 	  (mm-with-unibyte-buffer
-	    (nnweb-insert "http://slashdot.org/slashdot.xml" t)
+	    (nnweb-insert nnslashdot-backslash-url t)
 	    (goto-char (point-min))
 	    (while (search-forward "<story>" nil t)
 	      (narrow-to-region (point) (search-forward "</story>"))
diff --git a/texi/ChangeLog b/texi/ChangeLog
index 3ec5b3e..fbb2401 100644
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,21 @@
+2001-02-25 08:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+	From Michael Totschnig <michaelt@supernet.ca>.
+
+	* gnus.texi (Article Fontisizing): Fix.
+
+2001-02-23  Simon Josefsson  <simon@josefsson.org>
+
+	* gnus.texi (Posting Server): Fix, due to change of default value
+	of `gnus-post-method' to `current'.
+	
+2001-02-23 08:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+	* gnus.texi: Remove double words. From Gerd Moellmann.
+
+	* infohack.el (batch-makeinfo): New.
+	
+	* Makefile.in (EMACSINFO): Use it.
+
 2001-02-17 13:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
 	* gnus.texi (Posting Styles): Doc fix.
diff --git a/texi/Makefile.in b/texi/Makefile.in
index f5f2004..a2fea5c 100644
--- a/texi/Makefile.in
+++ b/texi/Makefile.in
@@ -10,7 +10,8 @@ TEXI2DVI=texi2dvi
 TEXI2PDF=texi2pdf
 MAKEINFO=@MAKEINFO@
 EMACS=@EMACS@
-EMACSINFO=$(EMACS) -batch -q -no-site-file
+EMACSCOMP=$(EMACS) -batch -q -no-site-file
+EMACSINFO=$(EMACSCOMP) -l $(srcdir)/infohack.el -f batch-makeinfo
 PDFLATEX=pdflatex
 LATEX=latex
 DVIPS=dvips
@@ -39,19 +40,16 @@ message-ja.info: message-ja.texi
 most: texi2latex.elc latex latexps
 
 %-ja: %-ja.texi
-	$(EMACSINFO) -l $(srcdir)/infohack.el \
-		-eval '(infohack-texi-format "$<")'
+	$(EMACSINFO) $<
 
 %-ja.info: %-ja.texi
-	$(EMACSINFO) -l $(srcdir)/infohack.el \
-		-eval '(infohack-texi-format "$<" t)'
+	$(EMACSINFO) $< t
 
 %.info: %.texi
 	if test "x$(MAKEINFO)" = "xno" \
 	  -o "$<" = "gnus-ja.texi" \
 	  -o "$<" = "message-ja.texi"; then \
-	  $(EMACSINFO) -l $(srcdir)/infohack.el \
-		-eval '(infohack-texi-format "$<" t)'; \
+	  $(EMACSINFO) $< t; \
 	else \
 	  $(MAKEINFO) -I $(srcdir) -o $@ $<; \
 	fi
@@ -62,8 +60,7 @@ most: texi2latex.elc latex latexps
 	if test "x$(MAKEINFO)" = "xno" \
 	  -o "$<" = "gnus-ja.texi" \
 	  -o "$<" = "message-ja.texi"; then \
-	  $(EMACSINFO) -l $(srcdir)/infohack.el \
-		-eval '(infohack-texi-format "$<")'; \
+	  $(EMACSINFO) $<; \
 	else \
 	  $(MAKEINFO) -I $(srcdir) -o $* $<; \
 	fi
@@ -111,10 +108,10 @@ makeinfo:
 	makeinfo -o message message.texi
 
 texi2latex.elc: texi2latex.el
-	srcdir=$(srcdir)/../lisp $(EMACSINFO) -l $(srcdir)/../lisp/dgnushack.el --eval '(byte-compile-file "$(srcdir)/texi2latex.el")'
+	srcdir=$(srcdir)/../lisp $(EMACSCOMP) -l $(srcdir)/../lisp/dgnushack.el --eval '(byte-compile-file "$(srcdir)/texi2latex.el")'
 
 latex gnus.latexi gnus-faq.latexi: $(srcdir)/gnus.texi $(srcdir)/gnus-faq.texi texi2latex.elc
-	srcdir=$(srcdir) $(EMACSINFO) -l ./texi2latex.elc -f latexi-translate
+	srcdir=$(srcdir) $(EMACSCOMP) -l ./texi2latex.elc -f latexi-translate
 
 latexps: gnus.latexi
 	$(MAKE) texi2latex.elc
diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index 0471cb8..2c98492 100644
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -9206,11 +9206,13 @@ Superseding} を参照してください。
 
 @vindex gnus-post-method
 
-それは非常に複雑になり得ます。普通は、gnus は同じ基本サーバーを使用しま
-す。しかし。あなたの基本サーバーが投稿を許可せず、読むことのみを許可して
-いるのならば、おそらくあなたの (非常に知的でとんでもなく興味深い) 記事を
-投稿するために、他のサーバーを使いたいと思うでしょう。
-@code{gnus-post-method} を他の方法に設定する事ができます。
+それは非常に複雑になり得ます。普通は、gnus は講読用と同じ選択方法を使っ
+て投稿します (このことは、あなたがたくさんのグループを異なったサーバーで
+講読している場合に、たぶん都合が良いのです)。しかし、あなたが講読してい
+るそのサーバーが投稿を許可せず、読むことのみを許可しているのならば、おそ
+らくあなたの (非常に知的でとんでもなく興味深い) 記事を投稿するために、他
+のサーバーを使いたいと思うでしょう。@code{gnus-post-method} を他の方法に
+設定する事ができます。
 
 @lisp
 (setq gnus-post-method '(nnspool ""))
@@ -9219,7 +9221,7 @@ Superseding} を参照してください。
 さて、この設定をした後でサーバーがあなたの記事を拒否したり、サーバーが落
 ちていたりしたら、どうしたらよいのでしょう? この変数を上書きするために、
 命令 @kbd{C-c C-c} に零でない接頭引数を与える事で、投稿に『現在の』サー
-バーを使わせる事ができます。
+バーを使わせる事、すなわちディフォルトの動作に戻す事ができます。
 
 もし、零接頭引数をその命令に与えたなら (すなわち、@kbd{C-u 0 C-c C-c})、
 gnus は投稿にどの方法を使うかをあなたに尋ねます。
@@ -9227,6 +9229,9 @@ gnus は投稿にどの方法を使うかをあなたに尋ねます。
 @code{gnus-post-method} を選択方法のリストにする事もできます。その場合は、
 gnus は常に投稿にどの方法を使うかをあなたに尋ねます。
 
+最後に、あなたがいつでも基本の選択方法を使って投稿したいのならば、この変
+数を @code{nil} にして下さい。
+
 @node Mail and Post
 @section メールと投稿
 
diff --git a/texi/gnus.texi b/texi/gnus.texi
index ac0271e..be90976 100644
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -7146,7 +7146,7 @@ groupings will be hidden.)  The fourth is the face used for
 highlighting.
 
 @lisp
-(setq gnus-article-emphasis
+(setq gnus-emphasis-alist
       '(("_\\(\\w+\\)_" 0 1 gnus-emphasis-underline)
         ("\\*\\(\\w+\\)\\*" 0 1 gnus-emphasis-bold)))
 @end lisp
@@ -9638,9 +9638,11 @@ Thank you for asking.  I hate you.
 
 @vindex gnus-post-method
 
-It can be quite complicated.  Normally, gnus will use the same native
-server.  However.  If your native server doesn't allow posting, just
-reading, you probably want to use some other server to post your
+It can be quite complicated.  Normally, Gnus will post using the same
+select method as you're reading from (which might be convenient if
+you're reading lots of groups from different private servers).
+However.  If the server you're reading from doesn't allow posting,
+just reading, you probably want to use some other server to post your
 (extremely intelligent and fabulously interesting) articles.  You can
 then set the @code{gnus-post-method} to some other method:
 
@@ -9651,7 +9653,7 @@ then set the @code{gnus-post-method} to some other method:
 Now, if you've done this, and then this server rejects your article, or
 this server is down, what do you do then?  To override this variable you
 can use a non-zero prefix to the @kbd{C-c C-c} command to force using
-the ``current'' server for posting.
+the ``current'' server, to get back the default behaviour, for posting.
 
 If you give a zero prefix (i.e., @kbd{C-u 0 C-c C-c}) to that command,
 gnus will prompt you for what method to use for posting.
@@ -9660,10 +9662,8 @@ You can also set @code{gnus-post-method} to a list of select methods.
 If that's the case, gnus will always prompt you for what method to use
 for posting.
 
-Finally, if you want to always post using the same select method as
-you're reading from (which might be convenient if you're reading lots of
-groups from different private servers), you can set this variable to
-@code{current}.
+Finally, if you want to always post using the native select method,
+you can set this variable to @code{nil}.
 
 
 @node Mail and Post
@@ -14171,7 +14171,7 @@ if it thinks that the mail belongs in that group.
 Nnmail users might recollect that the last regexp had to be empty to
 match all articles (like in the example above).  This is not required in
 nnimap.  Articles not matching any of the regexps will not be moved out
-of your inbox.  (This might might affect performance if you keep lots of
+of your inbox.  (This might affect performance if you keep lots of
 unread articles in your inbox, since the splitting code would go over
 them every time you fetch new mail.)
 
@@ -14840,7 +14840,7 @@ your desired @code{downloading} criteria for a group are the same as your
 
 These directives in either the category definition or a group's
 parameters will cause the agent to read in all the applicable score
-files for a group, *filtering out* those those sections that do not
+files for a group, *filtering out* those sections that do not
 relate to one of the permitted subset of scoring keywords.
 
 @itemize @bullet
@@ -16260,7 +16260,7 @@ A list.  The elements in this list can be:
 @enumerate
 @item
 @code{(@var{regexp} @var{file-name})}.  If the @var{regexp} matches the
-group name, the @var{file-name} will will be used as the home score file.
+group name, the @var{file-name} will be used as the home score file.
 
 @item
 A function.  If the function returns non-nil, the result will be used as
@@ -18197,7 +18197,7 @@ never be totally undoable.
 @findex gnus-undo
 The undoability is provided by the @code{gnus-undo-mode} minor mode.  It
 is used if @code{gnus-use-undo} is non-@code{nil}, which is the
-default.  The @kbd{M-C-_} key performs the @code{gnus-undo} command
+default.  The @kbd{M-C-_} key performs the @code{gnus-undo} 
 command, which should feel kinda like the normal Emacs @code{undo}
 command.
 
diff --git a/texi/infohack.el b/texi/infohack.el
index c869d94..b6a7068 100644
--- a/texi/infohack.el
+++ b/texi/infohack.el
@@ -46,6 +46,12 @@
 	(Info-split))
     (save-buffer)))
 
+(defun batch-makeinfo ()
+  "Emacs makeinfo in batch mode."
+  (infohack-texi-format (car command-line-args-left)
+			(car (cdr command-line-args-left)))
+  (setq command-line-args-left nil))
+
 
 (let ((default-directory (expand-file-name "../lisp/"))
       (features (cons 'w3-forms (copy-sequence features))))