* lisp/gnus.el (gnus-revision-number): Increment to 03.

* lisp/gnus-offline.el (gnus-offline-popup-menu): Modify so that
the title of a popup menu is displayed under Emacs 19.34.
(gnus-offline-define-menu-and-key): Rewrite the function to change
the behavior of "Get new news" button, under XEmacs.
* lisp/gnus-ofsetup.el: Modify for Semi-gnus 6.10.xx so that
`pop3-fma-password' can be saved in .newsrc.eld.
* README-offline.en: Update.
* README-offline.ja: Ditto.

diff --git a/ChangeLog b/ChangeLog
index b6ed6dd..13bd232 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+1999-03-22  Tsukamoto Tetsuo  <czkmt@remus.dti.ne.jp>
+
+       * lisp/gnus.el (gnus-revision-number): Increment to 03.
+
+       * lisp/gnus-offline.el (gnus-offline-popup-menu): Modify so that
+       the title of a popup menu is displayed under Emacs 19.34.
+       (gnus-offline-define-menu-and-key): Rewrite the function to change
+       the behavior of "Get new news" button, under XEmacs.
+
+       * lisp/gnus-ofsetup.el: Modify for Semi-gnus 6.10.xx so that
+       `pop3-fma-password' can be saved in .newsrc.eld.
+
+       * README-offline.en: Update.
+       * README-offline.ja: Ditto.
+
 1999-03-09  Katsumi Yamaoka   <yamaoka@jpl.org>
 
        * lisp/gnus.el  (gnus-revision-number): Increment to 02.

diff --git a/README-offline.en b/README-offline.en
index c523d57..d889e94 100644 (file)
--- a/README-offline.en
+++ b/README-offline.en
@@ -256,6 +256,7 @@ password will be saved in ~/.newsrc.eld. (*)
 
             (add-hook 'gnus-setup-news-hook 
              (lambda ()
+              (setq pop3-fma-save-password-information t)
               (add-to-list 'gnus-variable-list 'pop3-fma-password)))
 
            [T-gnus 6.10.56 or later]
@@ -277,7 +278,7 @@ For Semi-gnus with pop3-fma.el, add the following code in
 
          (setq pop3-fma-save-password-information t)
 
