X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fgnus-diary.el;h=54b51d3f71cd20fa148b029fd23266be5b691274;hb=616c79ae92d01c52aa4f85be8d5a38dacb483e93;hp=ecd38450a40a7a70464958c344dc6957d52bcf0c;hpb=b992b03a0d0d353f02aa8f65bde32ad2f45f43a3;p=elisp%2Fgnus.git-

diff --git a/lisp/gnus-diary.el b/lisp/gnus-diary.el
index ecd3845..54b51d3 100644
--- a/lisp/gnus-diary.el
+++ b/lisp/gnus-diary.el
@@ -1,24 +1,24 @@
 ;;; gnus-diary.el --- Wrapper around the NNDiary Gnus backend
 
-;; Copyright (C) 1999-2001 Didier Verna.
+;; Copyright (c) 2001, 2002 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2001 Didier Verna.
 
 ;; 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)
-;; Last Revision: Wed Sep 12 12:31:09 2001
+;; Created:       Tue Jul 20 10:42:55 1999
 ;; Keywords:      calendar mail news
 
-;; This file is part of NNDiary.
+;; This file is part of GNU Emacs.
 
-;; NNDiary 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.
+;; GNU Emacs 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,
-;; 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.
+;; GNU Emacs 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.
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program; if not, write to the Free Software
@@ -136,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)
@@ -254,7 +265,7 @@ There are currently two built-in format functions:
 	 (o1 (nndiary-next-occurence s1 now))
 	 (o2 (nndiary-next-occurence s2 now)))
     (if (and (= (car o1) (car o2)) (= (cadr o1) (cadr o2)))
-        (< (mail-header-number h1) (mail-header-number h2))
+	(< (mail-header-number h1) (mail-header-number h2))
       (time-less-p o1 o2))))
 
 
@@ -268,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.
 ;; The function `easy-menu-add-item' is not available under Emacs
 ;; versions prior to 20.3.  Could anyone try to emulate it?
 (if (eval-when-compile
@@ -346,14 +356,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
   )
@@ -424,16 +426,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 ()