From: ichikawa <ichikawa>
Date: Thu, 20 Aug 1998 12:58:48 +0000 (+0000)
Subject: Sync up with gnus-5.6.38 and Enable to get APOP server using pop3-fma.el and gnus... 
X-Git-Tag: ichikawa-199811302358~18
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=b1b63bafe13d7e6704c9bea3ef0f962e9e863ee5;p=elisp%2Fgnus.git-

Sync up with gnus-5.6.38 and Enable to get APOP server using pop3-fma.el and gnus-offline.el
---

diff --git a/ChangeLog b/ChangeLog
index 765c6e0..1b00a4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+1998-08-20  Tatsuya Ichikawa  <t-ichi@po.shiojiri.ne.jp>
+
+	* lisp/gnus.el (gnus-version-number): Update to 6.8.14.
+
+	* Sync up with Gnus 5.6.38.
+
+	* lisp/gnus-offline.el (gnus-offline-enable-fetch-mail): Enable to get 
+	APOP server.
+
+	* lisp/pop3-fma.el (pop3-fma-movemail): Enable to get from APOP server.
+	(pop3-fma-set-pop3-password) Enable to get from APOP server.
+
 1998-08-16  Tatsuya Ichikawa  <t-ichi@po.shiojiri.ne.jp>
 
 	* lisp/gnus.el (gnus-version-number): Update to 6.8.13.
@@ -44,8 +56,15 @@
 	
 1998-08-11  Keiichi Suzuki  <kei-suzu@mail.wbs.ne.jp>
 
-	* lisp/message.el: Generate New frame when write new message.
-	And delete message buffer.
+	* lisp/message.el (message-frames): New custom group.
+	(message-original-frame): New variable.
+	(message-use-multi-frames): New variable.
+	(message-delete-frame-on-exit): New variable.
+	(message-send-and-exit): Delete frame which made for editing
+	message.
+	(message-kill-buffer): Ditto.
+	(message-delete-frame): New function.
+	(message-pop-to-buffer): Make new frame when edit message.
 	
 1998-08-11  Tatsuya Ichikawa  <t-ichi@po.shiojiri.ne.jp>
 
@@ -59,10 +78,6 @@
 
 	* Sync up with Gnus 5.6.30.
 	
-1998-08-10  Keiichi Suzuki  <kei-suzu@mail.wbs.ne.jp>
-
-	* lisp/message.el (message-yank-original): For citing any message.
-
 1998-08-10  Shuhei KOBAYASHI <shuhei-k@jaist.ac.jp>
 
 	* lisp/gnus.el (gnus-version-number): Update to 6.8.7.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 18236cd..9b31bb0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,57 @@
+Thu Aug 20 00:28:35 1998  Lars Magne Ingebrigtsen  <larsi@menja.ifi.uio.no>
+
+	* gnus.el: Gnus v5.6.38 is released.
+
+1998-08-20 00:02:50  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* message.el (message-mail): Doc fix.
+
+1998-08-19 23:22:02  Bill Pringlemeir  <bpringle@my-dejanews.com>
+
+	* messcompat.el (message-send-mail-function): Initialized from
+	send-mail-function. 
+
+1998-08-19 23:20:42  Martin Larose  <larosem@IRO.UMontreal.CA>
+
+	* message.el (message-send-coding-system): New variable.
+
+1998-08-19 19:00:37  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* gnus-msg.el (gnus-configure-posting-styles): Reinstated most of
+	old code.
+
+	* gnus-start.el (gnus-save-newsrc-file): Use coding system.
+
+1980-06-08 03:53:56  Mike McEwan  <mike@lotusland.demon.co.uk>
+
+	* gnus-agent.el (gnus-agent-braid-nov): Go to right place. 
+
+1980-06-08 03:01:48  Shuhei KOBAYASHI  <shuhei-k@jaist.ac.jp>
+
+	* gnus-group.el (gnus-group-suspend): Fix.
+
+1998-08-18 00:25:11  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* gnus-cite.el (gnus-cited-opened-text-button-line-format-alist):
+	New n spec.
+
+	* gnus-group.el (gnus-group-suspend): Use mapcar.
+
+1998-08-17 14:35:33  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* gnus-ems.el (gnus-add-minor-mode): Set mode var.
+
+	* gnus-start.el (gnus-slave-mode): New function.
+
+	* gnus-msg.el (gnus-post-method): Work with current in nndraft. 
+
+1998-08-16 23:30:14  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* gnus-art.el (gnus-request-article-this-buffer): Allow recursive
+	selection of nneething groups.
+
+	* nneething.el (nneething-address): Renamed from directory.
+
 Sun Aug 16 18:59:41 1998  Lars Magne Ingebrigtsen  <larsi@menja.ifi.uio.no>
 
 	* gnus.el: Gnus v5.6.37 is released.
diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el
index 9e0d6ba..ef8fce9 100644
--- a/lisp/gnus-agent.el
+++ b/lisp/gnus-agent.el
@@ -811,8 +811,8 @@ the actual number of articles toggled is returned."
     (goto-char (point-min))
     (set-buffer nntp-server-buffer)
     (erase-buffer)
-    (nnheader-insert-file-contents file)
-    (goto-char (point-min))
+    (insert-file-contents file)
+    (goto-char (point-max))
     (if (or (= (point-min) (point-max))
 	    (progn
 	      (forward-line -1)
diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index a155b4d..6f4d9bf 100644
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -2040,7 +2040,8 @@ If ALL-HEADERS is non-nil, no headers are hidden."
 		  (unless (memq article gnus-newsgroup-sparse)
 		    (gnus-error 1
 		     "No such article (may have expired or been canceled)")))))
-	  (if (or (eq result 'pseudo) (eq result 'nneething))
+	  (if (or (eq result 'pseudo)
+		  (eq result 'nneething))
 	      (progn
 		(save-excursion
 		  (set-buffer summary-buffer)
@@ -2458,8 +2459,11 @@ If given a prefix, show the hidden text instead."
 			       gnus-newsgroup-name)))
 		  (when (and (eq (car method) 'nneething)
 			     (vectorp header))
-		    (let ((dir (concat (file-name-as-directory (nth 1 method))
-				       (mail-header-subject header))))
+		    (let ((dir (concat
+				(file-name-as-directory
+				 (or (cadr (assq 'nneething-address method))
+				     (nth 1 method)))
+				(mail-header-subject header))))
 		      (when (file-directory-p dir)
 			(setq article 'nneething)
 			(gnus-group-enter-directory dir))))))))
diff --git a/lisp/gnus-cite.el b/lisp/gnus-cite.el
index 5710910..8866867 100644
--- a/lisp/gnus-cite.el
+++ b/lisp/gnus-cite.el
@@ -284,6 +284,7 @@ This should make it easier to see who wrote what."
 (defvar gnus-cited-opened-text-button-line-format-alist
   `((?b (marker-position beg) ?d)
     (?e (marker-position end) ?d)
+    (?n (count-lines beg end) ?d)
     (?l (- end beg) ?d)))
 (defvar gnus-cited-opened-text-button-line-format-spec nil)
 (defvar gnus-cited-closed-text-button-line-format-alist
diff --git a/lisp/gnus-ems.el b/lisp/gnus-ems.el
index 203c863..a29494b 100644
--- a/lisp/gnus-ems.el
+++ b/lisp/gnus-ems.el
@@ -276,6 +276,7 @@
 (defun gnus-add-minor-mode (mode name map)
   (if (fboundp 'add-minor-mode)
       (add-minor-mode mode name map)
+    (set (make-local-variable mode) t)
     (unless (assq mode minor-mode-alist)
       (push `(,mode ,name) minor-mode-alist))
     (unless (assq mode minor-mode-map-alist)
diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index 029a2a0..66ffb0c 100644
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -773,6 +773,8 @@ The following commands are available:
   (add-hook 'post-command-hook 'gnus-clear-inboxes-moved nil t)
   (when gnus-use-undo
     (gnus-undo-mode 1))
+  (when gnus-slave
+    (gnus-slave-mode))
   (gnus-run-hooks 'gnus-group-mode-hook))
 
 (defun gnus-update-group-mark-positions ()
@@ -3163,11 +3165,11 @@ The hook gnus-suspend-gnus-hook is called before actually suspending."
   (interactive)
   (gnus-run-hooks 'gnus-suspend-gnus-hook)
   ;; Kill Gnus buffers except for group mode buffer.
-  (let* ((group-buf (get-buffer gnus-group-buffer)))
-    (apply (lambda (buf)
-	     (unless (equal buf group-buf)
-	       (kill-buffer buf)))
-	   (gnus-buffers))
+  (let ((group-buf (get-buffer gnus-group-buffer)))
+    (mapcar (lambda (buf)
+	      (unless (equal buf group-buf)
+		(kill-buffer buf)))
+	    (gnus-buffers))
     (gnus-kill-gnus-frames)
     (when group-buf
       (bury-buffer group-buf)
diff --git a/lisp/gnus-int.el b/lisp/gnus-int.el
index 6eff329..8143d0d 100644
--- a/lisp/gnus-int.el
+++ b/lisp/gnus-int.el
@@ -308,7 +308,7 @@ If FETCH-OLD, retrieve all headers (or some subset thereof) in the group."
 	       (gnus-group-real-name group) article))))
 
 (defun gnus-request-update-mark (group article mark)
-  "Return the type (`post' or `mail') of GROUP (and ARTICLE)."
+  "Allow the backend to change the mark the user tries to put on an article."
   (let ((gnus-command-method (gnus-find-method-for-group group)))
     (if (not (gnus-check-backend-function
 	      'request-update-mark (car gnus-command-method)))
diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el
index 3a8951b..b9425a7 100644
--- a/lisp/gnus-msg.el
+++ b/lisp/gnus-msg.el
@@ -514,7 +514,8 @@ If SILENT, don't prompt the user."
 	   (not (eq (car group-method) 'nndraft))
 	   (not arg))
       group-method) 
-     (gnus-post-method
+     ((and gnus-post-method
+	   (not (eq gnus-post-method 'current)))
       gnus-post-method)
      ;; Use the normal select method.
      (t gnus-select-method))))
@@ -1109,17 +1110,23 @@ this is a reply."
 		;; This is an ordinary variable.
 		(set (make-local-variable variable) value-value)
               ;; This is either a body or a header to be inserted in the
-              ;; message
-              (when value-value
-                (let ((attr (car attribute)))
+              ;; message.
+ 	      (when value-value
+		(let ((attr (car attribute)))
+		  (make-local-variable 'message-setup-hook)
                   (if (eq 'body attr)
-                      (save-excursion
-                        (goto-char (point-max))
-                        (insert value-value))
-                    (save-excursion
-		      (message-goto-eoh)
-                      (insert (if (stringp attr) attr (symbol-name attr))
-                              ": " value-value "\n"))))))))))))
+		      (add-hook 'message-setup-hook
+				`(lambda ()
+				   (save-excursion
+				     (message-goto-body)
+				     (insert ,value-value))))
+		    (add-hook
+		     'message-setup-hook
+		     `(lambda ()
+			(save-excursion
+			  (message-goto-eoh)
+			  (insert ,(if (stringp attr) attr (symbol-name attr))
+				  ": " ,value-value "\n"))))))))))))))
 
 ;;; Allow redefinition of functions.
 