-In this way, Once you enter the password at the startup of Gnus, it
+In this way, once you enter the password at the startup of Gnus, it
 will be kept as a variable `pop3-fma-password' until you quit Gnus.
 
 Under T-gnus 6.10.56 or later, the password will be kept as a variable

diff --git a/README-offline.ja b/README-offline.ja
index cf34462..107ae49 100644 (file)
--- a/README-offline.ja
+++ b/README-offline.ja
@@ -255,6 +255,7 @@ pop \e$B%5!<%P!<$K%"%/%;%9$9$kEY$KF~NO$9$kI,MW$,$"$j$^$9!#\e(B(\e$B4pK\E*$K$3$N$^$^
 
             (add-hook 'gnus-setup-news-hook 
              (lambda ()
+              (setq pop3-fma-save-password-information t)
               (add-to-list 'gnus-variable-list 'pop3-fma-password)))
 
          \e$B!Z\e(BT-gnus 6.10.56 \e$B0J9_![\e(B

diff --git a/lisp/gnus-offline.el b/lisp/gnus-offline.el
index 011e4b5..e0d16be 100644 (file)
--- a/lisp/gnus-offline.el
+++ b/lisp/gnus-offline.el
@@ -1,5 +1,5 @@
 ;;; gnus-offline.el --- To process mail & news at offline environment.
-;;; $Id: gnus-offline.el,v 1.1.2.5.2.33 1999-02-12 06:57:09 ichikawa Exp $
+;;; $Id: gnus-offline.el,v 1.1.2.5.2.34 1999-03-22 18:13:31 czkmt Exp $
 
 ;;; Copyright (C) 1998 Tatsuya Ichikawa
 ;;;                    Yukihiro Ito
@@ -763,12 +763,12 @@ If value is nil , dialup line is disconnected status.")
       ;; Overwrite the toolbar spec for gnus-group-mode.
       (add-hook 'gnus-startup-hook
                (lambda ()
-                 (let ((i 0) (stat t) but)
-                   (while (and stat (setq but (nth i gnus-group-toolbar)))
-                     (and (equal 'gnus-group-get-new-news (aref but 1))
-                          (aset but 1 'gnus-offline-gnus-get-new-news)
-                          (setq stat nil))
-                     (setq i (1+ i))))))))
+                 (catch 'tag
+                   (mapcar (lambda (but)
+                             (when (eq 'gnus-group-get-new-news (aref but 1))
+                               (aset but 1 'gnus-offline-gnus-get-new-news)
+                               (throw 'tag nil)))
+                           gnus-group-toolbar))))))
 ;;
 ;;
 (defun gnus-offline-define-menu-on-miee ()
@@ -858,16 +858,31 @@ If value is nil , dialup line is disconnected status.")
 ;;
 ;; Popup menu within the group buffer (under Emacs).
 ;;
+(defvar gnus-offline-popup-menu nil)
 (defun gnus-offline-popup-menu (event)
   "Popup menu for Gnus offline."
   (interactive "e")
-  (let* ((menu (if (boundp 'miee-popup-menu)
-                  (or (assoc 'keymap
-                             (assoc 'Miee (assoc 'menu-bar global-map)))
-                      miee-popup-menu)
-                gnus-offline-menu-on-agent))
-        (pop (x-popup-menu t menu))
-        (func (and pop (lookup-key menu (apply 'vector pop)))))
+  (unless gnus-offline-popup-menu
+    (setq gnus-offline-popup-menu
+         (or (featurep 'xemacs)
+             (let ((menu
+                    (if (boundp 'miee-popup-menu)
+                        (or (assoc 'keymap
+                                   (assoc 'Miee (assoc 'menu-bar global-map)))
+                            miee-popup-menu)
+                      gnus-offline-menu-on-agent)))
+               (if (string< emacs-version "20")
+                   (append (list 'keymap
+                                 (if (boundp 'miee-popup-menu)
+                                     '(nil "Miee")
+                                   '(nil "Offline"))
+                                 '(nil "")
+                                 '(nil ""))
+                           (cdr menu))
+                 menu)))))
+  (let* ((pop (x-popup-menu t gnus-offline-popup-menu))
+        (func (and pop (lookup-key gnus-offline-popup-menu
+                                   (apply 'vector pop)))))
     (and pop func (funcall func))))
 \f
 ;;

diff --git a/lisp/gnus-ofsetup.el b/lisp/gnus-ofsetup.el
index 91450af..db6f79b 100644 (file)
--- a/lisp/gnus-ofsetup.el
+++ b/lisp/gnus-ofsetup.el
@@ -1,6 +1,6 @@
 ;;; gnus-ofsetup.el --- Setup advisor for Offline reading for Mail/News.
 ;;;
-;;; $Id: gnus-ofsetup.el,v 1.1.2.16 1999-02-18 20:10:22 czkmt Exp $
+;;; $Id: gnus-ofsetup.el,v 1.1.2.17 1999-03-22 18:13:33 czkmt Exp $
 ;;;
 ;;; Copyright (C) 1998 Tatsuya Ichikawa
 ;;; Author: Tatsuya Ichikawa <t-ichi@po.shiojiri.ne.jp>
@@ -360,7 +360,7 @@
              (insert (prin1-to-string pop3-fma-movemail-type))
              (insert ")\n")
              (if save-passwd
-                 (insert "(add-hook 'gnus-setup-news-hook \n    (lambda ()\n        (add-to-list 'gnus-variable-list 'pop3-fma-password)))\n"))
+                 (insert "(add-hook 'gnus-setup-news-hook \n    (lambda ()\n        (setq pop3-fma-save-password-information t)\n        (add-to-list 'gnus-variable-list 'pop3-fma-password)))\n"))
              (if (eq pop3-fma-movemail-type 'exe)
                  (progn
                    (insert "(setq pop3-fma-movemail-arguments '")

diff --git a/lisp/gnus.el b/lisp/gnus.el
index ab038b7..afdf299 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -268,7 +268,7 @@ is restarted, and sometimes reloaded."
 (defconst gnus-version-number "6.10.062"
   "Version number for this version of gnus.")
 
-(defconst gnus-revision-number "02"
+(defconst gnus-revision-number "03"
   "Revision number for this version of gnus.")
 
 (defconst gnus-original-version-number "0.80"