* gnus-vers.el (gnus-revision-number): Increment to 09.

* gnus-offline.el (gnus-offline-get-menu-items): Rewrite using `dolist'.
* gnus-group.el (gnus-group-make-shimbun-group): Simplified.
* dgnushack.el: Load cl-macs to ensure that the macro `dolist' is defined
 properly.

diff --git a/ChangeLog b/ChangeLog
index 0e4862c..2deed07 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2001-03-01  Katsumi Yamaoka <yamaoka@jpl.org>
+
+       * lisp/gnus-vers.el (gnus-revision-number): Increment to 09.
+
+       * lisp/gnus-offline.el (gnus-offline-get-menu-items): Rewrite using
+       `dolist'.
+
+       * lisp/gnus-group.el (gnus-group-make-shimbun-group): Simplified.
+
+       * lisp/dgnushack.el: Load cl-macs to ensure that the macro `dolist'
+       is defined properly.
+
 2001-02-28  Katsumi Yamaoka <yamaoka@jpl.org>
 
        * lisp/nnwfm.el: Require `gnus-clfns' when compiling.

diff --git a/lisp/base64.el b/lisp/base64.el
index 7754162..26415a2 100644 (file)
--- a/lisp/base64.el
+++ b/lisp/base64.el
@@ -1,5 +1,5 @@
 ;;; base64.el --- Base64 encoding functions using MEL
-;; Copyright (C) 2000 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2001 Free Software Foundation, Inc.
 
 ;; Author: T-gnus development team
 ;; Keywords: extensions

diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el
index 5fab698..a24b96b 100644 (file)
--- a/lisp/dgnushack.el
+++ b/lisp/dgnushack.el
@@ -49,6 +49,9 @@
 (defalias 'facep 'ignore)
 
 (require 'cl)
+(unless (dolist (var nil t))
+  ;; Override the macro `dolist' which might be defined in egg.el.
+  (load "cl-macs" nil t))
 
 (defvar srcdir (or (getenv "srcdir") "."))
 

diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index ef7a37e..e992da3 100644 (file)
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -2435,22 +2435,20 @@ If SOLID (the prefix), create a solid group."
   (require 'nnshimbun)
   (let* ((minibuffer-setup-hook (append minibuffer-setup-hook
                                        '(beginning-of-line)))
-        (server (completing-read
-                 "Shimbun address: "
-                 (mapcar (lambda (elem) (list (car elem)))
-                         nnshimbun-type-definition)
-                 nil t
-                 (or (car gnus-group-shimbun-server-history)
-                     (caar nnshimbun-type-definition))
-                 'gnus-group-shimbun-server-history))
+        (server (completing-read "Shimbun address: "
+                                 nnshimbun-type-definition nil t
+                                 (or (car gnus-group-shimbun-server-history)
+                                     (caar nnshimbun-type-definition))
+                                 'gnus-group-shimbun-server-history))
         (group (completing-read
                 "Group name: "
-                (mapcar (lambda (elem) (list elem))
-                        (cdr (assq 'groups
-                                   (cdr (assoc server nnshimbun-type-definition)))))
+                (mapcar
+                 'list
+                 (cdr (assq 'groups
+                            (cdr (assoc server nnshimbun-type-definition)))))
                 nil t nil))
         (nnshimbun-pre-fetch-article nil))
-    (gnus-group-make-group group `(nnshimbun ,server))))
+    (gnus-group-make-group group (list 'nnshimbun server))))
 
 (defun gnus-group-make-archive-group (&optional all)
   "Create the (ding) Gnus archive group of the most recent articles.

diff --git a/lisp/gnus-offline.el b/lisp/gnus-offline.el
index 67edad9..0e4d1a2 100644 (file)
--- a/lisp/gnus-offline.el
+++ b/lisp/gnus-offline.el
@@ -882,13 +882,16 @@ Please check your .emacs or .gnus.el to work nnspool fine.")
          (funcall func))))))
 
 (defun gnus-offline-get-menu-items (list)
-  (mapcar
-   #'(lambda (el)
-       (if (listp el)
-          (apply 'vector
-                 (cons (gnus-offline-gettext (car el)) (cdr el)))
-        el))
-   list))
+  (let (result)
+    (dolist (elem list)
+      (setq result
+           (nconc result
+                  (list (if (listp elem)
+                            (progn
+                              (setcar elem (gnus-offline-gettext (car elem)))
+                              (vconcat elem))
+                          elem)))))
+    result))
 
 (defvar gnus-offline-menu
   (gnus-offline-get-menu-items

diff --git a/lisp/gnus-vers.el b/lisp/gnus-vers.el
index 22cc977..113952e 100644 (file)
--- a/lisp/gnus-vers.el
+++ b/lisp/gnus-vers.el
@@ -1,6 +1,6 @@
 ;;; gnus-vers.el --- Declare gnus version.
 
-;; Copyright (C) 2000 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2001 Free Software Foundation, Inc.
 
 ;; Author: Keiichi Suzuki <keiichi@nanap.org>
 ;;         Katsumi Yamaoka <yamaoka@jpl.org>
@@ -34,7 +34,7 @@
 (require 'product)
 (provide 'gnus-vers)
 
-(defconst gnus-revision-number "08"
+(defconst gnus-revision-number "09"
   "Revision number for this version of gnus.")
 
 ;; Product information of this gnus.