diff --git a/lisp/gnus-offline.el b/lisp/gnus-offline.el
index 8c5cb42..bf4642f 100644
--- a/lisp/gnus-offline.el
+++ b/lisp/gnus-offline.el
@@ -6,7 +6,7 @@
 ;;;         Yukihiro Ito <ito@rs.civil.tohoku.ac.jp>
 ;;;         Hidekazu Nakamura <u90121@uis-inf.co.jp>
 
-;;; Version: 1.52
+;;; Version: 1.51
 ;;; Keywords: news , mail , offline , gnus
 ;;;
 ;;; SPECIAL THANKS
@@ -114,7 +114,7 @@
   :group 'mail
   :group 'news)
 
-(defconst gnus-offline-version-number "1.52")
+(defconst gnus-offline-version-number "1.51")
 (defconst gnus-offline-codename
 ;;  "You may be right"		; 1.40
 ;;  "Chilstie Lee"		; 1.45
@@ -122,8 +122,8 @@
 ;;  "Easy money"		; 1.47
 ;;  "An Innocent man"		; 1.48
 ;;  "Tell her about it"		; 1.50
-;;  "This night"		; 1.51
-  "Movin'out"			; 1.52
+  "This night"			; 1.51
+;;  "Movin'out"
 ;;  "Longest night"
 ;;  "Leave a tender moment alone"
 ;;  "Back in the U.S.S.R"
@@ -222,7 +222,7 @@ smtp means use smtp.el.
   :type '(choice (const smtp)
 		 (const sendmail)))
 
