lisp/ChangeLog addition:

2001-09-17  Didier Verna  <didier@xemacs.org>

	* nndiary.el: version 0.2-b14.
	* gnus-diary.el (gnus-diary-check-message): fix `read-string'
	compatibility problem with XEmacs 21.1.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e71e295..6b8dffb 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2001-09-17  Didier Verna  <didier@xemacs.org>
+
+       * nndiary.el: version 0.2-b14.
+       * gnus-diary.el (gnus-diary-check-message): fix `read-string'
+       compatibility problem with XEmacs 21.1.
+
 2001-09-15  Simon Josefsson  <jas@extundo.com>
 
        * gnus-group.el (gnus-group-line-format): Document %c.
@@ -16,7 +22,7 @@
        character before we wanted (never included last character).
        (gnus-tilde-max-form, gnus-tilde-cut-form) Made readable again,
        add missing "," (once per function)
-       
+
 2001-09-14  Simon Josefsson  <jas@extundo.com>
 
        * gnus-start.el (gnus-group-mode-hook): Moved from gnus-group

diff --git a/lisp/gnus-diary.el b/lisp/gnus-diary.el
index 60df29c..2e434c6 100644 (file)
--- a/lisp/gnus-diary.el
+++ b/lisp/gnus-diary.el
@@ -2,22 +2,20 @@
 
 ;; Copyright (C) 1999-2001 Didier Verna.
 
-;; PRCS: $Id: gnus-diary.el,v 1.2 2001/09/12 14:17:15 didier Exp $
-
 ;; Author:        Didier Verna <didier@xemacs.org>
 ;; Maintainer:    Didier Verna <didier@xemacs.org>
-;; Created:       Tue Jul 20 10:42:55 1999 under XEmacs 21.2 (beta 18)
+;; Created:       Tue Jul 20 10:42:55 1999
 ;; Last Revision: Wed Sep 12 12:31:09 2001
 ;; Keywords:      calendar mail news
 
-;; This file is part of NNDiary.
+;; This file is part of Gnus.
 
-;; NNDiary is free software; you can redistribute it and/or modify
+;; Gnus is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2 of the License, or
 ;; (at your option) any later version.
 
-;; NNDiary is distributed in the hope that it will be useful,
+;; Gnus is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.
@@ -138,6 +136,17 @@ There are currently two built-in format functions:
   "Current Diary backend version.")
 
 
+;; Compatibility functions ==================================================
+
+(eval-and-compile
+  (if (fboundp 'kill-entire-line)
+      (defalias 'gnus-diary-kill-entire-line 'kill-entire-line)
+    (defun gnus-diary-kill-entire-line ()
+      (beginning-of-line)
+      (let ((kill-whole-line t))
+       (kill-line)))))
+
+
 ;; Summary line format ======================================================
 
 (defun gnus-diary-delay-format-french (past delay)
@@ -270,8 +279,7 @@ Optional prefix (or REVERSE argument) means sort in reverse order."
   (interactive "P")
   (gnus-summary-sort 'schedule reverse))
 
-(defvar gnus-summary-misc-menu)
-
+(defvar gnus-summary-misc-menu) ;; Avoid byte compiler warning.
 (add-hook 'gnus-summary-menu-hook
          (lambda ()
            (easy-menu-add-item gnus-summary-misc-menu
@@ -339,14 +347,6 @@ Optional prefix (or REVERSE argument) means sort in reverse order."
 
 ;; Diary Message Checking ===================================================
 
-(eval-and-compile
-  (if (fboundp 'kill-entire-line)
-      (defalias 'gnus-diary-kill-entire-line 'kill-entire-line)
-    (defun gnus-diary-kill-entire-line ()
-      (beginning-of-line)
-      (let ((kill-whole-line t))
-       (kill-line)))))
-
 (defvar gnus-diary-header-value-history nil
   ;; History variable for header value prompting
   )
@@ -417,16 +417,14 @@ If ARG (or prefix) is non-nil, force prompting for all fields."
           (let ((prompt (concat (and invalid
                                      (prog1 "(current value invalid) "
                                        (beep)))
-                                header
-                                (and (not value) " (defaults to `*')")
-                                ": ")))
+                                header ": ")))
             (setq value
                   (if (listp (nth 1 head))
                       (completing-read prompt (cons '("*" nil) (nth 1 head))
                                        nil t value
-                                       gnus-diary-header-value-history "*")
+                                       gnus-diary-header-value-history)
                     (read-string prompt value
-                                 gnus-diary-header-value-history "*"))))
+                                 gnus-diary-header-value-history))))
           (setq ask nil)
           (setq invalid nil)
           (condition-case ()

diff --git a/lisp/nndiary.el b/lisp/nndiary.el
index f94bfe3..309365e 100644 (file)
--- a/lisp/nndiary.el
+++ b/lisp/nndiary.el
@@ -2,22 +2,20 @@
 
 ;; Copyright (C) 1999-2001 Didier Verna.
 
-;; PRCS: $Id: nndiary.el 1.26 Wed, 12 Sep 2001 15:23:27 +0200 didier $
-
 ;; Author:        Didier Verna <didier@xemacs.org>
 ;; Maintainer:    Didier Verna <didier@xemacs.org>
 ;; Created:       Fri Jul 16 18:55:42 1999
 ;; Last Revision: Wed Aug  8 17:36:21 2001
 ;; Keywords:      calendar mail news
 
-;; This file is part of NNDiary.
+;; This file is part of Gnus.
 
-;; NNDiary is free software; you can redistribute it and/or modify
+;; Gnus is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2 of the License, or
 ;; (at your option) any later version.
 
-;; NNDiary is distributed in the hope that it will be useful,
+;; Gnus is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.
@@ -365,25 +363,7 @@ all.  This may very well take some time.")
 
 \f
 
-;; $Format: "(defconst nndiary-prcs-major-version \"$ProjectMajorVersion$\")"$
-(defconst nndiary-prcs-major-version "branch-0-2")
-;; $Format: "(defconst nndiary-prcs-minor-version \"$ProjectMinorVersion$\")"$
-(defconst nndiary-prcs-minor-version "13")
-(defconst nndiary-version
-  (let ((level nndiary-prcs-minor-version)
-       major minor status)
-    (string-match "\\(branch\\|version\\)-\\([0-9]+\\)-\\([0-9]+\\)"
-                 nndiary-prcs-major-version)
-    (setq major (match-string 2 nndiary-prcs-major-version)
-         minor (match-string 3 nndiary-prcs-major-version)
-         status (match-string 1 nndiary-prcs-major-version))
-    (cond ((string= status "version")
-          (setq level (int-to-string (1- (string-to-int level))))
-          (if (eq level 0)
-              (concat major "." minor)
-            (concat major "." minor "." level)))
-         ((string= status "branch")
-          (concat major "." minor "-b" level))))
+(defconst nndiary-version "0.2-b14"
   "Current Diary backend version.")
 
 (defun nndiary-version ()