CVS update by jmiller packages/xemacs-packages/calendar, lunar.el ...
User: jmiller
Date: 06/07/31 04:38:10
Modified: packages/xemacs-packages/calendar ChangeLog cal-xemacs.el
lunar.el
Log:
really commit lunar.el
cal-xemacs - fix name of file in menu
Revision Changes Path
1.31 +9 -0 XEmacs/packages/xemacs-packages/calendar/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/calendar/ChangeLog,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- ChangeLog 2006/07/31 02:05:23 1.30
+++ ChangeLog 2006/07/31 02:38:09 1.31
＠＠ -1,5 +1,14 ＠＠
2006-07-30 Jeff Miller <jeff.miller(a)xemacs.org>
+ Add some 21.4 syncs I missed earlier
+
+ * cal-menu.el (calendar-mouse-view-other-diary-entries): Fix name
+ of file in header of menu. Showed name of diary file, not
+ other diary file. Fixed typo in "from".
+ * lunar.el: really do the checkin
+
+2006-07-30 Jeff Miller <jeff.miller(a)xemacs.org>
+
* Makefile (REQUIRES): added ibuffer & fsf-compat
* Makefile (ELCS): added timelock.elc & todo-mode.elc
* appt.el: Synced with Emacs 21.4
1.7 +12 -7 XEmacs/packages/xemacs-packages/calendar/cal-xemacs.el
Index: cal-xemacs.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/calendar/cal-xemacs.el,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- cal-xemacs.el 2006/07/31 02:15:23 1.6
+++ cal-xemacs.el 2006/07/31 02:38:09 1.7
＠＠ -337,16 +337,21 ＠＠ ERROR is t, otherwise just returns nil."
(interactive)
(save-excursion
(let* ((date (calendar-event-to-date))
+ (diary-list-include-blanks nil)
+ (diary-display-hook 'ignore)
+ (diary-file (read-file-name
+ "Enter diary file name: "
+ default-directory nil t))
+ ; The following doesn't really do the right thing. The problem is
+ ; that a newline in the diary entry does not give a newline in a
+ ; pop-up menu; for that you need a separate list item. When the (car
+ ; (cdr x)) contains newlines, the item should be split into a list of
+ ; items. Too minor and messy to worry about.
(l (mapcar '(lambda (x) (concat (car (cdr x)) ""))
- (let ((diary-list-include-blanks nil)
- (diary-display-hook 'ignore)
- (diary-file (read-file-name
- "Enter diary file name: "
- default-directory nil t)))
- (list-diary-entries date 1))))
+ (list-diary-entries date 1)))
(menu
(cons
- (format "Diary Entries form %s for %s"
+ (format "Diary Entries from %s for %s"
diary-file
(calendar-date-string date))
(if l l '("None")))))
1.5 +3 -3 XEmacs/packages/xemacs-packages/calendar/lunar.el
Index: lunar.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/calendar/lunar.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- lunar.el 2000/01/08 17:45:58 1.4
+++ lunar.el 2006/07/31 02:38:09 1.5
＠＠ -1,4 +1,4 ＠＠
-;;; lunar.el --- calendar functions for phases of the moon.
+;;; lunar.el --- calendar functions for phases of the moon
;; Copyright (C) 1992, 1993, 1995, 1997 Free Software Foundation, Inc.
＠＠ -23,7 +23,7 ＠＠
;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
;; Boston, MA 02111-1307, USA.
-;;; Synched up with: FSF 20.5
+;;; Synched up with: FSF-21.4
;;; Commentary:
＠＠ -53,7 +53,7 ＠＠
(if (fboundp 'atan)
(require 'lisp-float-type)
- (error "Lunar calculations impossible since floating point is
unavailable."))
+ (error "Lunar calculations impossible since floating point is unavailable"))
(require 'solar)