-(defcustom gnus-offline-drafts-queue-type 'agent
+(defcustom gnus-offline-drafts-queue-type 'miee
   "*Type of to queue drafts method.
 'miee means drafts are queued and sent by miee.el.
 'agent means drafts are queued and sent by gnus-agent.el"
@@ -326,14 +326,8 @@ If value is nil , dialup line is disconnected status.")
   
   ;; Spool directory setting - Miee
   (if (eq gnus-offline-drafts-queue-type 'miee)
-      (progn
-	(if (not (file-exists-p gnus-offline-mail-spool-directory))
-	    (make-directory gnus-offline-mail-spool-directory t))
-	(setq sendmail-to-spool-directory gnus-offline-news-spool-directory)
-	(if (not (file-exists-p gnus-offline-news-spool-directory))
-	    (make-directory gnus-offline-news-spool-directory t))
-	(setq sendmail-to-spool-directory gnus-offline-mail-spool-directory
-	      news-spool-request-post-directory gnus-offline-news-spool-directory)))
+      (setq sendmail-to-spool-directory gnus-offline-mail-spool-directory
+	    news-spool-request-post-directory gnus-offline-news-spool-directory))
   
   ;; When startup ... state is offline.
   (setq gnus-nntp-service nil
@@ -544,7 +538,12 @@ If value is nil , dialup line is disconnected status.")
       (progn
 	(setq gnus-offline-mail-fetch-method 'nnmail)
 	(setq nnmail-movemail-program 'pop3-fma-movemail)
-	(setq nnmail-spool-file pop3-fma-spool-file-alist))))
+	(setq nnmail-spool-file (append
+				 pop3-fma-local-spool-file-alist
+				 (mapcar
+				  (lambda (spool)
+				    (car spool))
+				  pop3-fma-spool-file-alist))))))
 ;;
 ;; Enable fetch news
 ;;
diff --git a/lisp/gnus-start.el b/lisp/gnus-start.el
index 536ea29..60c936d 100644
--- a/lisp/gnus-start.el
+++ b/lisp/gnus-start.el
@@ -2388,6 +2388,13 @@ If FORCE is non-nil, the .newsrc file is read."
 ;;; Slave functions.
 ;;;
 
