diary-float fails if month is a list

[Tim Hesterberg]

In GNU Emacs 20.5.1 (i386-redhat-linux-gnu, X toolkit)
 of Mon Feb 21 2000 on porky.devel.redhat.com
configured using `configure  --prefix=/usr --libexecdir=/usr/lib 
--sharedstatedir=/var --with-gcc --with-pop --with-x-toolkit 
i386-redhat-linux-gnu'

I'm using a version of diary-lib.el with these copyrights:
;; Copyright (C) 1989, 1990, 1992, 1993, 1994, 1995 Free Software
(I believe this came with emacs 20.5.1.)

-------------------------------------------------

I'm trying to including a like the following in ~/diary
%%(diary-float '(1 3 5 7 9 11) 2 2)     Conservation Committee meeting

Note that month is a list (odd-numbered months), which should be allowed.
However, this causes an error.

I believe that I've tracked it down to diary-float, which includes
code like the following:

                      (or (and (listp month) (memq m1 month))
                          (eq month t)
                          (= m1 month))

If month is a list, and m1 is not contained in the list, then
        (= m1 month)
fails with 
Wrong type argument: number-or-marker-p, (1 3 5 7 9 11)


I believe that should be changed to e.g.:
                      (or (eq month t)
                          (if (listp month) (memq m1 month)
                            (= m1 month)))

That change should be made twice.


Similarly, 
                       (and (or (and (listp month) (memq m2 month))
                                (eq month t)
                                (= m2 month))
should be changed to:
                       (and (or (eq month t)
                                (if (listp month) (memq m2 month)
                                  (= m2 month)))


Tim Hesterberg