+(defvar gnus-slave-mode nil)
+
+(defun gnus-slave-mode ()
+  "Minor mode for slave Gnusae."
+  (gnus-add-minor-mode 'gnus-slave-mode " Slave" (make-sparse-keymap))
+  (gnus-run-hooks 'gnus-slave-mode-hook))
+
 (defun gnus-slave-save-newsrc ()
   (save-excursion
     (set-buffer gnus-dribble-buffer)
diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 1fcba5b..1bd7981 100644
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -3842,7 +3842,7 @@ If SELECT-ARTICLES, only select those articles from GROUP."
   (let* ((entry (gnus-gethash group gnus-newsrc-hashtb))
 	 ;;!!! Dirty hack; should be removed.
 	 (gnus-summary-ignore-duplicates
-	  (if (eq (car (gnus-find-method-for-group group)) 'nnvirtual)
+ 	  (if (eq (car (gnus-find-method-for-group group)) 'nnvirtual)
 	      t
 	    gnus-summary-ignore-duplicates))
 	 (info (nth 2 entry))
diff --git a/lisp/gnus.el b/lisp/gnus.el
index 6fad176..97a1eda 100644
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -253,11 +253,11 @@ is restarted, and sometimes reloaded."
 (defconst gnus-product-name "T-gnus"
   "Product name of this version of gnus.")
 
-(defconst gnus-version-number "6.8.13"
+(defconst gnus-version-number "6.8.14"
   "Version number for this version of gnus.")
 
 (defconst gnus-version
-  (format "%s %s (based on Gnus 5.6.37; for SEMI 1.8, FLIM 1.8/1.9)"
+  (format "%s %s (based on Gnus 5.6.38; for SEMI 1.8, FLIM 1.8/1.9)"
           gnus-product-name gnus-version-number)
   "Version string for this version of gnus.")
 
@@ -1652,7 +1652,8 @@ gnus-newsrc-hashtb should be kept so that both hold the same information.")
       gnus-uu-decode-binhex gnus-uu-decode-uu-view
       gnus-uu-decode-uu-and-save-view gnus-uu-decode-unshar-view
       gnus-uu-decode-unshar-and-save-view gnus-uu-decode-save-view
-      gnus-uu-decode-binhex-view gnus-uu-unmark-thread)
+      gnus-uu-decode-binhex-view gnus-uu-unmark-thread
+      gnus-uu-mark-over)
      ("gnus-uu" gnus-uu-delete-work-dir gnus-quote-arg-for-sh-or-csh
       gnus-uu-unmark-thread)
      ("gnus-msg" (gnus-summary-send-map keymap)
diff --git a/lisp/message.el b/lisp/message.el
index 953941a..67b40ee 100644
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -957,6 +957,9 @@ The cdr of ech entry is a function for applying the face to a region.")
 		 (const :tag "always" t)
 		 (const :tag "ask" ask)))
 
+(defvar message-send-coding-system 'binary
+  "Coding system to encode outgoing mail.")
+
 ;;; Internal variables.
 
 (defvar message-buffer-list nil)
@@ -2227,7 +2230,7 @@ the user from the mailer."
 	  (set-buffer errbuf)
 	  (erase-buffer))))
     (let ((default-directory "/")
-	  (coding-system-for-write 'binary))
+	  (coding-system-for-write message-send-coding-system))
       (apply 'call-process-region
 	     (append (list (point-min) (point-max)
 			   (if (boundp 'sendmail-program)
@@ -2276,7 +2279,7 @@ to find out how to use this."
   (run-hooks 'message-send-mail-hook)
   ;; send the message
   (case
-      (let ((coding-system-for-write 'binary))
+      (let ((coding-system-for-write message-send-coding-system))
 	(apply
 	 'call-process-region 1 (point-max) message-qmail-inject-program
 	 nil nil nil
@@ -3470,7 +3473,8 @@ Headers already prepared in the buffer are not modified."
 (defun message-mail (&optional to subject
 			       other-headers continue switch-function
 			       yank-action send-actions)
-  "Start editing a mail message to be sent."
+  "Start editing a mail message to be sent.
+OTHER-HEADERS is an alist of header/value pairs."
   (interactive)
   (let ((message-this-is-mail t))
     (message-pop-to-buffer (message-buffer-name "mail" to))
diff --git a/lisp/messcompat.el b/lisp/messcompat.el
index 337ab6f..153f76d 100644
--- a/lisp/messcompat.el
+++ b/lisp/messcompat.el
@@ -82,6 +82,11 @@ these lines.")
 (defvar message-send-hook mail-send-hook
   "Hook run before sending messages.")
 
+(defvar message-send-mail-function send-mail-function
+  "Function to call to send the current buffer as mail.
+The headers should be delimited by a line whose contents match the
+variable `mail-header-separator'.")
+
 (provide 'messcompat)
 
 ;;; messcompat.el ends here
diff --git a/lisp/nneething.el b/lisp/nneething.el
index 97f5d2f..7da5466 100644
--- a/lisp/nneething.el
+++ b/lisp/nneething.el
@@ -64,7 +64,7 @@ If this variable is nil, no files will be excluded.")
 (defvoo nneething-map nil)
 (defvoo nneething-read-only nil)
 (defvoo nneething-active nil)
-(defvoo nneething-directory nil)
+(defvoo nneething-address nil)
 
 
 
@@ -158,8 +158,8 @@ If this variable is nil, no files will be excluded.")
   (nnheader-init-server-buffer)
   (if (nneething-server-opened server)
       t
-    (unless (assq 'nneething-directory defs)
-      (setq defs (append defs (list (list 'nneething-directory server)))))
+    (unless (assq 'nneething-address defs)
+      (setq defs (append defs (list (list 'nneething-address server)))))
     (nnoo-change-server 'nneething server defs)))
 
 
@@ -185,9 +185,9 @@ If this variable is nil, no files will be excluded.")
 
 (defun nneething-create-mapping ()
   ;; Read nneething-active and nneething-map.
-  (when (file-exists-p nneething-directory)
+  (when (file-exists-p nneething-address)
     (let ((map-file (nneething-map-file))
-	  (files (directory-files nneething-directory))
+	  (files (directory-files nneething-address))
 	  touched map-files)
       (when (file-exists-p map-file)
 	(ignore-errors
@@ -344,7 +344,7 @@ If this variable is nil, no files will be excluded.")
 
 (defun nneething-file-name (article)
   "Return the file name of ARTICLE."
-  (concat (file-name-as-directory nneething-directory)
+  (concat (file-name-as-directory nneething-address)
 	  (if (numberp article)
 	      (cadr (assq article nneething-map))
 	    article)))
diff --git a/lisp/pop3-fma.el b/lisp/pop3-fma.el
index 1dbad4c..a13e453 100644
--- a/lisp/pop3-fma.el
+++ b/lisp/pop3-fma.el
@@ -3,7 +3,7 @@
 ;;                                                           Yasuo Okabe
 ;; Author: Tatsuya Ichikawa <t-ichi@po.shiojiri.ne.jp>
 ;;         Yasuo OKABE <okabe@kuis.kyoto-u.ac.jp>
-;; Version: 1.00
+;; Version: 1.10
 ;; Keywords: mail , gnus , pop3
 ;;
 ;; SPECIAL THANKS
@@ -41,12 +41,18 @@
 ;;  (require 'pop3-fma)
 ;;  (setq pop3-fma-spool-file-alist
 ;;        '(
-;;  	    "po:username0@mailhost0.your.domain0"
-;;	    "po:username1@mailhost1.your.domain1"
+;;  	    ("po:username0@mailhost0.your.domain0" pass)
+;;	    ("po:username1@mailhost1.your.domain1" apop)
 ;;                         :
 ;;                         :
 ;;	   ))
 ;;
+;;	pass means normal authentication USER/PASS.
+;;	apop means authentication using APOP.
+;;
+;; When using apop , Please set pop3-fma-movemail-type 'lisp.
+;; movemail.exe does not work on APOP protocol.
+;;
 ;; Variables
 ;;
 ;;  pop3-fma-spool-file-alist      ... Spool file alist of POP3 protocol
@@ -84,7 +90,7 @@
   :group 'mail
   :group 'news)
 
-(defconst pop3-fma-version-number "1.00")
+(defconst pop3-fma-version-number "1.10")
 (defconst pop3-fma-codename
 ;;  "Feel the wind"		; 0.10
 ;;  "My home town"  		; 0.11
@@ -92,8 +98,8 @@
 ;;  "Rock'n Roll city"		; 0.13
 ;;  "Money"			; 0.20
 ;;  "Still 19"       		; 0.21
-  "J boy"          		; 1.00
-;;  "Blood line"		; 0.xx
+;;  "J boy"          		; 1.00
+  "Blood line"			; 1.10
 ;;  "Star ring"			; 0.xx
 ;;  "Goodbye Game"		; 0.xx
   )
@@ -105,9 +111,10 @@
   "*Spool file to get mail using pop3 protocol.
 You should specify this variable like
  '(
-   \"po:user1@mailhost1\"
-   \"po:user2@mailhost2\"
-  )"
+   (\"po:user1@mailhost1\" type)
+   (\"po:user2@mailhost2\" type)
+  )
+Type must be pass or apop."
   :group 'pop3-fma
   :type 'alist)
 
@@ -170,27 +177,32 @@ Please do not set this valiable non-nil if you do not use Meadow.")
 	       (substring inbox (match-end (string-match "^.*@" inbox)))))
 	  (let ((pop3-password
 		 (pop3-fma-read-passwd pop3-mailhost)))
-	    (message "Checking new mail user %s at %s..." pop3-maildrop pop3-mailhost)
-	    (if (and (eq system-type 'windows-nt)
-		     (eq pop3-fma-movemail-type 'exe))
-		(progn
-		  (setenv "MAILHOST" pop3-mailhost)
-		  (if (and (not (memq pop3-password pop3-fma-movemail-arguments))
-			   (not (memq (concat "po:" pop3-maildrop) pop3-fma-movemail-arguments)))
-		      (progn
-			(setq pop3-fma-movemail-arguments nil)
-			(setq pop3-fma-movemail-arguments
-			      (append pop3-fma-movemail-options
-				      (list
-				       (concat "po:" pop3-maildrop)
-				       crashbox
-				       pop3-password)))))
-		  (apply 'call-process (concat
-					exec-directory
-					pop3-fma-movemail-program)
-			 nil nil nil
-			 pop3-fma-movemail-arguments))
-	      (pop3-movemail crashbox)))))
+	    (let ((pop3-authentication-scheme
+		   (nth 1 (assoc inbox pop3-fma-spool-file-alist))))
+	      (if (eq pop3-authentication-scheme 'pass)
+		  (message "Checking new mail user %s at %s using USER/PASS ..." pop3-maildrop pop3-mailhost)
+		(message "Checking new mail user %s at %s using APOP ..." pop3-maildrop pop3-mailhost)
+		(setq pop3-fma-movemail-type 'lisp))
+	      (if (and (eq system-type 'windows-nt)
+		       (eq pop3-fma-movemail-type 'exe))
+		  (progn
+		    (setenv "MAILHOST" pop3-mailhost)
+		    (if (and (not (memq pop3-password pop3-fma-movemail-arguments))
+			     (not (memq (concat "po:" pop3-maildrop) pop3-fma-movemail-arguments)))
+			(progn
+			  (setq pop3-fma-movemail-arguments nil)
+			  (setq pop3-fma-movemail-arguments
+				(append pop3-fma-movemail-options
+					(list
+					 (concat "po:" pop3-maildrop)
+					 crashbox
+					 pop3-password)))))
+		    (apply 'call-process (concat
+					  exec-directory
+					  pop3-fma-movemail-program)
+			   nil nil nil
+			   pop3-fma-movemail-arguments))
+		(pop3-movemail crashbox))))))
     (message "Checking new mail at %s ... " inbox)
     (call-process (concat exec-directory pop3-fma-movemail-program)
 		  nil
@@ -231,17 +243,20 @@ Please do not set this valiable non-nil if you do not use Meadow.")
   (mapcar
    (lambda (x)
      (let ((pop3-maildrop
-	    (substring x (match-end (string-match "^po:" x))
-		       (- (match-end (string-match "^.*@" x)) 1)))
+	    (substring (car x) (match-end (string-match "^po:" (car x)))
+		       (- (match-end (string-match "^.*@" (car x))) 1)))
 	   (pop3-mailhost
-	    (substring x (match-end (string-match "^.*@" x)))))
+	    (substring (car x) (match-end (string-match "^.*@" (car x))))))
        (call-interactively 'pop3-fma-store-password)))
    pop3-fma-spool-file-alist)
   (setq nnmail-movemail-program 'pop3-fma-movemail)
 ;;  (setq nnmail-spool-file pop3-fma-spool-file-alist))
   (setq nnmail-spool-file (append
 			   pop3-fma-local-spool-file-alist
-			   pop3-fma-spool-file-alist)))
+			   (mapcar
+			    (lambda (spool)
+			      (car spool))
+			    pop3-fma-spool-file-alist))))
 ;;
 (defun pop3-fma-read-noecho (prompt &optional stars)
   "Read a single line of text from user without echoing, and return it.
diff --git a/make.bat b/make.bat
index 4a6b8a0..d183af9 100755
--- a/make.bat
+++ b/make.bat
@@ -1,57 +1,57 @@
-@echo off
-
-rem Written by David Charlap <shamino@writeme.com>
-
-rem There are two catches, however.  The emacs.bat batch file may not exist
-rem in all distributions.  It is part of the Voelker build of Emacs 19.34
-rem (http://www.cs.washington.edu/homes/voelker/ntemacs.html).  If the user
-rem installs Gnus with some other build, he may have to replace calls to
-rem %1\emacs.bat with something else.
-rem 
-rem Also, the emacs.bat file that Voelker ships does not accept more than 9
-rem parameters, so the attempts to compile the .texi files will fail.  To
-rem fix that (at least on NT.  I don't know about Win95), the following
-rem change should be made to emacs.bat:
-rem 
-rem     %emacs_dir%\bin\emacs.exe %1 %2 %3 %4 %5 %6 %7 %8 %9
-rem 
-rem should become
-rem 
-rem     %emacs_dir%\bin\emacs.exe %*
-rem 
-rem which will allow the batch file to accept an unlimited number of
-rem parameters.
-
-if "%1" == "" goto usage
-
-cd lisp
-call %1\bin\emacs.bat -batch -q -no-site-file -l ./dgnushack.el -f dgnushack-compile
-if not "%2" == "copy" goto info
-copy *.el* %1\lisp
-
-:info
-cd ..\texi
-call %1\bin\emacs.bat -batch -q -no-site-file gnus.texi -l texinfmt -f texinfo-every-node-update -f texinfo-format-buffer -f save-buffer
-call %1\bin\emacs.bat -batch -q -no-site-file message.texi -l texinfmt -f texinfo-every-node-update -f texinfo-format-buffer -f save-buffer
-if not "%2" == "copy" goto done
-copy gnus %1\info
-copy gnus-?? %1\info
-copy message %1\info
-
-:etc
-cd ..\etc
-copy gnus-tut.txt %1\etc
-
-:done
-cd ..
-goto end
-
-:usage
-echo Usage: make ^<emacs-dir^> [copy]
-echo.
-echo where: ^<emacs-dir^> is the directory you installed emacs in
-echo                    eg. d:\emacs\19.34
-echo        copy indicates that the compiled files should be copied to your
-echo             emacs lisp, info, and etc directories
-
-:end
+@echo off
+
+rem Written by David Charlap <shamino@writeme.com>
+
+rem There are two catches, however.  The emacs.bat batch file may not exist
+rem in all distributions.  It is part of the Voelker build of Emacs 19.34
+rem (http://www.cs.washington.edu/homes/voelker/ntemacs.html).  If the user
+rem installs Gnus with some other build, he may have to replace calls to
+rem %1\emacs.bat with something else.
+rem 
+rem Also, the emacs.bat file that Voelker ships does not accept more than 9
+rem parameters, so the attempts to compile the .texi files will fail.  To
+rem fix that (at least on NT.  I don't know about Win95), the following
+rem change should be made to emacs.bat:
+rem 
+rem     %emacs_dir%\bin\emacs.exe %1 %2 %3 %4 %5 %6 %7 %8 %9
+rem 
+rem should become
+rem 
+rem     %emacs_dir%\bin\emacs.exe %*
+rem 
+rem which will allow the batch file to accept an unlimited number of
+rem parameters.
+
+if "%1" == "" goto usage
+
+cd lisp
+call %1\bin\emacs.bat -batch -q -no-site-file -l ./dgnushack.el -f dgnushack-compile
+if not "%2" == "copy" goto info
+copy *.el* %1\lisp
+
+:info
+cd ..\texi
+call %1\bin\emacs.bat -batch -q -no-site-file gnus.texi -l texinfmt -f texinfo-every-node-update -f texinfo-format-buffer -f save-buffer
+call %1\bin\emacs.bat -batch -q -no-site-file message.texi -l texinfmt -f texinfo-every-node-update -f texinfo-format-buffer -f save-buffer
+if not "%2" == "copy" goto done
+copy gnus %1\info
+copy gnus-?? %1\info
+copy message %1\info
+
+:etc
+cd ..\etc
+copy gnus-tut.txt %1\etc
+
+:done
+cd ..
+goto end
+
+:usage
+echo Usage: make ^<emacs-dir^> [copy]
+echo.
+echo where: ^<emacs-dir^> is the directory you installed emacs in
+echo                    eg. d:\emacs\19.34
+echo        copy indicates that the compiled files should be copied to your
+echo             emacs lisp, info, and etc directories
+
+:end
diff --git a/texi/ChangeLog b/texi/ChangeLog
index 1310f27..0524893 100644
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,7 @@
+1998-08-18 00:30:05  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* gnus.texi (Article Hiding): Addition.
+
 1998-08-16 14:53:45  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* gnus.texi (NNTP): Reinstated.
diff --git a/texi/gnus.texi b/texi/gnus.texi
index e2f402a..f9bbbb9 100644
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -6327,11 +6327,13 @@ specs are valid:
 
 @table @samp
 @item b
-Start point of the hidden text.
+Starting point of the hidden text.
 @item e
-End point of the hidden text.
+Ending point of the hidden text.
 @item l
-Length of the hidden text.
+Number of characters in the hidden region.
+@item n
+Number of lines of hidden text.
 @end table
 
 @item gnus-cited-lines-visible