User: jmiller Date: 06/07/31 04:15:27 Modified: packages/xemacs-packages/calendar Makefile appt.el cal-china.el cal-coptic.el cal-dst.el cal-french.el cal-hebrew.el cal-islam.el cal-iso.el cal-julian.el cal-mayan.el cal-move.el cal-persia.el cal-tex.el cal-x.el cal-xemacs.el calendar.el diary-lib.el holidays.el package-info.in solar.el Added: packages/xemacs-packages/calendar timeclock.el todo-mode.el Log: sync with Emacs 21.4 Revision Changes Path 1.30 +3 -3 XEmacs/packages/xemacs-packages/calendar/Makefile Index: Makefile =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/calendar/Makefile,v retrieving revision 1.29 retrieving revision 1.30 diff -u -p -r1.29 -r1.30 --- Makefile 2006/07/27 14:15:05 1.29 +++ Makefile 2006/07/31 02:15:22 1.30 ＠＠ -22,7 +22,7 ＠＠ AUTHOR_VERSION = MAINTAINER = Jeff Miller <jeff.miller(a)xemacs.org&gt; PACKAGE = calendar PKG_TYPE = regular -REQUIRES = xemacs-base +REQUIRES = xemacs-base ibuffer fsf-compat CATEGORY = standard include ../../Local.rules.inc ＠＠ -30,8 +30,8 ＠＠ include ../../Local.rules.inc ELCS = appt.elc cal-dst.elc cal-french.elc cal-mayan.elc cal-x.elc \ cal-xemacs.elc calendar.elc diary-lib.elc holidays.elc cal-tex.elc \ cal-hebrew.elc cal-islam.elc cal-iso.elc cal-move.elc cal-persia.elc\ - cal-china.elc cal-coptic.elc cal-julian.elc lunar.elc solar.elc - + cal-china.elc cal-coptic.elc cal-julian.elc lunar.elc solar.elc \ + todo-mode.elc timeclock.elc ifeq ($(BUILD_WITHOUT_MULE),) ELCS += cal-japanese.elc 1.10 +418 -336 XEmacs/packages/xemacs-packages/calendar/appt.el Index: appt.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/calendar/appt.el,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- appt.el 2004/01/27 18:17:11 1.9 +++ appt.el 2006/07/31 02:15:22 1.10 ＠＠ -1,4 +1,4 ＠＠ -;;; appt.el --- appointment notification functions. +;;; appt.el --- appointment notification functions ;; Keywords: calendar ;; Copyright (C) 1989, 1990, 1994, 1998 Free Software Foundation, Inc. ＠＠ -24,26 +24,12 ＠＠ ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. -;;; 29-nov-89 created by Neil Mager <neilm(a)juliet.ll.mit.edu&gt;. -;;; 23-feb-91 hacked upon by Jamie Zawinski <jwz(a)lucid.com&gt;. -;;; 1-apr-91 some more. -;;; 12-jul-95 updated for XEmacs 19.12 by Greg Veres -;;; <gveres(a)cgl.uwaterloo.ca&gt; -;;; 21-mar-97 better support for fancy diary display by Tomasz J. Cholewo -;;; <t.cholewo(a)ieee.org&gt; -;;; ;;; Commentary: ;; ;; appt.el - visible and/or audible notification of ;; appointments from ~/diary file. ;; -;; Version 2.1 -;; -;; Comments, corrections, and improvements should be sent to -;; Neil M. Mager -;; Net <neilm(a)juliet.ll.mit.edu&gt; -;; Voice (617) 981-4803 ;;; ;;; Thanks to Edward M. Reingold for much help and many suggestions, ;;; And to many others for bug fixes and suggestions. ＠＠ -52,8 +38,8 ＠＠ ;;; This functions in this file will alert the user of a ;;; pending appointment based on their diary file. ;;; -;;; ******* It is necessary to invoke 'display-time' and ******** -;;; ******* 'appt-initialize' for this to work properly. ******** +;;; ******* It is necessary to invoke 'appt-initialize' for this +;;; ******* to work properly. ;;; ;;; A message will be displayed in the mode line of the Emacs buffer ;;; and (if you request) the terminal will beep and display a message ＠＠ -83,7 +69,6 ＠＠ ;;; .emacs file: ;;; ;;; (require 'appt) -;;; (display-time) ;;; (appt-initialize) ;;; ;;; If you wish to see a list of appointments, or a full calendar, when emacs ＠＠ -175,21 +160,24 ＠＠ as the first thing on a line." :type 'boolean :group 'appt) -(defcustom appt-msg-countdown-list '(20 15 10 5 3 1) - "*A list of the intervals in minutes before the appointment when - the warnings will be given. That is, if this were the list '(5 3 1), - then a notification would be given five minutes, three minutes, and - one minute before the appointment." -:type '(repeat integer) +;;;###autoload +(defcustom appt-message-warning-time 12 + "*Time in minutes before an appointment that the warning begins." +:type 'integer :group 'appt) -(defcustom appt-check-time-syntax nil - "*Whether all diary entries are intended to begin with time specifications. -Appt will beep and issue a warning message when encountering unparsable -lines." +;;;###autoload +(defcustom appt-audible t + "*Non-nil means beep to indicate appointment." :type 'boolean :group 'appt) - + +;;;###autoload +(defcustom appt-visible t + "*Non-nil means display appointment message in echo area." +:type 'boolean +:group 'appt) + ;;;###autoload (defcustom appt-audible t "*Controls whether appointment announcements should beep. ＠＠ -208,12 +196,24 ＠＠ See also the variable `appt-msg-countdow :group 'appt) ;;;###autoload +(defcustom appt-msg-window t + "*Non-nil means display appointment message in another window." +:type 'boolean +:group 'appt) + +;;;###autoload (defcustom appt-display-duration 10 - "*The number of seconds an appointment message is displayed in its own - window if appt-announce-method is 'appt-window-announce." + "*The number of seconds an appointment message is displayed." :type 'integer :group 'appt) +;;;###autoload +(defcustom appt-display-diary t + "*Non-nil means to display the next days diary on the screen. +This will occur at midnight when the appointment list is updated." +:type 'boolean +:group 'appt) + (defcustom appt-announce-method 'appt-window-announce "*The name of the function used to notify the user of an impending appointment. This is called with two arguments, the number of minutes ＠＠ -239,12 +239,6 ＠＠ The number before each time/message is t (defconst appt-max-time 1439 "11:59pm in minutes - number of minutes in a day minus 1.") - -(defconst appt-check-tick -1) - -(defvar appt-disp-frame nil - "If non-nil, frame to display appointments in.") -(defvaralias 'appt-disp-screen 'appt-disp-frame)  ;;; Announcement methods ＠＠ -283,12 +277,14 ＠＠ messages stay around even if you type so (message "%s" str)) )) +(defcustom appt-display-interval 3 + "*Number of minutes to wait between checking the appointment list." +:type 'integer +:group 'appt) + (defvar appt-buffer-name " *appt-buf*" "Name of the appointments buffer.") -(defvar appt-frame-defaults nil) -(defvaralias 'appt-screen-defaults 'appt-frame-defaults) - (defun appt-frame-announce (min-to-app appt) "Set appt-announce-method to the name of this function to cause appointment notifications to be given via messages in a pop-up frame." ＠＠ -420,24 +416,6 ＠＠ changing the variable `diary-include-str (sleep-for 2)))) (goto-char (point-min))) -(defun appt-initialize () - "Read your `diary-file' and remember today's appointments. Call this from - your .emacs file, or any time you want your .diary file re-read (this happens - automatically at midnight to notice the next day's appointments). - - The time must be at the beginning of a line for it to be put in the - appointments list. - 02/23/89 - 12:00pm lunch - Wednesday - 10:00am group meeting" - (install-display-time-hook) - (let ((n (length (appt-diary-entries)))) - (cond ((= n 0) (message "no appointments today.")) - ((= n 1) (message "1 appointment today.")) - (t (message "%d appointments today." n))))) - - (defun appt-beep (&optional final-p) (cond ((null appt-audible) nil) ((numberp appt-audible) ＠＠ -455,7 +433,24 ＠＠ changing the variable `diary-include-str (setq i (1- i))))) (t (beep)))) +(defvar appt-disp-window-function 'appt-disp-window + "Function called to display appointment window.") + +(defvar appt-delete-window-function 'appt-delete-window + "Function called to remove appointment window and buffer.") + +(defvar appt-mode-string nil + "String being displayed in the mode line saying you have an appointment. +The actual string includes the amount of time till the appointment.") + +(defvar appt-prev-comp-time nil + "Time of day (mins since midnight) at which we last checked appointments.") + +(defvar appt-now-displayed nil + "Non-nil when we have started notifying about a appointment that is near.") +(defvar appt-display-count nil) + (defun appt-check () "Check for an appointment and update the mode line and minibuffer if desired. ＠＠ -470,20 +465,45 ＠＠ Example: Thursday 11:45am Lunch meeting. - + +Appointments are checked every `appt-display-interval' minutes. The following variables control appointment notification: `appt-issue-message' If t, the diary buffer is checked for appointments. +`appt-message-warning-time' + Variable used to determine if appointment message + should be displayed. + `appt-audible' Variable used to determine if appointment is audible. Default is t. +`appt-visible' + Variable used to determine if appointment message should be + displayed in the mini-buffer. Default is t. + +`appt-msg-window' + Variable used to determine if appointment message + should temporarily appear in another window. Mutually exclusive + to `appt-visible'. + `appt-display-duration' The number of seconds an appointment message is displayed in another window. +`appt-disp-window-function' + Function called to display appointment window. You can customize + appt.el by setting this variable to a function different from the + one provided with this package. + +`appt-delete-window-function' + Function called to remove appointment window and buffer. You can + customize appt.el by setting this variable to a function different + from the one provided with this package. + + appt-msg-countdown-list Specifies how much warning you want before appointments. appt-display-mode-line Whether to display a countdown to the next ＠＠ -492,180 +512,210 ＠＠ The following variables control appointm 'appt-window-announce to do it in a pop-up window, 'appt-message-announce or 'appt-persistent-message-announce to do it - in the echo-area. + in the echo-area." + + (let* ((min-to-app -1) + (new-time "") + (prev-appt-mode-string appt-mode-string) + (prev-appt-display-count (or appt-display-count 0)) + ;; Non-nil means do a full check for pending appointments + ;; and display in whatever ways the user has selected. + ;; When no appointment is being displayed, + ;; we always do a full check. + (full-check + (or (not appt-now-displayed) + ;; This is true every appt-display-interval minutes. + (= 0 (mod prev-appt-display-count appt-display-interval)))) + ;; Non-nil means only update the interval displayed in the mode line. + (mode-line-only + (and (not full-check) appt-now-displayed))) + + (when (or full-check mode-line-only) + (save-excursion + + ;; Get the current time and convert it to minutes + ;; from midnight. ie. 12:01am = 1, midnight = 0. + + (let* ((now (decode-time)) + (cur-hour (nth 2 now)) + (cur-min (nth 1 now)) + (cur-comp-time (+ (* cur-hour 60) cur-min))) + + ;; At the first check in any given day, update our + ;; appointments to today's list. - This function is run from the `loadst' or `wakeup' process for display-time. - Therefore, you need to have `(display-time)' in your .emacs file." - (if appt-issue-message - (let ((min-to-app -1)) - ;; Get the current time and convert it to minutes - ;; from midnight. i.e., 12:01am = 1, midnight = 0. - - (let* ((now (decode-time)) - (cur-hour (nth 2 now)) - (cur-min (nth 1 now)) - (cur-comp-time (+ (* cur-hour 60) cur-min)) - - ;; At the first check in any given day, update our - ;; appointments to today's list. - - ;; If the current time is the same as the tick, just return. - ;; This means that this function has been called more than once - ;; in the current minute, which is not useful. - (shut-up-this-time (= cur-comp-time appt-check-tick)) - (turnover-p (> appt-check-tick cur-comp-time))) - (setq appt-check-tick cur-comp-time) - ;; - ;; If it is now the next day (we have crossed midnight since the last - ;; time this was called) then we should update our appointments to - ;; today's list. Show the diary entries (tjc). - (if turnover-p (progn (appt-diary-entries) (diary 1))) - ;; + (if (or (null appt-prev-comp-time) + (< cur-comp-time appt-prev-comp-time)) + (condition-case nil + (progn + (if (and view-diary-entries-initially appt-display-diary) + (diary) + (let ((diary-display-hook 'appt-make-list)) + (diary)))) + (error nil))) + (setq appt-prev-comp-time cur-comp-time) + + (setq appt-mode-string nil) + (setq appt-display-count nil) + ;; If there are entries in the list, and the ;; user wants a message issued, ;; get the first time off of the list ;; and calculate the number of minutes until the appointment. - (if (and appt-issue-message appt-time-msg-list) - (let ((appt-comp-time (car (car (car appt-time-msg-list))))) - (setq min-to-app (- appt-comp-time cur-comp-time)) - - (while (and appt-time-msg-list - (< appt-comp-time cur-comp-time)) - (setq appt-time-msg-list (cdr appt-time-msg-list)) - (if appt-time-msg-list - (setq appt-comp-time - (car (car (car appt-time-msg-list)))))) - ;; + (if (and appt-issue-message appt-time-msg-list) + (let ((appt-comp-time (car (car (car appt-time-msg-list))))) + (setq min-to-app (- appt-comp-time cur-comp-time)) + + (while (and appt-time-msg-list + (< appt-comp-time cur-comp-time)) + (setq appt-time-msg-list (cdr appt-time-msg-list)) + (if appt-time-msg-list + (setq appt-comp-time + (car (car (car appt-time-msg-list)))))) + ;; If we have an appointment between midnight and - ;; warning-time minutes after midnight, we must begin - ;; to issue a message before midnight. Midnight is - ;; considered 0 minutes and 11:59pm is 1439 - ;; minutes. Therefore we must recalculate the minutes - ;; to appointment variable. It is equal to the number - ;; of minutes before midnight plus the number of + ;; 'appt-message-warning-time' minutes after midnight, + ;; we must begin to issue a message before midnight. + ;; Midnight is considered 0 minutes and 11:59pm is + ;; 1439 minutes. Therefore we must recalculate the minutes + ;; to appointment variable. It is equal to the number of + ;; minutes before midnight plus the number of ;; minutes after midnight our appointment is. - ;; - ;; ## I don't think this does anything -- it would if - ;; it were (for example) a 12:01am appt on the list at - ;; 11:55pm, but that can't ever happen, because the - ;; applicable 12:01am appt is for tomorrow, not today, - ;; and we only have today's diary list. It's not - ;; simply a matter of concatenating two days together, - ;; either, because then tuesday's appts would be - ;; signalled on monday. We have to do a real one-day - ;; lookahead -- keep a list of tomorrow's appts, and - ;; check it when near midnight. - ;; - (if (and (< appt-comp-time - (apply 'max appt-msg-countdown-list)) - (> (+ cur-comp-time - (apply 'max appt-msg-countdown-list)) + + (if (and (< appt-comp-time appt-message-warning-time) + (> (+ cur-comp-time appt-message-warning-time) appt-max-time)) - (setq min-to-app (+ (- (1+ appt-max-time) cur-comp-time) - appt-comp-time))) - ;; - ;; issue warning if the appointment time is within warning-time - (cond - ;; if there should not be any notifications in the mode-line, - ;; clear it. - ((> min-to-app (apply 'max appt-msg-countdown-list)) - (appt-display-mode-line nil)) - ;; do nothing if this is the second time this minute we've - ;; gotten here, of if we shouldn't be notifying right now. - ((or shut-up-this-time - (and (not (= min-to-app 0)) - (not (memq min-to-app appt-msg-countdown-list)))) - nil) - - ((and (= min-to-app 0) - (string-match "%%(" (nth 1 (car appt-time-msg-list)))) - ;; - ;; If this is a magic evaluating-notification, evaluate it. - ;; these kinds of notifications aren't subject to the - ;; appt-msg-countdown-list. - ;; - (let* ((list-string (substring (nth 1 (car appt-time-msg-list)) - (1- (match-end 0)))) - (form (condition-case () - (read list-string) - (error - (ding) - (message "Appt: error reading from \"%s\"" - (nth 1 (car appt-time-msg-list))) - (sit-for 2) - nil)))) - (eval form))) - ;; issue warning if the appointment time is - ;; within appt-message-warning time - ((and (<= min-to-app (apply 'max appt-msg-countdown-list)) - (>= min-to-app 0)) - ;; - ;; produce a notification. - (appt-beep (= min-to-app 0)) - (funcall appt-announce-method min-to-app - (car appt-time-msg-list)) - ;; update mode line and expire if necessary - (appt-display-mode-line min-to-app) + (setq min-to-app (+ (- (1+ appt-max-time) cur-comp-time)) + appt-comp-time)) + + ;; issue warning if the appointment time is + ;; within appt-message-warning time + + (when (and (<= min-to-app appt-message-warning-time) + (>= min-to-app 0)) + (setq appt-now-displayed t) + (setq appt-display-count + (1+ prev-appt-display-count)) + (unless mode-line-only + (if appt-msg-window + (progn + (setq new-time (format-time-string "%a %b %e " + (current-time))) + (funcall + appt-disp-window-function + (number-to-string min-to-app) new-time + (car (cdr (car appt-time-msg-list)))) + + (run-at-time + (format "%d sec" appt-display-duration) + nil + appt-delete-window-function)) + ;;; else + + (if appt-visible + (message "%s" + (car (cdr (car appt-time-msg-list))))) + + (if appt-audible + (beep 1)))) + + (when appt-display-mode-line + (setq appt-mode-string + (concat " App't in " + (number-to-string min-to-app) + " min. "))) + ;; When an appointment is reached, ;; delete it from the list. ;; Reset the count to 0 in case we display another ;; appointment on the next cycle. - (if (= min-to-app 0) - (setq appt-time-msg-list + (if (= min-to-app 0) + (setq appt-time-msg-list (cdr appt-time-msg-list) - ))) - (t - ;; else we're not near any appointment, or there are no - ;; apointments; make sure mode line is clear. - (appt-display-mode-line nil)))) - (appt-display-mode-line nil)))))) + appt-display-count nil))))) + + ;; If we have changed the mode line string, + ;; redisplay all mode lines. + (and appt-display-mode-line + (not (equal appt-mode-string + prev-appt-mode-string)) + (progn + (force-mode-line-update t) + ;; If the string now has a notification, + ;; redisplay right now. + (if appt-mode-string + (sit-for 0))))))))) + +;;(defun appt-window-announce (min-to-app appt) +;; "Set appt-announce-method to the name of this function to cause appointment +;;notifications to be given via messages in a pop-up window. The variable +;;appt-display-duration controls how long this window should be left up." -(defun appt-window-announce (min-to-app appt) - "Set appt-announce-method to the name of this function to cause appointment -notifications to be given via messages in a pop-up window. The variable -appt-display-duration controls how long this window should be left up." +(defun appt-disp-window (min-to-app new-time appt-msg) + "Display appointment message APPT-MSG in a separate buffer." (require 'electric) - (save-excursion - (save-window-excursion - - ;; Make sure we're not in the minibuffer - ;; before splitting the window. - (if (window-minibuffer-p (selected-window)) - nil - (select-window (frame-lowest-window)) - (split-window)) - (let (appt-disp-buf) - (unwind-protect - (progn - (setq appt-disp-buf (set-buffer (get-buffer-create appt-buffer-name))) - ;; set the mode-line of the pop-up window - (setq modeline-format - (concat "-------------------- Appointment " - (if (eq min-to-app 0) - "NOW" - (concat "in " (format "%s" min-to-app) - (if (eq min-to-app 1) " minute" " minutes"))) - ". (" - (let ((h (string-to-int - (substring (current-time-string) 11 13)))) - (concat (if (> h 12) (format "%s" (- h 12)) - (format "%s" h)) ":" - (substring (current-time-string) 14 16) - (if (< h 12) "am" "pm"))) - ") %-")) - (pop-to-buffer appt-disp-buf) - (insert (car (cdr appt))) - (shrink-window-if-larger-than-buffer (get-buffer-window appt-disp-buf)) - (set-buffer-modified-p nil) - (sit-for appt-display-duration)) - (and appt-disp-buf (kill-buffer appt-disp-buf))))))) + + ;; Make sure we're not in the minibuffer + ;; before splitting the window. + + (if (equal (selected-window) (minibuffer-window)) + (if (other-window 1) + (select-window (other-window 1)) + (if (display-multi-frame-p) + (select-frame (other-frame 1))))) + + (let* ((this-buffer (current-buffer)) + (this-window (selected-window)) + (appt-disp-buf (set-buffer (get-buffer-create appt-buffer-name)))) + + (if (cdr (assq 'unsplittable (frame-parameters))) + ;; In an unsplittable frame, use something somewhere else. + (display-buffer appt-disp-buf) + ;; (unless (or (special-display-p (buffer-name appt-disp-buf)) + ;; (same-window-p (buffer-name appt-disp-buf))) + ;; By default, split the bottom window and use the lower part. + (appt-select-lowest-window) + (split-window) + ;;) + (pop-to-buffer appt-disp-buf)) + (setq mode-line-format + (concat "-------------------- Appointment in " + min-to-app " minutes. " new-time " %-")) + (erase-buffer) + (insert-string appt-msg) + (shrink-window-if-larger-than-buffer (get-buffer-window appt-disp-buf t)) + (set-buffer-modified-p nil) + (raise-frame (selected-frame)) + (select-window this-window) + (if appt-audible + (beep 1)))) + +(defun appt-delete-window () + "Function called to undisplay appointment messages. +Usually just deletes the appointment buffer." + (let ((window (get-buffer-window appt-buffer-name t))) + (and window + (or (eq window (frame-root-window (window-frame window))) + (delete-window window)))) + (kill-buffer appt-buffer-name) + (if appt-audible + (beep 1))) + +(defun appt-select-lowest-window () +"Select the lowest window on the frame." + (let ((lowest-window (selected-window)) + (bottom-edge (nth 3 (window-pixel-edges)))) + (walk-windows (lambda (w) + (let ((next-bottom-edge (nth 3 (window-pixel-edges w)))) + (when (< bottom-edge next-bottom-edge) + (setq bottom-edge next-bottom-edge + lowest-window w))))) + (select-window lowest-window))) - -;;; Interactively adding and deleting appointments ;;;###autoload (defun appt-add (new-appt-time new-appt-msg) - "Add an appointment for the day at TIME and issue MESSAGE. + "Add an appointment for the day at NEW-APPT-TIME and issue message NEW-APPT-MSG. The time should be in either 24 hour format or am/pm format." (interactive "sTime (hh:mm[am/pm]): \nsMessage: ") ＠＠ -676,8 +726,7 ＠＠ The time should be in either 24 hour for (let* ((appt-time-string (concat new-appt-time " " new-appt-msg)) (appt-time (list (appt-convert-time new-appt-time))) (time-msg (cons appt-time (list appt-time-string)))) - (setq appt-time-msg-list (append appt-time-msg-list - (list time-msg))) + (setq appt-time-msg-list (nconc appt-time-msg-list (list time-msg))) (setq appt-time-msg-list (appt-sort-list appt-time-msg-list)))) ;;;###autoload ＠＠ -688,104 +737,119 ＠＠ The time should be in either 24 hour for (while tmp-msg-list (let* ((element (car tmp-msg-list)) (prompt-string (concat "Delete " - (prin1-to-string (car (cdr element))) + ;; We want to quote any doublequotes + ;; in the string, as well as put + ;; doublequotes around it. + (prin1-to-string + (substring-no-properties + (car (cdr element)) 0)) " from list? ")) (test-input (y-or-n-p prompt-string))) (setq tmp-msg-list (cdr tmp-msg-list)) (if test-input (setq appt-time-msg-list (delq element appt-time-msg-list))))) + (appt-check) (message "")))  -;; Create the appointments list from todays diary buffer. -;; The time must be at the beginning of a line for it to be -;; put in the appointments list. -;; 02/23/89 -;; 12:00pm lunch -;; Wednesday -;; 10:00am group meeting -;; We assume that the variables DATE and NUMBER -;; hold the arguments that list-diary-entries received. -;; They specify the range of dates that the diary is being processed for. - +(eval-when-compile (defvar number) + (defvar original-date) + (defvar diary-entries-list)) ;;;###autoload (defun appt-make-list () - "Don't call this directly; call appt-initialize or appt-diary-entries." - ;; Clear the appointments list, then fill it in from the diary. - (if diary-entries-list - - ;; Cycle through the entry-list (diary-entries-list) - ;; looking for entries beginning with a time. If - ;; the entry begins with a time, add it to the - ;; appt-time-msg-list. Then sort the list. - - (let ((entry-list diary-entries-list) - (new-appts '()) - (new-time-string "")) - ;; Skip diary entries for dates before today. - (while (and entry-list - (calendar-date-compare - (car entry-list) (list (calendar-current-date)))) - (setq entry-list (cdr entry-list))) - ;; Parse the entries for today. - (while (and entry-list - (calendar-date-equal - (calendar-current-date) (car (car entry-list)))) - (let ((time-string (car (cdr (car entry-list))))) - (while (string-match - "\\`[ \t\n]*\\([0-9]?[0-9]\\(:[0-9][0-9]\\)?[ \t]*\\(am\\|pm\\)?\\|noon\\|midnight\\|midnite\\).*$" - time-string) - (let* ((eol (match-end 0)) - (appt-time-string (substring time-string - (match-beginning 1) - (match-end 1))) - (appt-msg-string - (substring time-string (match-end 1) eol)) - (appt-time (list (appt-convert-time appt-time-string)))) - (setq time-string (substring time-string eol) - new-appts (cons (cons appt-time - (list (concat appt-time-string ":" - appt-msg-string))) - new-appts)))) - (if appt-check-time-syntax - (while (string-match "\n*\\([^\n]+\\)$" time-string) - (beep) - (message "Unparsable time: %s" - (substring time-string (match-beginning 1) - (match-end 1))) - (sit-for 3) - (setq time-string (substring time-string (match-end 0))))) - - ) - (setq entry-list (cdr entry-list))) - (setq appt-time-msg-list ; seems we can't nconc this list... - (append (nreverse new-appts) appt-time-msg-list)))) - (run-hooks 'appt-make-list-hook) - (setq appt-time-msg-list (appt-sort-list appt-time-msg-list)) - - ;; Get the current time and convert it to minutes - ;; from midnight, i.e., 12:01am = 1, midnight = 0, - ;; so that the elements in the list - ;; that are earlier than the present time can - ;; be removed. - - (let* ((now (decode-time)) + "Create the appointments list from todays diary buffer. +The time must be at the beginning of a line for it to be +put in the appointments list. + 02/23/89 + 12:00pm lunch + Wednesday + 10:00am group meeting +We assume that the variables DATE and NUMBER +hold the arguments that `list-diary-entries' received. +They specify the range of dates that the diary is being processed for." + + ;; We have something to do if the range of dates that the diary is + ;; considering includes the current date. + (if (and (not (calendar-date-compare + (list (calendar-current-date)) + (list original-date))) + (calendar-date-compare + (list (calendar-current-date)) + (list (calendar-gregorian-from-absolute + (+ (calendar-absolute-from-gregorian original-date) + number))))) + (save-excursion + ;; Clear the appointments list, then fill it in from the diary. + (setq appt-time-msg-list nil) + (if diary-entries-list + + ;; Cycle through the entry-list (diary-entries-list) + ;; looking for entries beginning with a time. If + ;; the entry begins with a time, add it to the + ;; appt-time-msg-list. Then sort the list. + + (let ((entry-list diary-entries-list) + (new-time-string "")) + ;; Skip diary entries for dates before today. + (while (and entry-list + (calendar-date-compare + (car entry-list) (list (calendar-current-date)))) + (setq entry-list (cdr entry-list))) + ;; Parse the entries for today. + (while (and entry-list + (calendar-date-equal + (calendar-current-date) (car (car entry-list)))) + (let ((time-string (cadr (car entry-list)))) + (while (string-match + "\\([0-9]?[0-9]:[0-9][0-9]\\(am\\|pm\\)?\\).*" + time-string) + (let* ((beg (match-beginning 0)) + ;; Get just the time for this appointment. + (only-time (match-string 1 time-string)) + ;; Find the end of this appointment + ;; (the start of the next). + (end (string-match + "^[ \t]*[0-9]?[0-9]:[0-9][0-9]\\(am\\|pm\\)?" + time-string + (match-end 0))) + ;; Get the whole string for this appointment. + (appt-time-string + (substring time-string beg (if end (1- end))))) + + ;; Add this appointment to appt-time-msg-list. + (let* ((appt-time (list (appt-convert-time only-time))) + (time-msg (list appt-time appt-time-string))) + (setq appt-time-msg-list + (nconc appt-time-msg-list (list time-msg)))) + + ;; Discard this appointment from the string. + (setq time-string + (if end (substring time-string end) ""))))) + (setq entry-list (cdr entry-list))))) + (run-hooks 'appt-make-list-hook) + (setq appt-time-msg-list (appt-sort-list appt-time-msg-list)) + ;; Get the current time and convert it to minutes + ;; from midnight. ie. 12:01am = 1, midnight = 0, + ;; so that the elements in the list + ;; that are earlier than the present time can + ;; be removed. + (let* ((now (decode-time)) (cur-hour (nth 2 now)) (cur-min (nth 1 now)) (cur-comp-time (+ (* cur-hour 60) cur-min)) (appt-comp-time (car (car (car appt-time-msg-list))))) + + (while (and appt-time-msg-list (< appt-comp-time cur-comp-time)) + (setq appt-time-msg-list (cdr appt-time-msg-list)) + (if appt-time-msg-list + (setq appt-comp-time (car (car (car appt-time-msg-list)))))))))) + - (while (and appt-time-msg-list (< appt-comp-time cur-comp-time)) - (setq appt-time-msg-list (cdr appt-time-msg-list)) - (if appt-time-msg-list - (setq appt-comp-time (car (car (car appt-time-msg-list))))))) - appt-time-msg-list) - -;;Simple sort to put the appointments list in order. -;;Scan the list for the smallest element left in the list. -;;Append the smallest element left into the new list, and remove -;;it from the original list. (defun appt-sort-list (appt-list) + "Simple sort to put the appointments list APPT-LIST in order. +Scan the list for the smallest element left in the list. +Append the smallest element left into the new list, and remove +it from the original list." (let ((order-list nil)) (while appt-list (let* ((element (car appt-list)) ＠＠ -797,44 +861,41 ＠＠ The time should be in either 24 hour for (setq element (car tmp-list)) (setq element-time (car (car element)))) (setq tmp-list (cdr tmp-list))) - (setq order-list (append order-list (list element))) + (setq order-list (nconc order-list (list element))) (setq appt-list (delq element appt-list)))) order-list)) (defun appt-convert-time (time2conv) "Convert hour:min[am/pm] format to minutes from midnight." - (cond ((string-match "^[ \t]*midni\\(ght\\|te\\)[ \t]*\\'" time2conv) - 0) - ((string-match "^[ \t]*noon[ \t]*\\'" time2conv) - (* 12 60)) - (t - (let ((conv-time 0) - (hr 0) - (min 0)) - (or (string-match - "\\`[ \t]*\\([0-9][0-9]?\\)[ \t]*\\(:[ \t]*\\([0-9][0-9]\\)\\)?[ -\t]*\\(am\\|pm\\)?" - time2conv) - (error "unparsable time \"%s\"" time2conv)) - (setq hr (string-to-int - (substring time2conv - (match-beginning 1) (match-end 1)))) - (if (match-beginning 3) - (setq min (string-to-int - (substring time2conv - (match-beginning 3) (match-end 3))))) - ;; convert the time appointment time into 24 hour time - (if (match-beginning 4) - (progn - (if (or (= hr 0) (> hr 12)) - (error "mixing 12hr and 24 hr time! %s" time2conv)) - (if (string-match "am" - (substring time2conv (match-beginning 4))) - (if (= hr 12) (setq hr 0)) - (if (< hr 12) (setq hr (+ 12 hr)))))) - (if (> min 59) (error "minutes outa bounds - %s" time2conv)) - (+ (* hr 60) min))))) + + (let ((conv-time 0) + (hr 0) + (min 0)) + + (string-match ":\\([0-9][0-9]\\)" time2conv) + (setq min (string-to-int + (match-string 1 time2conv))) + + (string-match "[0-9]?[0-9]:" time2conv) + (setq hr (string-to-int + (match-string 0 time2conv))) + + ;; convert the time appointment time into 24 hour time + + (cond ((and (string-match "pm" time2conv) (< hr 12)) + (setq hr (+ 12 hr))) + ((and (string-match "am" time2conv) (= hr 12)) + (setq hr 0))) + + ;; convert the actual time + ;; into minutes for comparison + ;; against the actual time. + + (setq conv-time (+ (* hr 60) min)) + conv-time)) + + (defvar display-time-hook-installed nil) ＠＠ -872,14 +933,35 ＠＠ The time should be in either 24 hour for (setq display-time-hook (cons appt-check display-time-hook))) )) -;defvar appt-timer nil -; "Timer used for diary appointment notifications (`appt-check').") -;(unless appt-timer -; (progn -; (setq appt-timer (make-itimer)) -; (set-itimer-fun +(defvar appt-timer nil + "Timer used for diary appointment notifications (`appt-check').") + +(defun appt-initialize () + "Read your `diary-file' and remember today's appointments. Call this from + your .emacs file, or any time you want your .diary file re-read (this happens + automatically at midnight to notice the next day's appointments). + The time must be at the beginning of a line for it to be put in the + appointments list. + 02/23/89 + 12:00pm lunch + Wednesday + 10:00am group meeting" + + (unless appt-timer + (setq appt-timer (run-at-time t 60 'appt-check))) + + (or global-mode-string (setq global-mode-string '(""))) + (or (memq 'appt-mode-string global-mode-string) + (setq global-mode-string + (append global-mode-string '(appt-mode-string)))) + + (let ((n (length (appt-diary-entries)))) + (cond ((= n 0) (message "no appointments today.")) + ((= n 1) (message "1 appointment today.")) + (t (message "%d appointments today." n)))) + ) ;;; appt.el ends here 1.4 +2 -2 XEmacs/packages/xemacs-packages/calendar/cal-china.el Index: cal-china.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/calendar/cal-china.el,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- cal-china.el 2000/01/08 17:45:56 1.3 +++ cal-china.el 2006/07/31 02:15:22 1.4 ＠＠ -1,4 +1,4 ＠＠ -;;; cal-china.el --- calendar functions for the Chinese calendar. +;;; cal-china.el --- calendar functions for the Chinese calendar ;; Copyright (C) 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: 1.4 +3 -3 XEmacs/packages/xemacs-packages/calendar/cal-coptic.el Index: cal-coptic.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/calendar/cal-coptic.el,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- cal-coptic.el 2000/01/08 17:45:56 1.3 +++ cal-coptic.el 2006/07/31 02:15:22 1.4 ＠＠ -1,6 +1,6 ＠＠ -;;; cal-coptic.el --- calendar functions for the Coptic/Ethiopic calendars. +;;; cal-coptic.el --- calendar functions for the Coptic/Ethiopic calendars -;; Copyright (C) 1995 Free Software Foundation, Inc. +;; Copyright (C) 1995, 1997 Free Software Foundation, Inc. ;; Author: Edward M. Reingold <reingold(a)cs.uiuc.edu&gt; ;; Keywords: calendar ＠＠ -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: 1.5 +2 -2 XEmacs/packages/xemacs-packages/calendar/cal-dst.el Index: cal-dst.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/calendar/cal-dst.el,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- cal-dst.el 2000/01/08 17:45:56 1.4 +++ cal-dst.el 2006/07/31 02:15:22 1.5 ＠＠ -1,4 +1,4 ＠＠ -;;; cal-dst.el --- calendar functions for daylight savings rules. +;;; cal-dst.el --- calendar functions for daylight savings rules ;; Copyright (C) 1993, 1994, 1995, 1996 Free Software Foundation, Inc. ＠＠ -24,7 +24,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: 1.4 +17 -26 XEmacs/packages/xemacs-packages/calendar/cal-french.el Index: cal-french.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/calendar/cal-french.el,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- cal-french.el 2000/01/08 17:45:56 1.3 +++ cal-french.el 2006/07/31 02:15:22 1.4 ＠＠ -1,4 +1,4 ＠＠ -;;; cal-french.el --- calendar functions for the French Revolutionary calendar. +;;; cal-french.el --- calendar functions for the French Revolutionary calendar ;; Copyright (C) 1988, 89, 92, 94, 95, 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: ;; This collection of functions implements the features of calendar.el and ＠＠ -48,12 +48,12 ＠＠ (defun french-calendar-accents () "True if diacritical marks are available." - (if (not (featurep 'xemacs) ) - (and (or window-system - (terminal-coding-system)) - (or enable-multibyte-characters - (and (char-table-p standard-display-table) - (equal (aref standard-display-table 161) [161]))))) + (and (or window-system + (terminal-coding-system)) + (not (featurep 'xemacs) + (or enable-multibyte-characters + (and (char-table-p standard-display-table) + (equal (aref standard-display-table 161) [161]))))) t) (defconst french-calendar-epoch (calendar-absolute-from-gregorian '(9 22 1792)) ＠＠ -72,11 +72,11 ＠＠ "Octidi" "Nonidi" "Decadi"]) (defconst french-calendar-multibyte-special-days-array - ["de la Vertu" "du Génie" "du Labour" "de la Raison" "de la Récompense" + ["de la Vertu" "du Génie" "du Travail" "de la Raison" "des Récompenses" "de la Révolution"]) (defconst french-calendar-special-days-array - ["de la Vertu" "du Ge'nie" "du Labour" "de la Raison" "de la Re'compense" + ["de la Vertu" "du Ge'nie" "du Travail" "de la Raison" "des Re'compenses" "de la Re'volution"]) (defun french-calendar-month-name-array () ＠＠ -183,10 +183,9 ＠＠ Defaults to today's date if DATE is not y)) (t (format (if (french-calendar-accents) - "Décade %s, %s de %s de l'Année %d de la Révolution" - "De'cade %s, %s de %s de l'Anne'e %d de la Re'volution") - (make-string (1+ (/ (1- d) 10)) ?I) - (aref (french-calendar-day-name-array) (% (1- d) 10)) + "%d %s an %d de la Révolution" + "%d %s an %d de la Re'volution") + d (aref (french-calendar-month-name-array) (1- m)) y))))) ＠＠ -238,21 +237,13 ＠＠ Echo French Revolutionary date unless NO month-list nil t) (calendar-make-alist month-list 1 'car)))) - (decade (if (> month 12) - 1 - (calendar-read - (if accents - "Décade (1-3): " - "De'cade (1-3): ") - '(lambda (x) (memq x '(1 2 3)))))) (day (if (> month 12) (- month 12) (calendar-read - "Jour (1-10): " - '(lambda (x) (and (<= 1 x) (<= x 10)))))) - (month (if (> month 12) 13 month)) - (day (+ day (* 10 (1- decade))))) - (list (list month day year))))) + "Jour (1-30): " + '(lambda (x) (and (<= 1 x) (<= x 30)))))) + (month (if (> month 12) 13 month))) + (list (list month day year))))) (calendar-goto-date (calendar-gregorian-from-absolute (calendar-absolute-from-french date))) (or noecho (calendar-print-french-date))) 1.4 +66 -66 XEmacs/packages/xemacs-packages/calendar/cal-hebrew.el Index: cal-hebrew.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/calendar/cal-hebrew.el,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- cal-hebrew.el 2000/01/08 17:45:56 1.3 +++ cal-hebrew.el 2006/07/31 02:15:22 1.4 ＠＠ -1,4 +1,4 ＠＠ -;;; cal-hebrew.el --- calendar functions for the Hebrew calendar. +;;; cal-hebrew.el --- calendar functions for the Hebrew calendar ;; Copyright (C) 1995,1997 Free Software Foundation, Inc. ＠＠ -24,7 +24,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: ＠＠ -908,17 +908,17 ＠＠ Entry applies if date is within 50 days (week (/ omer 7)) (day (% omer 7))) (if (and (> omer 0) (< omer 50)) - (format "Day %d%s of the omer (until sunset)" - omer - (if (zerop week) - "" - (format ", that is, %d week%s%s" - week - (if (= week 1) "" "s") - (if (zerop day) - "" - (format " and %d day%s" - day (if (= day 1) "" "s"))))))))) + (format "Day %d%s of the omer (until sunset)" + omer + (if (zerop week) + "" + (format ", that is, %d week%s%s" + week + (if (= week 1) "" "s") + (if (zerop day) + "" + (format " and %d day%s" + day (if (= day 1) "" "s"))))))))) (defun diary-yahrzeit (death-month death-day death-year) "Yahrzeit diary entry--entry applies if date is yahrzeit or the day before. ＠＠ -940,14 +940,14 ＠＠ order of the parameters is changed to DE (diff (- yr h-year)) (y (hebrew-calendar-yahrzeit h-date yr))) (if (and (> diff 0) (or (= y d) (= y (1+ d)))) - (format "Yahrzeit of %s%s: %d%s anniversary" - entry - (if (= y d) "" " (evening)") - diff - (cond ((= (% diff 10) 1) "st") - ((= (% diff 10) 2) "nd") - ((= (% diff 10) 3) "rd") - (t "th")))))) + (format "Yahrzeit of %s%s: %d%s anniversary" + entry + (if (= y d) "" " (evening)") + diff + (cond ((= (% diff 10) 1) "st") + ((= (% diff 10) 2) "nd") + ((= (% diff 10) 3) "rd") + (t "th")))))) (defun diary-rosh-hodesh () "Rosh Hodesh diary entry. ＠＠ -967,42 +967,42 ＠＠ Entry applies if date is Rosh Hodesh, th (h-yesterday (extract-calendar-day (calendar-hebrew-from-absolute (1- d))))) (if (or (= h-day 30) (and (= h-day 1) (/= h-month 7))) - (format - "Rosh Hodesh %s" - (if (= h-day 30) - (format - "%s (first day)" - ;; next month must be in the same year since this - ;; month can't be the last month of the year since - ;; it has 30 days - (aref h-month-names h-month)) - (if (= h-yesterday 30) - (format "%s (second day)" this-month) - this-month))) + (format + "Rosh Hodesh %s" + (if (= h-day 30) + (format + "%s (first day)" + ;; next month must be in the same year since this + ;; month can't be the last month of the year since + ;; it has 30 days + (aref h-month-names h-month)) + (if (= h-yesterday 30) + (format "%s (second day)" this-month) + this-month))) (if (= (% d 7) 6);; Saturday--check for Shabbat Mevarhim - (cond ((and (> h-day 22) (/= h-month 6) (= 29 last-day)) - (format "Mevarhim Rosh Hodesh %s (%s)" - (aref h-month-names - (if (= h-month - (hebrew-calendar-last-month-of-year - h-year)) - 0 h-month)) - (aref calendar-day-name-array (- 29 h-day)))) - ((and (< h-day 30) (> h-day 22) (= 30 last-day)) - (format "Mevarhim Rosh Hodesh %s (%s-%s)" - (aref h-month-names h-month) - (if (= h-day 29) - "tomorrow" - (aref calendar-day-name-array (- 29 h-day))) - (aref calendar-day-name-array - (% (- 30 h-day) 7))))) - (if (and (= h-day 29) (/= h-month 6)) - (format "Erev Rosh Hodesh %s" - (aref h-month-names - (if (= h-month - (hebrew-calendar-last-month-of-year - h-year)) - 0 h-month)))))))) + (cond ((and (> h-day 22) (/= h-month 6) (= 29 last-day)) + (format "Mevarhim Rosh Hodesh %s (%s)" + (aref h-month-names + (if (= h-month + (hebrew-calendar-last-month-of-year + h-year)) + 0 h-month)) + (aref calendar-day-name-array (- 29 h-day)))) + ((and (< h-day 30) (> h-day 22) (= 30 last-day)) + (format "Mevarhim Rosh Hodesh %s (%s-%s)" + (aref h-month-names h-month) + (if (= h-day 29) + "tomorrow" + (aref calendar-day-name-array (- 29 h-day))) + (aref calendar-day-name-array + (% (- 30 h-day) 7))))) + (if (and (= h-day 29) (/= h-month 6)) + (format "Erev Rosh Hodesh %s" + (aref h-month-names + (if (= h-month + (hebrew-calendar-last-month-of-year + h-year)) + 0 h-month)))))))) (defun diary-parasha () "Parasha diary entry--entry applies if date is a Saturday." ＠＠ -1034,16 +1034,16 ＠＠ Entry applies if date is Rosh Hodesh, th (/ (- d first-saturday) 7)) (parasha (aref year-format saturday))) (if parasha - (format - "Parashat %s" - (if (listp parasha);; Israel differs from diaspora - (if (car parasha) - (format "%s (diaspora), %s (Israel)" - (hebrew-calendar-parasha-name (car parasha)) - (hebrew-calendar-parasha-name (cdr parasha))) - (format "%s (Israel)" - (hebrew-calendar-parasha-name (cdr parasha)))) - (hebrew-calendar-parasha-name parasha)))))))) + (format + "Parashat %s" + (if (listp parasha);; Israel differs from diaspora + (if (car parasha) + (format "%s (diaspora), %s (Israel)" + (hebrew-calendar-parasha-name (car parasha)) + (hebrew-calendar-parasha-name (cdr parasha))) + (format "%s (Israel)" + (hebrew-calendar-parasha-name (cdr parasha)))) + (hebrew-calendar-parasha-name parasha)))))))) (defvar hebrew-calendar-parashiot-names ["Bereshith" "Noah" "Lech L'cha" "Vayera" "Hayei Sarah" "Toledoth" 1.4 +2 -2 XEmacs/packages/xemacs-packages/calendar/cal-islam.el Index: cal-islam.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/calendar/cal-islam.el,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- cal-islam.el 2000/01/08 17:45:56 1.3 +++ cal-islam.el 2006/07/31 02:15:22 1.4 ＠＠ -1,4 +1,4 ＠＠ -;;; cal-islam.el --- calendar functions for the Islamic calendar. +;;; cal-islam.el --- calendar functions for the Islamic calendar ;; Copyright (C) 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: 1.4 +2 -2 XEmacs/packages/xemacs-packages/calendar/cal-iso.el Index: cal-iso.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/calendar/cal-iso.el,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- cal-iso.el 2000/01/08 17:45:56 1.3 +++ cal-iso.el 2006/07/31 02:15:22 1.4 ＠＠ -1,4 +1,4 ＠＠ -;;; cal-iso.el --- calendar functions for the ISO calendar. +;;; cal-iso.el --- calendar functions for the ISO calendar ;; Copyright (C) 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: 1.4 +2 -2 XEmacs/packages/xemacs-packages/calendar/cal-julian.el Index: cal-julian.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/calendar/cal-julian.el,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- cal-julian.el 2000/01/08 17:45:56 1.3 +++ cal-julian.el 2006/07/31 02:15:23 1.4 ＠＠ -1,4 +1,4 ＠＠ -;;; cal-julian.el --- calendar functions for the Julian calendar. +;;; cal-julian.el --- calendar functions for the Julian calendar ;; Copyright (C) 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: 1.5 +2 -2 XEmacs/packages/xemacs-packages/calendar/cal-mayan.el Index: cal-mayan.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/calendar/cal-mayan.el,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- cal-mayan.el 2000/01/08 17:45:56 1.4 +++ cal-mayan.el 2006/07/31 02:15:23 1.5 ＠＠ -1,4 +1,4 ＠＠ -;;; cal-mayan.el --- calendar functions for the Mayan calendars. +;;; cal-mayan.el --- calendar functions for the Mayan calendars ;; Copyright (C) 1992, 1993, 1995, 1997 Free Software Foundation, Inc. ＠＠ -24,7 +24,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: 1.4 +25 -14 XEmacs/packages/xemacs-packages/calendar/cal-move.el Index: cal-move.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/calendar/cal-move.el,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- cal-move.el 2000/01/08 17:45:57 1.3 +++ cal-move.el 2006/07/31 02:15:23 1.4 ＠＠ -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: ＠＠ -47,7 +47,8 ＠＠ (if (not (calendar-date-is-visible-p today)) (generate-calendar-window) (update-calendar-mode-line) - (calendar-cursor-to-visible-date today)))) + (calendar-cursor-to-visible-date today))) + (run-hooks 'calendar-move-hook)) (defun calendar-forward-month (arg) "Move the cursor forward ARG months. ＠＠ -66,7 +67,8 ＠＠ Movement is backward if ARG is negative. (let ((new-cursor-date (list month day year))) (if (not (calendar-date-is-visible-p new-cursor-date)) (calendar-other-month month year)) - (calendar-cursor-to-visible-date new-cursor-date)))) + (calendar-cursor-to-visible-date new-cursor-date))) + (run-hooks 'calendar-move-hook)) (defun calendar-forward-year (arg) "Move the cursor forward by ARG years. ＠＠ -86,11 +88,12 ＠＠ Movement is forward is ARG is negative." (interactive "p") (calendar-forward-month (* -12 arg))) -(defun scroll-calendar-left (arg) +(defun scroll-calendar-left (&optional arg) "Scroll the displayed calendar left by ARG months. If ARG is negative the calendar is scrolled right. Maintains the relative position of the cursor with respect to the calendar as well as possible." (interactive "p") + (unless arg (setq arg 1)) (calendar-cursor-to-nearest-date) (let ((old-date (calendar-cursor-to-date)) (today (calendar-current-date))) ＠＠ -103,14 +106,15 ＠＠ position of the cursor with respect to t (cond ((calendar-date-is-visible-p old-date) old-date) ((calendar-date-is-visible-p today) today) - (t (list month 1 year)))))))) + (t (list month 1 year))))))) + (run-hooks 'calendar-move-hook)) -(defun scroll-calendar-right (arg) +(defun scroll-calendar-right (&optional arg) "Scroll the displayed calendar window right by ARG months. If ARG is negative the calendar is scrolled left. Maintains the relative position of the cursor with respect to the calendar as well as possible." (interactive "p") - (scroll-calendar-left (- arg))) + (scroll-calendar-left (- (or arg 1)))) (defun scroll-calendar-left-three-months (arg) "Scroll the displayed calendar window left by 3*ARG months. ＠＠ -170,7 +174,8 ＠＠ Moves backward if ARG is negative." ;; Put the new month on the screen, if needed, and go to the new date. (if (not (calendar-date-is-visible-p new-cursor-date)) (calendar-other-month new-display-month new-display-year)) - (calendar-cursor-to-visible-date new-cursor-date)))) + (calendar-cursor-to-visible-date new-cursor-date))) + (run-hooks 'calendar-move-hook)) (defun calendar-backward-day (arg) "Move the cursor back ARG days. ＠＠ -245,7 +250,8 ＠＠ Moves forward if ARG is negative." year))) (if (not (calendar-date-is-visible-p last-day)) (calendar-other-month month year) - (calendar-cursor-to-visible-date last-day))))) + (calendar-cursor-to-visible-date last-day)))) + (run-hooks 'calendar-move-hook)) (defun calendar-beginning-of-year (arg) "Move the cursor backward ARG year beginnings." ＠＠ -255,13 +261,15 ＠＠ Moves forward if ARG is negative." (month (extract-calendar-month date)) (day (extract-calendar-day date)) (year (extract-calendar-year date)) - (jan-first (list 1 1 year))) + (jan-first (list 1 1 year)) + (calendar-move-hook nil)) (if (and (= day 1) (= 1 month)) (calendar-backward-month (* 12 arg)) (if (and (= arg 1) (calendar-date-is-visible-p jan-first)) (calendar-cursor-to-visible-date jan-first) - (calendar-other-month 1 (- year (1- arg))))))) + (calendar-other-month 1 (- year (1- arg)))))) + (run-hooks 'calendar-move-hook)) (defun calendar-end-of-year (arg) "Move the cursor forward ARG year beginnings." ＠＠ -271,14 +279,16 ＠＠ Moves forward if ARG is negative." (month (extract-calendar-month date)) (day (extract-calendar-day date)) (year (extract-calendar-year date)) - (dec-31 (list 12 31 year))) + (dec-31 (list 12 31 year)) + (calendar-move-hook nil)) (if (and (= day 31) (= 12 month)) (calendar-forward-month (* 12 arg)) (if (and (= arg 1) (calendar-date-is-visible-p dec-31)) (calendar-cursor-to-visible-date dec-31) (calendar-other-month 12 (- year (1- arg))) - (calendar-cursor-to-visible-date (list 12 31 displayed-year)))))) + (calendar-cursor-to-visible-date (list 12 31 displayed-year))))) + (run-hooks 'calendar-move-hook)) (defun calendar-cursor-to-visible-date (date) "Move the cursor to DATE that is on the screen." ＠＠ -313,7 +323,8 ＠＠ Moves forward if ARG is negative." 2 month) year))) - (calendar-cursor-to-visible-date date)) + (calendar-cursor-to-visible-date date) + (run-hooks 'calendar-move-hook)) (provide 'cal-move) 1.4 +2 -2 XEmacs/packages/xemacs-packages/calendar/cal-persia.el Index: cal-persia.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/calendar/cal-persia.el,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- cal-persia.el 2000/01/08 17:45:57 1.3 +++ cal-persia.el 2006/07/31 02:15:23 1.4 ＠＠ -1,4 +1,4 ＠＠ -;;; cal-persia.el --- calendar functions for the Persian calendar. +;;; cal-persia.el --- calendar functions for the Persian calendar ;; Copyright (C) 1996, 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: 1.4 +64 -41 XEmacs/packages/xemacs-packages/calendar/cal-tex.el Index: cal-tex.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/calendar/cal-tex.el,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- cal-tex.el 2000/01/08 17:45:57 1.3 +++ cal-tex.el 2006/07/31 02:15:23 1.4 ＠＠ -1,4 +1,4 ＠＠ -;;; cal-tex.el --- calendar functions for printing calendars with LaTeX. +;;; cal-tex.el --- calendar functions for printing calendars with LaTeX ;; Copyright (C) 1995 Free Software Foundation, Inc. ＠＠ -24,7 +24,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: ＠＠ -75,6 +75,11 ＠＠ If finding the holidays is too slow, set :type 'boolean :group 'calendar-tex) +(defcustom cal-tex-rules nil + "*If t, pages will be ruled in some styles." +:type 'boolean +:group 'calendar-tex) + (defcustom cal-tex-daily-string '(let* ((year (extract-calendar-year date)) (day (calendar-day-number date)) ＠＠ -323,10 +328,10 ＠＠ Optional parameter specifies number of y (cal-tex-noindent) (cal-tex-nl) (calendar-for-loop i from 1 to 12 do - (insert (cal-tex-mini-calendar i year - (calendar-month-name i) - "1in" ".9in" "tiny" "0.6mm"))) - (insert + (insert (cal-tex-mini-calendar i year + (calendar-month-name i) + "1in" ".9in" "tiny" "0.6mm"))) + (insert "\\noindent\\fbox{\\January}\\fbox{\\February}\\fbox{\\March}\\\\ \\noindent\\fbox{\\April}\\fbox{\\May}\\fbox{\\June}\\\\ \\noindent\\fbox{\\July}\\fbox{\\August}\\fbox{\\September}\\\\ ＠＠ -505,15 +510,15 ＠＠ Each day is formatted using format DAY-F (calendar-for-loop i from 0 to 6 do (if (memq i cal-tex-which-days) (insert (format cal-tex-day-name-format - (aref calendar-day-name-array - (mod (+ calendar-week-start-day i) 7))))) + (aref calendar-day-name-array + (mod (+ calendar-week-start-day i) 7))))) (cal-tex-comment))) (defun cal-tex-insert-month-header (n month year end-month end-year) "Create a title for a calendar. A title is inserted for a calendar with N months starting with MONTH YEAR and ending with END-MONTH END-YEAR." - (let ( (month-name (calendar-month-name month)) + (let ((month-name (calendar-month-name month)) (end-month-name (calendar-month-name end-month))) (if (= 1 n) (insert (format "\\calmonth{%s}{%s}\n\\vspace*{-0.5cm}" ＠＠ -923,9 +928,10 ＠＠ Holidays are included if `cal-tex-holida (if (not weekend) (progn (calendar-for-loop i from 8 to 12 do - (insert (format "{\\large\\sf %d}\\\\\n" i))) + (insert (format "{\\large\\sf %d}\\\\\n" i))) (calendar-for-loop i from 1 to 5 do - (insert (format "{\\large\\sf %d}\\\\\n" i))))) + (insert (format "{\\large\\sf %d}\\\\\n" + (if cal-tex-24 (+ i 12) i)))))) (cal-tex-nl ".5cm") (if weekend (progn ＠＠ -1005,20 +1011,20 ＠＠ Holidays are included if `cal-tex-holida (if (= (extract-calendar-month date) (extract-calendar-month d)) (format "%s %s" - (calendar-month-name - (extract-calendar-month date)) + (calendar-month-name + (extract-calendar-month date)) (extract-calendar-year date)) (if (= (extract-calendar-year date) (extract-calendar-year d)) (format "%s---%s %s" + (calendar-month-name + (extract-calendar-month date)) (calendar-month-name - (extract-calendar-month date)) - (calendar-month-name (extract-calendar-month d)) (extract-calendar-year date)) (format "%s %s---%s %s" - (calendar-month-name - (extract-calendar-month date)) + (calendar-month-name + (extract-calendar-month date)) (extract-calendar-year date) (calendar-month-name (extract-calendar-month d)) (extract-calendar-year d)))))) ＠＠ -1196,7 +1202,8 ＠＠ Holidays are included if `cal-tex-holida "Day-per-page Filofax style calendar for week indicated by cursor. Optional prefix argument specifies number of weeks. Weeks start on Monday. Diary entries are included if `cal-tex-diary' is t. -Holidays are included if `cal-tex-holidays' is t." +Holidays are included if `cal-tex-holidays' is t. +Pages are ruled if `cal-tex-rules' is t." (interactive "P") (let* ((n (if arg arg 1)) (date (calendar-gregorian-from-absolute ＠＠ -1231,28 +1238,32 ＠＠ Holidays are included if `cal-tex-holida \\long\\def\\rightday#1#2#3{% \\rule{\\textwidth}{0.3pt}\\\\% \\hbox to \\textwidth{% - \\vbox to 1.85in{% + \\vbox {% \\vspace*{2pt}% \\hbox to \\textwidth{\\hfill \\small #3 \\hfill}% \\hbox to \\textwidth{\\vbox {\\raggedleft \\em #2}}% - \\hbox to \\textwidth{\\vbox to 0pt {\\noindent \\footnotesize #1}}}}} + \\hbox to \\textwidth{\\vbox {\\noindent \\footnotesize #1}}}}} \\long\\def\\weekend#1#2#3{% \\rule{\\textwidth}{0.3pt}\\\\% \\hbox to \\textwidth{% - \\vbox to 2in{% + \\vbox {% \\vspace*{2pt}% \\hbox to \\textwidth{\\hfill \\small #3 \\hfill}% \\hbox to \\textwidth{\\vbox {\\noindent \\em #2}}% - \\hbox to \\textwidth{\\vbox to 0pt {\\noindent \\footnotesize #1}}}}} + \\hbox to \\textwidth{\\vbox {\\noindent \\footnotesize #1}}}}} \\def\\lefthead#1{\\noindent {\\normalsize \\bf #1}\\hfill\\\\[-6pt]} \\long\\def\\leftday#1#2#3{% \\rule{\\textwidth}{0.3pt}\\\\% \\hbox to \\textwidth{% - \\vbox to 1.85in{% + \\vbox {% \\vspace*{2pt}% \\hbox to \\textwidth{\\hfill \\small #3 \\hfill}% \\hbox to \\textwidth{\\vbox {\\noindent \\em #2}}% - \\hbox to \\textwidth{\\vbox to 0pt {\\noindent \\footnotesize #1}}}}} + \\hbox to \\textwidth{\\vbox {\\noindent \\footnotesize #1}}}}} +\\newbox\\LineBox +\\setbox\\LineBox=\\hbox to\\textwidth{% +\\vrule height.2in width0pt\\leaders\\hrule\\hfill} +\\def\\linesfill{\\par\\leaders\\copy\\LineBox\\vfill} ") (cal-tex-b-document) (cal-tex-cmd "\\pagestyle{empty}") ＠＠ -1264,10 +1275,12 ＠＠ Holidays are included if `cal-tex-holida (insert "%\n") (insert (if odd "\\rightday" "\\leftday"))) (cal-tex-arg (cal-tex-latexify-list diary-list date)) - (cal-tex-arg (cal-tex-latexify-list holidays date)) + (cal-tex-arg (cal-tex-latexify-list holidays date "\\\\" t)) (cal-tex-arg (eval cal-tex-daily-string)) (insert "%\n") - (insert "\\vfill\\noindent\\rule{\\textwidth}{0.3pt}\\\\%\n") + (if cal-tex-rules + (insert "\\linesfill\n") + (insert "\\vfill\\noindent\\rule{\\textwidth}{0.3pt}\\\\%\n")) (cal-tex-newpage) (setq date (cal-tex-incr-date date))) (insert "%\n") ＠＠ -1276,12 +1289,15 ＠＠ Holidays are included if `cal-tex-holida (cal-tex-arg (calendar-date-string date)) (insert "\\weekend") (cal-tex-arg (cal-tex-latexify-list diary-list date)) - (cal-tex-arg (cal-tex-latexify-list holidays date)) + (cal-tex-arg (cal-tex-latexify-list holidays date "\\\\" t)) (cal-tex-arg (eval cal-tex-daily-string)) (insert "%\n") - (insert "\\vfill") + (if cal-tex-rules + (insert "\\linesfill\n") + (insert "\\vfill")) (setq date (cal-tex-incr-date date))) - (insert "\\noindent\\rule{\\textwidth}{0.3pt}\\\\%\n") + (if (not cal-tex-rules) + (insert "\\noindent\\rule{\\textwidth}{0.3pt}\\\\%\n")) (if (/= i n) (progn (run-hooks 'cal-tex-week-hook) ＠＠ -1438,19 +1454,26 ＠＠ If optional N is given, the date of N da (calendar-gregorian-from-absolute (+ (if n n 1) (calendar-absolute-from-gregorian date)))) -(defun cal-tex-latexify-list (date-list date &optional separator) +(defun cal-tex-latexify-list (date-list date &optional separator final-separator) "Return string with concatenated, LaTeXified entries in DATE_LIST for DATE. -Use double backslash as a separator unless optional SEPARATOR is given." - (mapconcat '(lambda (x) (cal-tex-LaTeXify-string x)) - (let ((result) - (p date-list)) - (while p - (and (car (car p)) - (calendar-date-equal date (car (car p))) - (setq result (cons (car (cdr (car p))) result))) - (setq p (cdr p))) - (reverse result)) - (if separator separator "\\\\"))) +Use double backslash as a separator unless optional SEPARATOR is given. +If resulting string is not empty, put separator at end if optional +FINAL-SEPARATOR is t." + (let* ((sep (if separator separator "\\\\")) + (result + (mapconcat '(lambda (x) (cal-tex-LaTeXify-string x)) + (let ((result) + (p date-list)) + (while p + (and (car (car p)) + (calendar-date-equal date (car (car p))) + (setq result (cons (car (cdr (car p))) result))) + (setq p (cdr p))) + (reverse result)) + sep))) + (if (and final-separator (not (string-equal result ""))) + (concat result sep) + result))) (defun cal-tex-previous-month (date) "Return the date of the first day in the month previous to DATE." 1.5 +6 -6 XEmacs/packages/xemacs-packages/calendar/cal-x.el Index: cal-x.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/calendar/cal-x.el,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- cal-x.el 2000/01/08 17:45:57 1.4 +++ cal-x.el 2006/07/31 02:15:23 1.5 ＠＠ -6,7 +6,7 ＠＠ ;; Edward M. Reingold <reingold(a)cs.uiuc.edu&gt; ;; Modified for XEmacs by: Chuck Thompson <cthomp(a)cs.uiuc.edu&gt; ;; Keywords: calendar -;; Human-Keywords: calendar, dedicated frames, x-windows +;; Human-Keywords: calendar, dedicated frames, X Window System ;; This file is part of GNU Emacs. ＠＠ -25,11 +25,11 ＠＠ ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. -;;; Synched up with (Mostly): FSF 20.5 +;;; Synched up with (Mostly): FSF 21.4 ;;; Commentary: -;; This collection of functions implements dedicated frames in x-windows for +;; This collection of functions implements dedicated frames in X for ;; calendar.el. ;; Comments, corrections, and improvements should be sent to ＠＠ -89,7 +89,7 ＠＠ Can be used to change frame parameters, (defun calendar-one-frame-setup (&optional arg) "Start calendar and display it in a dedicated frame together with the diary." - (if (calendar-not-using-window-system-p) + (if (not (display-multi-frame-p)) (calendar-basic-setup arg) (if (frame-live-p calendar-frame) (delete-frame calendar-frame)) (if (frame-live-p diary-frame) (delete-frame diary-frame)) ＠＠ -115,7 +115,7 ＠＠ Can be used to change frame parameters, (defun calendar-only-one-frame-setup (&optional arg) "Start calendar and display it in a dedicated frame." - (if (calendar-not-using-window-system-p) + (if (not (display-multi-frame-p)) (calendar-basic-setup arg) (if (frame-live-p calendar-frame) (delete-frame calendar-frame)) (let ((special-display-buffer-names nil) ＠＠ -132,7 +132,7 ＠＠ Can be used to change frame parameters, (defun calendar-two-frame-setup (&optional arg) "Start calendar and diary in separate, dedicated frames." - (if (calendar-not-using-window-system-p) + (if (not (display-multi-frame-p)) (calendar-basic-setup arg) (if (frame-live-p calendar-frame) (delete-frame calendar-frame)) (if (frame-live-p diary-frame) (delete-frame diary-frame)) 1.6 +15 -3 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.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- cal-xemacs.el 2000/09/13 05:32:53 1.5 +++ cal-xemacs.el 2006/07/31 02:15:23 1.6 ＠＠ -26,7 +26,7 ＠＠ ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. -;;; Synched up with: cal-menu.el in Emacs 20.3 +;;; Synched up with: cal-menu.el in Emacs 21.4 ;;; Commentary: ＠＠ -43,6 +43,19 ＠＠ (eval-when-compile (require 'calendar)) (require 'easymenu) + +;; XEmacs change +;; not available until 21.5 +(unless (fboundp 'display-popup-menus-p) + (defun display-popup-menus-p (&optional display) + "Return non-nil if popup menus are supported on DISPLAY. +DISPLAY can be a frame, a device, a console, or nil (meaning the selected +frame). Support for popup menus requires that the mouse be available." + (and + (memq (framep-on-display display) '(x ns gtk mswindows)) + (display-mouse-p display))) + ) + (defconst calendar-popup-menu-3 '("Calendar" ＠＠ -64,7 +77,6 ＠＠ (define-key calendar-mode-map 'button2 'calendar-mouse-2-date-menu) - (defun cal-tex-mouse-filofax (e) "Pop up sub-submenu for Mouse-2 for Filofax cal-tex commands for selected date." (interactive "e") ＠＠ -160,7 +172,7 ＠＠ (add-submenu '("Calendar") calendar-diary-menu)) (if (not (assoc "Moon" current-menubar)) (add-menu-button '("Calendar") ["Moon" calendar-phases-of-moon t])))) - + (defun cal-menu-list-holidays-year () "Display a list of the holidays of the selected date's year." (interactive) 1.8 +248 -132 XEmacs/packages/xemacs-packages/calendar/calendar.el Index: calendar.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/calendar/calendar.el,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- calendar.el 2003/08/28 06:57:28 1.7 +++ calendar.el 2006/07/31 02:15:23 1.8 ＠＠ -1,7 +1,7 ＠＠ -;;; calendar.el --- Calendar functions. +;;; calendar.el --- calendar functions -;; Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1997 -;; Free Software Foundation, Inc. +;; Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1997, +;; 2000, 2001 Free Software Foundation, Inc. ;; Author: Edward M. Reingold <reingold(a)cs.uiuc.edu&gt; ;; Keywords: calendar ＠＠ -26,7 +26,7 ＠＠ ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. -;;; Synched up with (Mostly): FSF 20.5 +;;; Synched up with (Mostly): FSF 21.4 ;;; Commentary: ＠＠ -96,8 +96,50 ＠＠ ;; reingold(a)cs.uiuc.edu 1304 West Springfield Avenue ;; Urbana, Illinois 61801 +;; XEmacs change +;; not available until 21.5 +(unless (fboundp 'display-multi-frame-p) + (defun display-multi-frame-p () + (not (null (memq (device-type) '(x mswindows gtk)))) + )) + +;; XEmacs change +;; not available until 21.5 +(unless (fboundp 'display-color-p) + (defun display-color-p () + (eq 'color (device-class)) + )) + +;; XEmacs change +;; only available in MULE +(unless (featurep 'mule) + (setq enable-multibyte-characters nil)) + +; propertize appeared in XEmacs subr.el r21-5-7: 1.26 +(unless (fboundp 'propertize) +;; `propertize' is a builtin in GNU Emacs 21. + (defun propertize (string &rest properties) + "Return a copy of STRING with text properties added. +First argument is the string to copy. +Remaining arguments form a sequence of PROPERTY VALUE pairs for text +properties to add to the result." + (let ((str (copy-sequence string))) + (add-text-properties 0 (length str) + properties + str) + str)) + ) + ;;; Code: +(eval-when-compile + (defvar displayed-month) + (defvar displayed-year) + (defvar calendar-month-name-array) + (defvar calendar-starred-day)) + +(require 'ibuffer) + (defun calendar-version () (interactive) (message "Version 6, October 12, 1995")) ＠＠ -164,7 +206,7 ＠＠ is governed by the variable `number-of-d ;;;###autoload (defcustom number-of-diary-entries 1 "*Specifies how many days of diary entries are to be displayed initially. -This variable affects the diary display when the command M-x diary is used, +This variable affects the diary display when the command \\[diary] is used, or if the value of the variable `view-diary-entries-initially' is t. For example, if the default value 1 is used, then only the current day's diary entries will be displayed. If the value 2 is used, then both the current ＠＠ -197,35 +239,56 ＠＠ The marking symbol is specified by the v :type 'boolean :group 'diary) +;;;###autoload +(defcustom calendar-remove-frame-by-deleting nil + "*Determine how the calendar mode removes a frame no longer needed. +If nil, make an icon of the frame. If non-nil, delete the frame." +:type 'boolean +:group 'view) + +(defface diary-face + '((((class color) (background light)) + (:foreground "red")) + (((class color) (background dark)) + (:foreground "yellow")) + (t + (:weight bold t))) + "Face for highlighting diary entries." +:group 'diary) + +(defface calendar-today-face + '((t (:underline t))) + "Face for indicating today's date." +:group 'diary) + +(defface holiday-face + '((((class color) (background light)) + (:background "pink")) + (((class color) (background dark)) + (:background "chocolate4")) + (t + (:inverse-video t))) + "Face for indicating dates that have holidays." +:group 'diary) + (defcustom diary-entry-marker - (progn - (make-face 'diary-face) - (cond ((face-differs-from-default-p 'diary-face) nil) - (t (set-face-foreground 'diary-face "red" 'global '(x color)) - (set-face-highlight-p 'diary-face t 'global 'tty) - ;; avoid a weird problem when byte-compiling appt.el - ;; in batch mode. - (if (and (not noninteractive) (fboundp 'x-make-font-bold)) - (let ((bfont (x-make-font-bold - (face-font-instance 'default))) - (mono-tag (list 'x 'mono)) - (gray-tag (list 'x 'grayscale))) - (if bfont - (progn - (set-face-font 'diary-face bfont 'global mono-tag) - (set-face-font 'diary-face bfont 'global - gray-tag))))))) + (if (not (display-color-p)) + "+" 'diary-face) "*How to mark dates that have diary entries. The value can be either a single-character string or a face." :type '(choice string face) :group 'diary) +(eval-after-load "facemenu" + '(progn + (add-to-list 'facemenu-unlisted-faces 'diary-face) + (add-to-list 'facemenu-unlisted-faces 'calendar-today-face) + (add-to-list 'facemenu-unlisted-faces 'holiday-face))) + (defcustom calendar-today-marker - (progn - (make-face 'calendar-today-face) - (if (not (face-differs-from-default-p 'calendar-today-face)) - (set-face-underline-p 'calendar-today-face t)) + (if (not (display-color-p)) + "=" 'calendar-today-face) "*How to mark today's date in the calendar. The value can be either a single-character string or a face. ＠＠ -235,22 +298,8 ＠＠ to request that." :group 'calendar) (defcustom calendar-holiday-marker - (progn - (make-face 'holiday-face) - (cond ((face-differs-from-default-p 'holiday-face) nil) - (t (let ((color-tag (list 'x 'color)) - (mono-tag (list 'x 'mono)) - (gray-tag (list 'x 'grayscale))) - (set-face-background 'holiday-face [default foreground] 'global - mono-tag) - (set-face-foreground 'holiday-face [default background] 'global - mono-tag) - (set-face-background 'holiday-face [default foreground] 'global - gray-tag) - (set-face-foreground 'holiday-face [default background] 'global - gray-tag) - (set-face-background 'holiday-face "pink" 'global color-tag) - (set-face-reverse-p 'holiday-face t 'global 'tty)))) + (if (not (display-color-p)) + "*" 'holiday-face) "*How to mark notable dates in the calendar. The value can be either a single-character string or a face." ＠＠ -352,6 +401,18 ＠＠ functions that move by days and weeks." :group 'calendar-hooks) ;;;###autoload +(defcustom calendar-move-hook nil + "*List of functions called whenever the cursor moves in the calendar. + +For example, + + (add-hook 'calendar-move-hook (lambda () (view-diary-entries 1))) + +redisplays the diary for whatever date the cursor is moved to." +:type 'hook +:group 'calendar-hooks) + +;;;###autoload (defcustom diary-file "~/diary" "*Name of the file in which one's personal diary of dates is kept. ＠＠ -478,7 +539,7 ＠＠ See the documentation for the function ` ;;;###autoload (defcustom sexp-diary-entry-symbol "%%" - "*The string used to indicate a sexp diary entry in diary-file. + "*The string used to indicate a sexp diary entry in `diary-file'. See the documentation for the function `list-sexp-diary-entries'." :type 'string :group 'diary) ＠＠ -518,6 +579,7 ＠＠ characters with or without a period." "*List of pseudo-patterns describing the American patterns of date used. See the documentation of `diary-date-forms' for an explanation." :type '(repeat (choice (cons :tag "Backup" + :value (backup . nil) (const backup) (repeat (list :inline t :format "%v" (symbol :tag "Keyword") ＠＠ -531,12 +593,13 ＠＠ See the documentation of `diary-date-for (defcustom european-date-diary-pattern '((day "/" month "[^/0-9]") (day "/" month "/" year "[^0-9]") - (backup day " *" monthname "\\W+\\<[^*0-9]") + (backup day " *" monthname "\\W+\\<\\([^*0-9]\\|\\([0-9]+[:aApP]\\)\\)") (day " *" monthname " *" year "[^0-9]") (dayname "\\W")) "*List of pseudo-patterns describing the European patterns of date used. See the documentation of `diary-date-forms' for an explanation." :type '(repeat (choice (cons :tag "Backup" + :value (backup . nil) (const backup) (repeat (list :inline t :format "%v" (symbol :tag "Keyword") ＠＠ -551,7 +614,7 ＠＠ See the documentation of `diary-date-for european-date-diary-pattern american-date-diary-pattern) "*List of pseudo-patterns describing the forms of date used in the diary. -The patterns on the list must be MUTUALLY EXCLUSIVE and must should not match +The patterns on the list must be MUTUALLY EXCLUSIVE and must not match any portion of the diary entry itself, just the date component. A pseudo-pattern is a list of regular expressions and the keywords `month', ＠＠ -573,6 +636,7 ＠＠ directive causes the date recognizer to current word of the diary entry, so in no case can the pattern match more than a portion of the first word of the diary entry." :type '(repeat (choice (cons :tag "Backup" + :value (backup . nil) (const backup) (repeat (list :inline t :format "%v" (symbol :tag "Keyword") ＠＠ -586,7 +650,7 ＠＠ a portion of the first word of the diary (defcustom european-calendar-display-form '((if dayname (concat dayname ", ")) day " " monthname " " year) "*Pseudo-pattern governing the way a date appears in the European style. -See the documentation of calendar-date-display-form for an explanation." +See the documentation of `calendar-date-display-form' for an explanation." :type 'sexp :group 'calendar) ＠＠ -728,7 +792,7 ＠＠ describes the style of such diary entrie "*List of functions called after marking diary entries in the calendar. A function `mark-included-diary-files' is also provided for use as the -mark-diary-entries-hook; it enables you to use shared diary files together +`mark-diary-entries-hook'; it enables you to use shared diary files together with your own. The files included are specified in the diary file by lines of the form #include \"filename\" ＠＠ -1023,7 +1087,7 ＠＠ See the documentation for `calendar-holi (append general-holidays local-holidays other-holidays christian-holidays hebrew-holidays islamic-holidays oriental-holidays solar-holidays) - "*List of notable days for the command M-x holidays. + "*List of notable days for the command \\[holidays]. Additional holidays are easy to add to the list, just put them in the list `other-holidays' in your .emacs file. Similarly, by setting any of ＠＠ -1130,24 +1194,24 ＠＠ with descriptive strings such as (defmacro increment-calendar-month (mon yr n) "Move the variables MON and YR to the month and year by N months. Forward if N is positive or backward if N is negative." - (` (let (( macro-y (+ (* (, yr) 12) (, mon) -1 (, n) ))) - (setq (, mon) (1+ (% macro-y 12) )) - (setq (, yr) (/ macro-y 12))))) + `(let ((macro-y (+ (* ,yr 12) ,mon -1 ,n))) + (setq ,mon (1+ (% macro-y 12))) + (setq ,yr (/ macro-y 12)))) (defmacro calendar-for-loop (var from init to final do &rest body) "Execute a for loop." - (` (let (( (, var) (1- (, init)) )) - (while (>= (, final) (setq (, var) (1+ (, var)))) - (,＠ body))))) + `(let ((,var (1- ,init))) + (while (>= ,final (setq ,var (1+ ,var))) + ,＠body))) (defmacro calendar-sum (index initial condition expression) "For INDEX = INITIAL et seq, as long as CONDITION holds, sum EXPRESSION." - (` (let (( (, index) (, initial)) + `(let ((,index ,initial) (sum 0)) - (while (, condition) - (setq sum (+ sum (, expression) )) - (setq (, index) (1+ (, index)))) - sum))) + (while ,condition + (setq sum (+ sum ,expression)) + (setq ,index (1+ ,index))) + sum)) ;; The following are in-line for speed; they can be called thousands of times ;; when looking up holidays or processing the diary. Here, for example, are ＠＠ -1192,7 +1256,7 ＠＠ Forward if N is positive or backward if (car (cdr (cdr date)))) (defsubst calendar-leap-year-p (year) - "Returns t if YEAR is a Gregorian leap year." + "Return t if YEAR is a Gregorian leap year." (and (zerop (% year 4)) (or (not (zerop (% year 100))) (zerop (% year 400))))) ＠＠ -1328,6 +1392,9 ＠＠ The Gregorian date Sunday, December 31, "Move cursor to DATE." t) +(autoload 'calendar-only-one-frame-setup "cal-x" + "Start calendar and display it in a dedicated frame.") + (autoload 'calendar-one-frame-setup "cal-x" "Start calendar and display it in a dedicated frame together with the diary.") ＠＠ -1345,7 +1412,10 ＠＠ any other value the current frame is use ;;;###autoload (defun calendar (&optional arg) "Choose between the one frame, two frame, or basic calendar displays. -The original function `calendar' has been renamed `calendar-basic-setup'." +If called with an optional prefix argument, prompts for month and year. + +The original function `calendar' has been renamed `calendar-basic-setup'. +See the documentation of that function for more information." (interactive "P") (cond ((equal calendar-setup 'one-frame) (calendar-one-frame-setup arg)) ((equal calendar-setup 'two-frames) (calendar-two-frame-setup arg)) ＠＠ -1366,10 +1436,6 ＠＠ the current date to be displayed in anot `number-of-diary-entries' controls the number of days of diary entries displayed upon initial display of the calendar. -An optional prefix argument ARG causes the calendar displayed to be ARG -months in the future if ARG is positive or in the past if ARG is negative; -in this case the cursor goes on the first day of the month. - Once in the calendar window, future or past months can be moved into view. Arbitrary months can be displayed, or the calendar can be scrolled forward or backward. ＠＠ -1382,7 +1448,7 ＠＠ necessary to display the desired date. Diary entries can be marked on the calendar or displayed in another window. -Use M-x describe-mode for details of the key bindings in the calendar window. +Use \\[describe-mode] for details of the key bindings in the calendar window. The Gregorian calendar is assumed. ＠＠ -1510,10 +1576,14 ＠＠ calendar." "String of astronomical (Julian) day number of Gregorian date." t) -(autoload 'calendar-goto-astro-date "cal-julian" +(autoload 'calendar-goto-astro-day-number "cal-julian" "Move cursor to astronomical (Julian) day number." t) +(autoload 'calendar-print-astro-day-number "cal-julian" + "Show the astro date equivalents of date." + t) + (autoload 'calendar-julian-from-absolute "cal-julian" "Compute the Julian (month day year) corresponding to the absolute DATE. The absolute date is the number of days elapsed since the (imaginary) ＠＠ -1544,6 +1614,10 ＠＠ Driven by the variable `calendar-date-di "String of ISO date of Gregorian date." t) +(autoload 'calendar-goto-islamic-date "cal-islam" + "Move cursor to Islamic date." + t) + (autoload 'calendar-print-islamic-date "cal-islam" "Show the Islamic date equivalents of date." t) ＠＠ -1776,9 +1850,13 ＠＠ Or, for optional MON, YR." (calendar-cursor-to-visible-date (if today-visible today (list displayed-month 1 displayed-year))) (set-buffer-modified-p nil) - (or (one-window-p t) - (/= (frame-width) (window-width)) - (shrink-window (- (window-height) 9))) + (if (or (one-window-p t) (/= (frame-width) (window-width))) + ;; Don't mess with the window size, but ensure that the first + ;; line is fully visible + (if (fboundp 'set-window-vscroll) + (set-window-vscroll nil 0)) + ;; Adjust the window to exactly fit the displayed calendar + (ibuffer-shrink-to-fit )) (sit-for 0) (and mark-holidays-in-calendar (mark-calendar-holidays) ＠＠ -1792,7 +1870,7 ＠＠ Or, for optional MON, YR." (defun generate-calendar (month year) "Generate a three-month Gregorian calendar centered around MONTH, YEAR." (if (< (+ month (* 12 (1- year))) 2) - (error "Months before February, 1 AD are not available.")) + (error "Months before February, 1 AD are not available")) (setq displayed-month month) (setq displayed-year year) (erase-buffer) ＠＠ -1816,6 +1894,7 ＠＠ characters on the line." (goto-char (point-min)) (calendar-insert-indented (calendar-string-spread + ;; XEmacs change - primarily for cal-japanese (list (format "%s %s" (calendar-month-name month) (calendar-year-name year month 1))) ? 20) ＠＠ -1832,8 +1911,9 ＠＠ characters on the line." ;; Put in the days of the month (calendar-for-loop i from 1 to last do (insert (format "%2d " i)) - (put-text-property (- (point) (if (< i 10) 2 3)) (1- (point)) - 'highlight t) + (add-text-properties (- (point) (if (< i 10) 2 3)) (1- (point)) + '(mouse-face highlight + help-echo "mouse-2:menu of operations for this date")) (and (zerop (mod (+ i blank-days) 7)) (/= i last) (calendar-insert-indented "" 0 t) ;; Force onto following line ＠＠ -1887,34 +1967,34 ＠＠ the inserted text. Value is always t." (setq l (cdr l)))) (define-key calendar-mode-map "-" 'negative-argument) (define-key calendar-mode-map "\C-x>" 'scroll-calendar-right) - (define-key calendar-mode-map '[prior] 'scroll-calendar-right-three-months) - (define-key calendar-mode-map "\M-v" 'scroll-calendar-right-three-months) + (define-key calendar-mode-map [prior] 'scroll-calendar-right-three-months) + (define-key calendar-mode-map "\ev" 'scroll-calendar-right-three-months) (define-key calendar-mode-map "\C-x<" 'scroll-calendar-left) - (define-key calendar-mode-map '[next] 'scroll-calendar-left-three-months) + (define-key calendar-mode-map [next] 'scroll-calendar-left-three-months) (define-key calendar-mode-map "\C-v" 'scroll-calendar-left-three-months) (define-key calendar-mode-map "\C-b" 'calendar-backward-day) (define-key calendar-mode-map "\C-p" 'calendar-backward-week) - (define-key calendar-mode-map "\M-{" 'calendar-backward-month) + (define-key calendar-mode-map "\e{" 'calendar-backward-month) (define-key calendar-mode-map "\C-x[" 'calendar-backward-year) (define-key calendar-mode-map "\C-f" 'calendar-forward-day) (define-key calendar-mode-map "\C-n" 'calendar-forward-week) - (define-key calendar-mode-map '[left] 'calendar-backward-day) - (define-key calendar-mode-map '[up] 'calendar-backward-week) - (define-key calendar-mode-map '[right] 'calendar-forward-day) - (define-key calendar-mode-map '[down] 'calendar-forward-week) - (define-key calendar-mode-map "\M-}" 'calendar-forward-month) + (define-key calendar-mode-map [left] 'calendar-backward-day) + (define-key calendar-mode-map [up] 'calendar-backward-week) + (define-key calendar-mode-map [right] 'calendar-forward-day) + (define-key calendar-mode-map [down] 'calendar-forward-week) + (define-key calendar-mode-map "\e}" 'calendar-forward-month) (define-key calendar-mode-map "\C-x]" 'calendar-forward-year) (define-key calendar-mode-map "\C-a" 'calendar-beginning-of-week) (define-key calendar-mode-map "\C-e" 'calendar-end-of-week) - (define-key calendar-mode-map "\M-a" 'calendar-beginning-of-month) - (define-key calendar-mode-map "\M-e" 'calendar-end-of-month) - (define-key calendar-mode-map "\M-<" 'calendar-beginning-of-year) - (define-key calendar-mode-map "\M->" 'calendar-end-of-year) + (define-key calendar-mode-map "\ea" 'calendar-beginning-of-month) + (define-key calendar-mode-map "\ee" 'calendar-end-of-month) + (define-key calendar-mode-map "\e<" 'calendar-beginning-of-year) + (define-key calendar-mode-map "\e>" 'calendar-end-of-year) (define-key calendar-mode-map "\C-＠" 'calendar-set-mark) ;; Many people are used to typing C-SPC and getting C-＠. - (define-key calendar-mode-map "\C- " 'calendar-set-mark) + (define-key calendar-mode-map [?\C- ] 'calendar-set-mark) (define-key calendar-mode-map "\C-x\C-x" 'calendar-exchange-point-and-mark) - (define-key calendar-mode-map "\M-=" 'calendar-count-days-region) + (define-key calendar-mode-map "\e=" 'calendar-count-days-region) (define-key calendar-mode-map "gd" 'calendar-goto-date) (define-key calendar-mode-map "gj" 'calendar-goto-julian-date) (define-key calendar-mode-map "ga" 'calendar-goto-astro-day-number) ＠＠ -1993,7 +2073,7 ＠＠ the inserted text. Value is always t." (define-key calendar-mode-map "tY" 'cal-tex-cursor-year-landscape)) (defun describe-calendar-mode () - "Create a help buffer with a brief description of the calendar-mode." + "Create a help buffer with a brief description of the `calendar-mode'." (interactive) (with-output-to-temp-buffer "*Help*" (princ ＠＠ -2010,13 +2090,38 ＠＠ the inserted text. Value is always t." ;; Calendar mode is suitable only for specially formatted data. (put 'calendar-mode 'mode-class 'special) +;; XEmacs - usage of propertize here is essentially a no-op. +;; xemacs doesn't support text properties in the mode-line. +;; (defvar calendar-mode-line-format (list - (substitute-command-keys "\\<calendar-mode-map>\\[scroll-calendar-left]") + (propertize (substitute-command-keys + "\\<calendar-mode-map>\\[scroll-calendar-left]") + 'help-echo "mouse-2: scroll left" + ) "Calendar" - (substitute-command-keys "\\<calendar-mode-map>\\[calendar-goto-info-node] info/\\[calendar-other-month] other/\\[calendar-goto-today] today") - '(calendar-date-string (calendar-current-date) t) - (substitute-command-keys "\\<calendar-mode-map>\\[scroll-calendar-right]")) + (concat + (propertize + (substitute-command-keys + "\\<calendar-mode-map>\\[calendar-goto-info-node] info") + 'help-echo "mouse-2: read Info on Calendar" + ) + "/" + (propertize + (substitute-command-keys + "\\<calendar-mode-map>\\[calendar-other-month] other") + 'help-echo "mouse-2: choose another month" + ) + "/" + (propertize + (substitute-command-keys + "\\<calendar-mode-map>\\[calendar-goto-today] today") + 'help-echo "mouse-2: go to today's date" + '(calendar-date-string (calendar-current-date) t))) + (propertize (substitute-command-keys + "\\<calendar-mode-map>\\[scroll-calendar-right]") + 'help-echo "mouse-2: scroll right" + )) "The mode line of the calendar buffer.") (defun calendar-goto-info-node () ＠＠ -2026,7 +2131,7 ＠＠ the inserted text. Value is always t." (let ((where (save-window-excursion (Info-find-emacs-command-nodes 'calendar)))) (if (not where) - (error "Couldn't find documentation for the calendar.") + (error "Couldn't find documentation for the calendar") (let (same-window-buffer-names) (info)) (Info-find-node (car (car where)) (car (cdr (car where))))))) ＠＠ -2046,7 +2151,7 ＠＠ For a complete description, type \ (setq buffer-read-only t) (setq indent-tabs-mode nil) (update-calendar-mode-line) - (if (and (string-match "XEmacs" emacs-version) + (if (and (featurep 'xemacs) (featurep 'menubar) current-menubar) (progn (require 'cal-xemacs) ＠＠ -2054,7 +2159,6 ＠＠ For a complete description, type \ (make-variable-buffer-local 'scroll-on-clipped-lines) (setq scroll-on-clipped-lines nil))) - (make-local-hook 'activate-menubar-hook) (add-hook 'activate-menubar-hook 'cal-menu-update nil t) (make-local-variable 'calendar-mark-ring) (make-local-variable 'displayed-month);; Month in middle of window. ＠＠ -2073,7 +2177,9 ＠＠ the STRINGS are just concatenated and th (if (< (length strings) 2) (append (list "") strings (list "")) strings))) + ;; XEmacs change. Mule vs non-Mule (func (if (fboundp 'string-width) 'string-width 'length)) + ;; XEmacs change. primarily for cal-japanese. (n (- length (funcall func (apply 'concat strings)))) (m (1- (length strings))) (s (car strings)) ＠＠ -2085,6 +2191,7 ＠＠ the STRINGS are just concatenated and th (car strings))) (setq i (1+ i)) (setq strings (cdr strings))) + ;; XEmacs change - primarily for cal-japanese (truncate-string-to-width s length))) (defun update-calendar-mode-line () ＠＠ -2094,13 +2201,13 ＠＠ the STRINGS are just concatenated and th (set-buffer calendar-buffer) (setq mode-line-format (calendar-string-spread - calendar-mode-line-format ? (frame-width)))))) + calendar-mode-line-format ? (frame-width)))))) (defun calendar-window-list () "List of all calendar-related windows." (let ((calendar-buffers (calendar-buffer-list)) list) - (walk-windows '(lambda (w) + (walk-windows (lambda (w) (if (memq (window-buffer w) calendar-buffers) (setq list (cons w list)))) nil t) ＠＠ -2142,32 +2249,34 ＠＠ the STRINGS are just concatenated and th (let ((buffer (if (window-live-p window) (window-buffer window)))) (if (memq buffer (calendar-buffer-list)) (cond - ((and window-system + ((and (display-multi-frame-p) (eq 'icon (cdr (assoc 'visibility (frame-parameters (window-frame window)))))) nil) - ((and window-system (window-dedicated-p window)) - (iconify-frame (window-frame window))) + ((and (display-multi-frame-p) (window-dedicated-p window)) + (if calendar-remove-frame-by-deleting + (delete-frame (window-frame window)) + (iconify-frame (window-frame window)))) ((not (and (select-window window) (one-window-p window))) (delete-window window)) (t (set-buffer buffer) (bury-buffer)))))) (defun calendar-current-date () - "Returns the current date in a list (month day year)." + "Return the current date in a list (month day year)." (let ((now (decode-time))) (list (nth 4 now) (nth 3 now) (nth 5 now)))) (defun calendar-cursor-to-date (&optional error) - "Returns a list (month day year) of current cursor position. + "Return a list (month day year) of current cursor position. If cursor is not on a specific date, signals an error if optional parameter ERROR is t, otherwise just returns nil." ;; #### This check is to avoid a race condition created by ;; pop-to-buffer's call to other-window interacting with the 19.13 ;; changes allowing that to be in another frame. - (if (not (number-or-marker-p displayed-month)) - nil +; (if (not (number-or-marker-p displayed-month)) +; nil (let* ((segment (/ (current-column) 25)) (month (% (+ displayed-month segment -1) 12)) (month (if (= 0 month) 12 month)) ＠＠ -2190,7 +2299,8 ＠＠ ERROR is t, otherwise just returns nil." (if (looking-at ".\\*\\*") (list month calendar-starred-day year) (if error (error "Not on a date!")))) - (if error (error "Not on a date!"))))))) + (if error (error "Not on a date!")))))) +;) ;; The following version of calendar-gregorian-from-absolute is preferred for ;; reasons of clarity, BUT it's much slower than the version that follows it. ＠＠ -2319,13 +2429,13 ＠＠ is a string to insert in the minibuffer value)) (defun calendar-read-date (&optional noday) - "Prompt for Gregorian date. Returns a list (month day year). + "Prompt for Gregorian date. Return a list (month day year). If optional NODAY is t, does not ask for day, but just returns \(month nil year); if NODAY is any other non-nil value the value returned is \(month year) " (let* ((year (calendar-read "Year (>0): " - '(lambda (x) (> x 0)) + (lambda (x) (> x 0)) (int-to-string (extract-calendar-year (calendar-current-date))))) (month-array calendar-month-name-array) ＠＠ -2343,7 +2453,7 ＠＠ If optional NODAY is t, does not ask for (list month year)) (list month (calendar-read (format "Day (1-%d): " last) - '(lambda (x) (and (< 0 x) (<= x last)))) + (lambda (x) (and (< 0 x) (<= x last)))) year)))) (defun calendar-interval (mon1 yr1 mon2 yr2) ＠＠ -2352,21 +2462,26 ＠＠ If optional NODAY is t, does not ask for (- mon2 mon1))) (defun calendar-day-name (date &optional width absolute) - "Returns a string with the name of the day of the week of DATE. + "Return a string with the name of the day of the week of DATE. If WIDTH is non-nil, return just the first WIDTH characters of the name. If ABSOLUTE is non-nil, then DATE is actually the day-of-the-week rather than a date." (let ((string (aref calendar-day-name-array (if absolute date (calendar-day-of-week date))))) - (if width - (let ((i 0) (result "") (pos 0)) - (while (and (< i width) (< i (length string))) - (let ((chartext (char-to-string (aref string pos)))) - (setq pos (+ pos (length chartext))) - (setq result (concat result chartext))) - (setq i (1+ i))) - result) - string))) +; (if width +; (let ((i 0) (result "") (pos 0)) +; (while (and (< i width) (< i (length string))) +; (let ((chartext (char-to-string (aref string pos)))) +; (setq pos (+ pos (length chartext))) +; (setq result (concat result chartext))) +; (setq i (1+ i))) +; result) +; string))) + + (cond ((null width) string) + (enable-multibyte-characters (truncate-string-to-width string width)) + (t (substring string 0 width))))) + (defvar calendar-english-day-name-array ["Sunday" "Monday" "Tuesday" "Wednesday" "Thursday" "Friday" "Saturday"]) ＠＠ -2385,7 +2500,7 ＠＠ Start at index 1, unless optional START- If FILTER is provided, apply it to each item in the list." (let ((index (if start-index (1- start-index) 0))) (mapcar - '(lambda (x) + (lambda (x) (setq index (1+ index)) (cons (if filter (funcall filter x) x) index)) ＠＠ -2397,6 +2512,7 ＠＠ If WIDTH is non-nil, return just the fir (let ((string (aref calendar-month-name-array (1- month)))) (if width (let ((i 0) (result "") (pos 0)) + ;; XEmacs change - primarily for cal-japanese. (while (and (< i width) (< i (length string))) (let ((chartext (char-to-string (aref string pos)))) (setq pos (+ pos (length chartext))) ＠＠ -2413,7 +2529,7 ＠＠ If WIDTH is non-nil, return just the fir (funcall calendar-year-name-function year month day)) (defun calendar-day-of-week (date) - "Returns the day-of-the-week index of DATE, 0 for Sunday, 1 for Monday, etc." + "Return the day-of-the-week index of DATE, 0 for Sunday, 1 for Monday, etc." (% (calendar-absolute-from-gregorian date) 7)) (defun calendar-unmark () ＠＠ -2424,14 +2540,14 ＠＠ If WIDTH is non-nil, return just the fir (redraw-calendar)) (defun calendar-date-is-visible-p (date) - "Returns t if DATE is legal and is visible in the calendar window." + "Return t if DATE is legal and is visible in the calendar window." (let ((gap (calendar-interval displayed-month displayed-year (extract-calendar-month date) (extract-calendar-year date)))) (and (calendar-date-is-legal-p date) (> 2 gap) (< -2 gap)))) (defun calendar-date-is-legal-p (date) - "Returns t if DATE is a legal date." + "Return t if DATE is a legal date." (let ((month (extract-calendar-month date)) (day (extract-calendar-day date)) (year (extract-calendar-year date))) ＠＠ -2440,7 +2556,7 ＠＠ If WIDTH is non-nil, return just the fir (<= 1 year)))) (defun calendar-date-equal (date1 date2) - "Returns t if the DATE1 and DATE2 are the same." + "Return t if the DATE1 and DATE2 are the same." (and (= (extract-calendar-month date1) (extract-calendar-month date2)) (= (extract-calendar-day date1) (extract-calendar-day date2)) ＠＠ -2449,7 +2565,7 ＠＠ If WIDTH is non-nil, return just the fir (defun mark-visible-calendar-date (date &optional mark) "Mark DATE in the calendar window with MARK. MARK is either a single-character string or a face. -MARK defaults to diary-entry-marker." +MARK defaults to `diary-entry-marker'." (if (calendar-date-is-legal-p date) (save-excursion (set-buffer calendar-buffer) ＠＠ -2466,10 +2582,10 ＠＠ MARK defaults to diary-entry-marker." (defun calendar-star-date () "Replace the date under the cursor in the calendar window with asterisks. -This function can be used with the today-visible-calendar-hook run after the +This function can be used with the `today-visible-calendar-hook' run after the calendar window has been prepared." - (let ((buffer-read-only nil)) - (make-variable-buffer-local 'calendar-starred-day) + (let ((inhibit-read-only t)) + (make-local-variable 'calendar-starred-day) (forward-char 1) (setq calendar-starred-day (string-to-int ＠＠ -2481,15 +2597,15 ＠＠ calendar window has been prepared." (defun calendar-mark-today () "Mark the date under the cursor in the calendar window. -The date is marked with calendar-today-marker. This function can be used with -the today-visible-calendar-hook run after the calendar window has been +The date is marked with `calendar-today-marker'. This function can be used with +the `today-visible-calendar-hook' run after the calendar window has been prepared." (mark-visible-calendar-date (calendar-cursor-to-date) calendar-today-marker)) (defun calendar-date-compare (date1 date2) - "Returns t if DATE1 is before DATE2, nil otherwise. + "Return t if DATE1 is before DATE2, nil otherwise. The actual dates are in the car of DATE1 and DATE2." (< (calendar-absolute-from-gregorian (car date1)) (calendar-absolute-from-gregorian (car date2)))) ＠＠ -2516,7 +2632,7 ＠＠ omits the name of the day of the week." (mapconcat 'eval calendar-date-display-form ""))) (defun calendar-dayname-on-or-before (dayname date) - "Returns the absolute date of the DAYNAME on or before absolute DATE. + "Return the absolute date of the DAYNAME on or before absolute DATE. DAYNAME=0 means Sunday, DAYNAME=1 means Monday, and so on. Note: Applying this function to d+6 gives us the DAYNAME on or after an 1.5 +96 -78 XEmacs/packages/xemacs-packages/calendar/diary-lib.el Index: diary-lib.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/calendar/diary-lib.el,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- diary-lib.el 2000/01/08 17:45:57 1.4 +++ diary-lib.el 2006/07/31 02:15:23 1.5 ＠＠ -1,4 +1,4 ＠＠ -;;; diary-lib.el --- diary functions. +;;; diary-lib.el --- diary functions ;; Copyright (C) 1989, 1990, 1992, 1993, 1994, 1995 Free Software ;; Foundation, Inc. ＠＠ -23,7 +23,7 ＠＠ ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. -;;; (Mostly) Synched up with: FSF 20.5 +;;; (Mostly) Synched up with: FSF 21.4 ;;; XEmacs has extra function `diary-countdown' ;;; Commentary: ＠＠ -100,23 +100,23 ＠＠ The holidays are those in the list `cale t) (autoload 'diary-french-date "cal-french" - "French calendar equivalent of date diary entry." + "French calendar equivalent of date diary entry." t) (autoload 'diary-mayan-date "cal-mayan" - "Mayan calendar equivalent of date diary entry." + "Mayan calendar equivalent of date diary entry." t) (autoload 'diary-iso-date "cal-iso" - "ISO calendar equivalent of date diary entry." + "ISO calendar equivalent of date diary entry." t) (autoload 'diary-julian-date "cal-julian" - "Julian calendar equivalent of date diary entry." + "Julian calendar equivalent of date diary entry." t) (autoload 'diary-astro-day-number "cal-julian" - "Astronomical (Julian) day number diary entry." + "Astronomical (Julian) day number diary entry." t) (autoload 'diary-chinese-date "cal-china" ＠＠ -124,27 +124,27 ＠＠ The holidays are those in the list `cale t) (autoload 'diary-islamic-date "cal-islam" - "Islamic calendar equivalent of date diary entry." + "Islamic calendar equivalent of date diary entry." t) (autoload 'list-islamic-diary-entries "cal-islam" - "Add any Islamic date entries from the diary file to `diary-entries-list'." + "Add any Islamic date entries from the diary file to `diary-entries-list'." t) (autoload 'mark-islamic-diary-entries "cal-islam" - "Mark days in the calendar window that have Islamic date diary entries." + "Mark days in the calendar window that have Islamic date diary entries." t) (autoload 'mark-islamic-calendar-date-pattern "cal-islam" "Mark dates in calendar window that conform to Islamic date MONTH/DAY/YEAR." - t) + t) (autoload 'diary-hebrew-date "cal-hebrew" "Hebrew calendar equivalent of date diary entry." t) (autoload 'diary-omer "cal-hebrew" - "Omer count diary entry." + "Omer count diary entry." t) (autoload 'diary-yahrzeit "cal-hebrew" ＠＠ -169,7 +169,7 ＠＠ The holidays are those in the list `cale (autoload 'mark-hebrew-calendar-date-pattern "cal-hebrew" "Mark dates in calendar window that conform to Hebrew date MONTH/DAY/YEAR." - t) + t) (autoload 'diary-coptic-date "cal-coptic" "Coptic calendar equivalent of date diary entry." ＠＠ -200,6 +200,7 ＠＠ It is the standard syntax table used in syntax of `*' changed to be a word constituent.") (modify-syntax-entry ?* "w" diary-syntax-table) +(modify-syntax-entry ?: "w" diary-syntax-table) ;;;###autoload (defun list-diary-entries (date number) ＠＠ -239,7 +240,7 ＠＠ These hooks have the following distinct (if (< 0 number) (let* ((original-date date);; save for possible use in the hooks (old-diary-syntax-table) - (diary-entries-list) + (diary-entries-list) (date-string (calendar-date-string date)) (d-file (substitute-in-file-name diary-file))) (message "Preparing diary...") ＠＠ -258,10 +259,12 ＠＠ These hooks have the following distinct (let ((buffer-read-only nil) (diary-modified (buffer-modified-p)) (mark (regexp-quote diary-nonmarking-symbol))) + ;; First and last characters must be ^M or \n for + ;; selective display to work properly (goto-char (1- (point-max))) (if (not (looking-at "\^M\\|\n")) (progn - (forward-char 1) + (goto-char (point-max)) (insert-string "\^M"))) (goto-char (point-min)) (if (not (looking-at "\^M\\|\n")) ＠＠ -325,12 +328,12 ＠＠ These hooks have the following distinct (point) ?\^M ?\n t) (add-to-diary-list date - (buffer-substring-no-properties + (buffer-substring-no-properties entry-start (point)) (buffer-substring-no-properties - (1+ date-start) (1- entry-start))))))) - (setq d (cdr d))) - (or entry-found + (1+ date-start) (1- entry-start)) ))))) + (setq d (cdr d))) + (or entry-found (not diary-list-include-blanks) (setq diary-entries-list (append diary-entries-list ＠＠ -366,20 +369,29 ＠＠ changing the variable `diary-include-str (regexp-quote diary-include-string) " \"\\([^\"]*\\)\"") nil t) - (let ((diary-file (substitute-in-file-name + (let* ((diary-file (substitute-in-file-name (buffer-substring-no-properties (match-beginning 2) (match-end 2)))) (diary-list-include-blanks nil) (list-diary-entries-hook 'include-other-diary-files) (diary-display-hook 'ignore) - (diary-hook nil)) + (diary-hook nil) + (d-buffer (find-buffer-visiting diary-file)) + (diary-modified (if d-buffer + (save-excursion + (set-buffer d-buffer) + (buffer-modified-p))))) (if (file-exists-p diary-file) (if (file-readable-p diary-file) (unwind-protect (setq diary-entries-list (append diary-entries-list (list-diary-entries original-date number))) - (kill-buffer (find-buffer-visiting diary-file))) + (save-excursion + (set-buffer (find-buffer-visiting diary-file)) + (subst-char-in-region (point-min) (point-max) ?\^M ?\n t) + (setq selective-display nil) + (set-buffer-modified-p diary-modified))) (beep) (message "Can't read included diary file %s" diary-file) (sleep-for 2)) ＠＠ -494,7 +506,7 ＠＠ This function is provided for optional u (if date-holiday-list (insert ": ")) (let* ((l (current-column)) (longest 0)) - (insert (mapconcat '(lambda (x) + (insert (mapconcat (lambda (x) (if (< longest (length x)) (setq longest (length x))) x) ＠＠ -625,32 +637,23 ＠＠ You may have to tweak the syntax of the system. Alternatively, you can specify a cron entry: 0 1 * * * diary-rem.sh to run it every morning at 1am." - (interactive "p") - (let ((text nil) - ;; Use the fancy-diary-display as it doesn't hide rest of - ;; diary file with ^M characters. It also looks nicer. - (diary-display-hook 'fancy-diary-display)) - (if (not current-prefix-arg) - (setq ndays diary-mail-days)) - (calendar) - (view-diary-entries ndays) - (set-buffer fancy-diary-buffer) - (setq text (buffer-substring (point-min) (point-max))) - - ;; Now send text as a mail message. - (mail) - (mail-to) - (insert diary-mail-addr) - (mail-subject) - (insert "Diary entries generated ") - (insert (format-time-string "%a %d %b %Y" (current-time))) - (mail-text) - (insert text) - (mail-send-and-exit nil) - (exit-calendar))) + (interactive "P") + (let* ((diary-display-hook 'fancy-diary-display) + (diary-list-include-blanks t) + (text (progn (list-diary-entries (calendar-current-date) + (if ndays ndays diary-mail-days)) + (set-buffer fancy-diary-buffer) + (buffer-substring (point-min) (point-max))))) + (mail) + (mail-to) (insert diary-mail-addr) + (mail-subject) (insert "Diary entries generated " + (calendar-date-string (calendar-current-date))) + (mail-text) (insert text) + (mail-send-and-exit nil))) + (defun diary-name-pattern (string-array &optional fullname) - "Convert an STRING-ARRAY, an array of strings to a pattern. + "Convert a STRING-ARRAY, an array of strings to a pattern. The pattern will match any of the strings, either entirely or abbreviated to three characters. An abbreviated form will match with or without a period; If the optional FULLNAME is t, abbreviations will not match, just the full ＠＠ -774,7 +777,7 ＠＠ After the entries are marked, the hooks (calendar-make-alist calendar-day-name-array 0 - '(lambda (x) (substring x 0 3)))))) + (lambda (x) (substring x 0 3)))))) (if mm-name (if (string-equal mm-name "*") (setq mm 0) ＠＠ -784,7 +787,7 ＠＠ After the entries are marked, the hooks (calendar-make-alist calendar-month-name-array 1 - '(lambda (x) (substring x 0 3))) + (lambda (x) (substring x 0 3))) ))))) (mark-calendar-date-pattern mm dd yy)))) (setq d (cdr d)))) ＠＠ -808,7 +811,7 ＠＠ is marked. See the documentation for th (m) (y) (first-date) - (last-date)) + (last-date)) (save-excursion (set-buffer calendar-buffer) (setq m displayed-month) ＠＠ -968,20 +971,20 ＠＠ example, returns 1325 for 1:25pm. Retur XX:XX (military time), and XXam, XXAM, XXpm, XXPM, XX:XXam, XX:XXAM XX:XXpm, or XX:XXPM." (let ((case-fold-search nil)) - (cond ((string-match;; Military time - "^[ \t]*\\([0-9]?[0-9]\\):?\\([0-9][0-9]\\)\\(\\>\\|[^ap]\\)" s) + (cond ((string-match;; Military time + "\\`[ \t\n\\^M]*\\([0-9]?[0-9]\\):?\\([0-9][0-9]\\)\\(\\>\\|[^ap]\\)" s) (+ (* 100 (string-to-int (substring s (match-beginning 1) (match-end 1)))) (string-to-int (substring s (match-beginning 2) (match-end 2))))) ((string-match;; Hour only XXam or XXpm - "^[ \t]*\\([0-9]?[0-9]\\)\\([ap]\\)m\\>" s) + "\\`[ \t\n\\^M]*\\([0-9]?[0-9]\\)\\([ap]\\)m\\>" s) (+ (* 100 (% (string-to-int (substring s (match-beginning 1) (match-end 1))) 12)) (if (equal ?a (downcase (aref s (match-beginning 2)))) 0 1200))) ((string-match;; Hour and minute XX:XXam or XX:XXpm - "^[ \t]*\\([0-9]?[0-9]\\):\\([0-9][0-9]\\)\\([ap]\\)m\\>" s) + "\\`[ \t\n\\^M]*\\([0-9]?[0-9]\\):\\([0-9][0-9]\\)\\([ap]\\)m\\>" s) (+ (* 100 (% (string-to-int (substring s (match-beginning 1) (match-end 1))) 12)) ＠＠ -990,6 +993,8 ＠＠ or XX:XXPM." 0 1200))) (t diary-unknown-time))));; Unrecognizable +;; Unrecognizable + (defun list-sexp-diary-entries (date) "Add sexp entries for DATE from the diary file to `diary-entries-list'. Also, Make them visible in the diary file. Returns t if any entries were ＠＠ -1022,7 +1027,7 ＠＠ A number of built-in functions are avail `european-calendar-style' is nil, and DAY, MONTH, YEAR if `european-calendar-style' is t. DAY, MONTH, and YEAR can be lists of integers, the constant t, or an integer. - The constant t means all values. + The constant t means all values. %%(diary-float MONTH DAYNAME N &optional DAY) text Entry will appear on the Nth DAYNAME of MONTH. ＠＠ -1031,13 +1036,13 ＠＠ A number of built-in functions are avail the month. MONTH can be a list of months, a single month, or t to specify all months. Optional DAY means Nth DAYNAME of MONTH on or after/before DAY. DAY defaults - to 1 if N>0 and the last day of the month if N<0. + to 1 if N>0 and the last day of the month if N<0. %%(diary-block M1 D1 Y1 M2 D2 Y2) text Entry will appear on dates between M1/D1/Y1 and M2/D2/Y2, inclusive. (If `european-calendar-style' is t, the order of the parameters should be changed to D1, M1, Y1, - D2, M2, Y2.) + D2, M2, Y2.) %%(diary-countdown BEFORE AFTER M1 D1 Y1) text Entry will appear on dates between BEFORE days before ＠＠ -1054,7 +1059,7 ＠＠ A number of built-in functions are avail of years since the MONTH DAY, YEAR and %s will be replaced by the ordinal ending of that number (that is, `st', `nd', `rd' or `th', as appropriate. The anniversary of February - 29 is considered to be March 1 in a non-leap year. + 29 is considered to be March 1 in a non-leap year. %%(diary-cyclic N MONTH DAY YEAR) text Entry will appear every N days, starting MONTH DAY, YEAR. ＠＠ -1063,7 +1068,7 ＠＠ A number of built-in functions are avail can contain %d or %d%s; %d will be replaced by the number of repetitions since the MONTH DAY, YEAR and %s will be replaced by the ordinal ending of that number (that is, - `st', `nd', `rd' or `th', as appropriate. + `st', `nd', `rd' or `th', as appropriate. %%(diary-remind SEXP DAYS &optional MARKING) text Entry is a reminder for diary sexp SEXP. DAYS is either a ＠＠ -1212,11 +1217,11 ＠＠ best if they are nonmarking." lines))) diary-file sexp) (sleep-for 2)))))) - (if (stringp result) - result + (if (stringp result) + result (if result - entry - nil)))) + entry + nil)))) (defun diary-date (month day year) "Specific date(s) diary entry. ＠＠ -1260,7 +1265,7 ＠＠ D1, M1, Y1, D2, M2, Y2 if `european-cale (list m2 d2 y2)))) (d (calendar-absolute-from-gregorian date))) (if (and (<= date1 d) (<= d date2)) - entry))) + entry))) (defun diary-countdown (before after m1 d1 y1) "Countdown diary entry. ＠＠ -1314,9 +1319,10 ＠＠ An optional parameter DAY means the Nth (d2 (extract-calendar-day last)) (y2 (extract-calendar-year last))) (if (or (and (= m1 m2) ; only possible base dates in one month - (or (and (listp month) (memq m1 month)) - (eq month t) - (= m1 month)) + (or (eq month t) + (if (listp month) + (memq m1 month) + (= m1 month))) (let ((d (or day (if (> n 0) 1 (calendar-last-day-of-month m1 y1))))) ＠＠ -1327,22 +1333,25 ＠＠ An optional parameter DAY means the Nth (or ;; m1, d1 works as a base date (and - (or (and (listp month) (memq m1 month)) - (eq month t) - (= m1 month)) + (or (eq month t) + (if (listp month) + (memq m1 month) + (= m1 month))) (<= d1 (or day (if (> n 0) 1 (calendar-last-day-of-month m1 y1))))) ;; m2, d2 works as a base date - (and (or (and (listp month) (memq m2 month)) - (eq month t) - (= m2 month)) + (and (or (eq month t) + (if (listp month) + (memq m2 month) + (= m2 month))) (<= (or day (if (> n 0) 1 (calendar-last-day-of-month m2 y2))) d2))))) entry)))) + (defun diary-anniversary (month day year) "Anniversary diary entry. Entry applies if date is the anniversary of MONTH, DAY, YEAR if ＠＠ -1364,14 +1373,15 ＠＠ to be March 1 in non-leap years." (setq m 3 d 1)) (if (and (> diff 0) (calendar-date-equal (list m d y) date)) - (format entry diff (diary-ordinal-suffix diff))))) + (format entry diff (diary-ordinal-suffix diff))))) (defun diary-cyclic (n month day year) "Cycle diary entry--entry applies every N days starting at MONTH, DAY, YEAR. If `european-calendar-style' is t, parameters are N, DAY, MONTH, YEAR. ENTRY can contain `%d' or `%d%s'; the %d will be replaced by the number of -years since the MONTH DAY, YEAR and the %s will be replaced by the ordinal -ending of that number (that is, `st', `nd', `rd' or `th', as appropriate." +repetitions since the MONTH DAY, YEAR and %s will be replaced by the +ordinal ending of that number (that is, `st', `nd', `rd' or `th', as +appropriate." (let* ((d (if european-calendar-style month day)) ＠＠ -1383,7 +1393,7 ＠＠ ending of that number (that is, `st', `n (list m d year)))) (cycle (/ diff n))) (if (and (>= diff 0) (zerop (% diff n))) - (format entry cycle (diary-ordinal-suffix cycle))))) + (format entry cycle (diary-ordinal-suffix cycle))))) (defun diary-ordinal-suffix (n) "Ordinal suffix for N. (That is, `st', `nd', `rd', or `th', as appropriate.)" ＠＠ -1459,7 +1469,15 ＠＠ Do nothing if DATE or STRING is nil." If omitted, NONMARKING defaults to nil and FILE defaults to diary-file." (find-file-other-window (substitute-in-file-name (if file file diary-file))) + (widen) (goto-char (point-max)) + (when (let ((case-fold-search t)) + (search-backward "Local Variables:" + (max (- (point-max) 3000) (point-min)) + t)) + (beginning-of-line) + (insert "\n") + (previous-line 1)) (insert (if (bolp) "" "\n") (if nonmarking diary-nonmarking-symbol "") ＠＠ -1553,7 +1571,7 ＠＠ Prefix arg will make the entry nonmarkin (format "%s(diary-cyclic %d %s)" sexp-diary-entry-symbol (calendar-read "Repeat every how many days: " - '(lambda (x) (> x 0))) + (lambda (x) (> x 0))) (calendar-date-string (calendar-cursor-to-date t) nil t)) arg))) 1.6 +1 -1 XEmacs/packages/xemacs-packages/calendar/holidays.el Index: holidays.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/calendar/holidays.el,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- holidays.el 2000/01/08 17:45:58 1.5 +++ holidays.el 2006/07/31 02:15:24 1.6 ＠＠ -22,7 +22,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: 1.5 +1 -1 XEmacs/packages/xemacs-packages/calendar/package-info.in Index: package-info.in =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/calendar/package-info.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- package-info.in 2001/12/22 01:02:52 1.4 +++ package-info.in 2006/07/31 02:15:24 1.5 ＠＠ -13,7 +13,7 ＠＠ filename FILENAME md5sum MD5SUM size SIZE - provides (appt cal-china cal-coptic cal-dst cal-french cal-hebrew cal-islam cal-iso cal-japanese cal-julian cal-mayan cal-move cal-persia cal-tex cal-x cal-xemacs calendar diary-lib holidays lunar solar) + provides (appt cal-china cal-coptic cal-dst cal-french cal-hebrew cal-islam cal-iso cal-japanese cal-julian cal-mayan cal-move cal-persia cal-tex cal-x cal-xemacs calendar diary-lib holidays lunar solar timeclock todo-mode) requires (REQUIRES) type regular )) 1.6 +19 -19 XEmacs/packages/xemacs-packages/calendar/solar.el Index: solar.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/calendar/solar.el,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- solar.el 2002/09/25 18:09:10 1.5 +++ solar.el 2006/07/31 02:15:24 1.6 ＠＠ -1,4 +1,4 ＠＠ -;;; solar.el --- calendar functions for solar events. +;;; solar.el --- calendar functions for solar events ;; Copyright (C) 1992, 1993, 1995, 1997 Free Software Foundation, Inc. ＠＠ -25,7 +25,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: ＠＠ -63,7 +63,7 ＠＠ (if (fboundp 'atan) (require 'lisp-float-type) - (error "Solar/lunar calculations impossible since floating point is unavailable.")) + (error "Solar/lunar calculations impossible since floating point is unavailable")) (require 'cal-dst) (require 'cal-julian) ＠＠ -197,8 +197,8 ＠＠ delta. At present, delta = 0.01 degrees "List of season changes for the southern hemisphere.") (defvar solar-sidereal-time-greenwich-midnight - nil - "Sidereal time at Greenwich at midnight (universal time).") + nil + "Sidereal time at Greenwich at midnight (universal time).") (defvar solar-spring-or-summer-season nil "T if spring or summer and nil otherwise. ＠＠ -318,8 +318,8 ＠＠ degrees to find out if polar regions hav (if (not (and rise-time set-time)) (if (or (and (> latitude 0) solar-spring-or-summer-season) (and (< latitude 0) (not solar-spring-or-summer-season))) - (setq day-length 24) - (setq day-length 0)) + (setq day-length 24) + (setq day-length 0)) (setq day-length (- set-time rise-time))) (list (if rise-time (+ rise-time (/ calendar-time-zone 60.0)) nil) (if set-time (+ set-time (/ calendar-time-zone 60.0)) nil) ＠＠ -357,7 +357,7 ＠＠ Uses binary search." (if (< hmin -0.61) (if (> hmax -0.61) (while ;(< i 20) ; we perform a simple dichotomy - ; (> (abs (+ hut 0.61)) epsilon) + ;(> (abs (+ hut 0.61)) epsilon) (>= (abs (- utmoment utmoment-old)) (/ solar-error 60)) (setq utmoment-old utmoment) ＠＠ -420,7 +420,7 ＠＠ local date. The second component of dat Corresponding value is nil if there is no sunrise/sunset." (let* (; first, get the exact moment of local noon. (exact-local-noon (solar-exact-local-noon date)) - ; get the the time from the 2000 epoch. + ; get the time from the 2000 epoch. (t0 (solar-julian-ut-centuries (car exact-local-noon))) ; store the sidereal time at Greenwich at midnight of UT time. ; find if summer or winter slightly above the equator ＠＠ -437,7 +437,7 ＠＠ Corresponding value is nil if there is n ; between sunset and sunrise when there is a sunset and a sunrise) (rise-set (progn - (setq solar-spring-or-summer-season + (setq solar-spring-or-summer-season (if (> (car (cdr (cdr equator-rise-set))) 12) 1 0)) (solar-sunrise-and-sunset (list t0 (car (cdr exact-local-noon))) ＠＠ -916,9 +916,9 ＠＠ No diary entry if there is no sunset on (light (if sunset (cons (- (car sunset) (/ 18.0 60.0)) (cdr sunset))))) (if sunset - (format "%s Sabbath candle lighting" - (apply 'solar-time-string light)))))) - + (format "%s Sabbath candle lighting" + (apply 'solar-time-string light)))))) + (defun solar-equinoxes/solstices (k year) "Date of equinox/solstice K for YEAR. K=0, spring equinox; K=1, summer solstice; K=2, fall equinox; ＠＠ -1045,10 +1045,10 ＠＠ Requires floating point." (d1 (list (car d0) (floor (car (cdr d0))) (car (cdr (cdr d0))))) (h0 (* 24 (- (car (cdr d0)) (floor (car (cdr d0)))))) (adj (dst-adjust-time d1 h0)) - (d2 (car adj)) - (d (list (car d2) (+ (car (cdr d2)) + (d (list (car (car adj)) + (+ (car (cdr (car adj))) (/ (car (cdr adj)) 24.0)) - (car (cdr (cdr d2))))) + (car (cdr (cdr (car adj)))))) ; The following is nearly as accurate, but not quite: ;(d0 (solar-date-next-longitude ; (calendar-astro-from-absolute ＠＠ -1058,15 +1058,15 ＠＠ Requires floating point." ;(abs-day (calendar-absolute-from-astro d))) (abs-day (calendar-absolute-from-gregorian d))) (list - (list d2 + (list (calendar-gregorian-from-absolute (floor abs-day)) (format "%s %s" (nth k (if (and calendar-latitude (< (calendar-latitude) 0)) solar-s-hemi-seasons solar-n-hemi-seasons)) (solar-time-string - (car (cdr adj)) - (if (dst-in-effect abs-day) + (* 24 (- abs-day (floor abs-day))) + (if (dst-in-effect abs-day) calendar-daylight-time-zone-name calendar-standard-time-zone-name)))))))) 1.1 XEmacs/packages/xemacs-packages/calendar/timeclock.el Index: timeclock.el =================================================================== ;;; timeclock.el --- mode for keeping track of how much you work ;; Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw(a)gnu.org&gt; ;; Created: 25 Mar 1999 ;; Version: 2.6 ;; Keywords: calendar data ;; This file is part of XEmacs. ;; XEmacs 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, or (at your option) ;; any later version. ;; XEmacs 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 XEmacs; see the file COPYING. If not, write to the ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;;; Commentary: ;; This mode is for keeping track of time intervals. You can use it ;; for whatever purpose you like, but the typical scenario is to keep ;; track of how much time you spend working on certain projects. ;; ;; Use `timeclock-in' when you start on a project, and `timeclock-out' ;; when you're done. Once you've collected some data, you can use ;; `timeclock-workday-remaining' to see how much time is left to be ;; worked today (assuming a typical average of 8 hours a day), and ;; `timeclock-when-to-leave' which will calculate when you're free. ;; You'll probably want to bind the timeclock commands to some handy ;; keystrokes. At the moment, C-x t is unused in Emacs 20: ;; ;; (require 'timeclock) ;; ;; (define-key ctl-x-map "ti" 'timeclock-in) ;; (define-key ctl-x-map "to" 'timeclock-out) ;; (define-key ctl-x-map "tc" 'timeclock-change) ;; (define-key ctl-x-map "tr" 'timeclock-reread-log) ;; (define-key ctl-x-map "tu" 'timeclock-update-modeline) ;; (define-key ctl-x-map "tw" 'timeclock-when-to-leave-string) ;; If you want XEmacs to display the amount of time "left" to your ;; workday in the modeline, you can either set the value of ;; `timeclock-modeline-display' to t using M-x customize, or you ;; can add this code to your .emacs file: ;; ;; (require 'timeclock) ;; (timeclock-modeline-display) ;; ;; To cancel this modeline display at any time, just call ;; `timeclock-modeline-display' again. ;; You may also want XEmacs to ask you before exiting, if you are ;; current working on a project. This can be done either by setting ;; `timeclock-ask-before-exiting' to t using M-x customize (this is ;; the default), or by adding the following to your .emacs file: ;; ;; (add-hook 'kill-emacs-hook 'timeclock-query-out) ;; NOTE: If you change your .timelog file without using timeclock's ;; functions, or if you change the value of any of timeclock's ;; customizable variables, you should run the command ;; `timeclock-reread-log'. This will recompute any discrepancies in ;; your average working time, and will make sure that the various ;; display functions return the correct value. ;;; History: ;;; Code: (require 'timer) (defgroup timeclock nil "Keeping track time of the time that gets spent." :group 'data) ;;; User Variables: (defcustom timeclock-file (convert-standard-filename "~/.timelog") "*The file used to store timeclock data in." :type 'file :group 'timeclock) (defcustom timeclock-workday (* 8 60 60) "*The length of a work period." :type 'integer :group 'timeclock) (defcustom timeclock-relative t "*When reporting time, make it relative to `timeclock-workday'? For example, if the length of a normal workday is eight hours, and you work four hours on Monday, then the amount of time \"remaining\" on Tuesday is twelve hours -- relative to an averaged work period of eight hours -- or eight hours, non-relative. So relative time takes into account any discrepancy of time under-worked or overworked on previous days." :type 'boolean :group 'timeclock) (defcustom timeclock-get-project-function 'timeclock-ask-for-project "*The function used to determine the name of the current project. When clocking in, and no project is specified, this function will be called to determine what the current project to be worked on is. If this variable is nil, no questions will be asked." :type 'function :group 'timeclock) (defcustom timeclock-get-reason-function 'timeclock-ask-for-reason "*A function used to determine the reason for clocking out. When clocking out, and no reason is specified, this function will be called to determine what the reason is. If this variable is nil, no questions will be asked." :type 'function :group 'timeclock) (defcustom timeclock-get-workday-function nil "*A function used to determine the length of today's workday. The first time that a user clocks in each day, this function will be called to determine what the length of the current workday is. If the return value is nil, or equal to `timeclock-workday', nothing special will be done. If it is a quantity different from `timeclock-workday', however, a record will be output to the timelog file to note the fact that that day has a different length from the norm." :type '(choice (const nil) function) :group 'timeclock) (defcustom timeclock-ask-before-exiting t "*If non-nil, ask if the user wants to clock out before exiting Emacs." :set (lambda (symbol value) (if value (add-hook 'kill-emacs-hook 'timeclock-query-out) (remove-hook 'kill-emacs-hook 'timeclock-query-out)) (setq timeclock-ask-before-exiting value)) :type 'boolean :group 'timeclock) (defvar timeclock-update-timer nil "The timer used to update `timeclock-mode-string'.") (defcustom timeclock-use-display-time t "*If non-nil, use `display-time-hook' for doing modeline updates. The advantage to this is that it means one less timer has to be set running amok in Emacs' process space. The disadvantage is that it requires you to have `display-time' running. If you don't want to use `display-time', but still want the modeline to show how much time is left, set this variable to nil. You will need to restart Emacs (or toggle the value of `timeclock-modeline-display') for the change to take effect." :set (lambda (symbol value) (let ((currently-displaying (and (boundp 'timeclock-modeline-display) timeclock-modeline-display))) ;; if we're changing to the state that ;; `timeclock-modeline-display' is already using, don't ;; bother toggling it. This happens on the initial loading ;; of timeclock.el. (if (and currently-displaying (or (and value (boundp 'display-time-hook) (memq 'timeclock-update-modeline display-time-hook)) (and (not value) timeclock-update-timer))) (setq currently-displaying nil)) (and currently-displaying (set-variable 'timeclock-modeline-display nil)) (setq timeclock-use-display-time value) (and currently-displaying (set-variable 'timeclock-modeline-display t)) timeclock-use-display-time)) :type 'boolean :group 'timeclock :require 'time) (defcustom timeclock-first-in-hook nil "*A hook run for the first \"in\" event each day. Note that this hook is run before recording any events. Thus the value of `timeclock-hours-today', `timeclock-last-event' and the return value of function `timeclock-last-period' are relative previous to today." :type 'hook :group 'timeclock) (defcustom timeclock-load-hook nil "*Hook that gets run after timeclock has been loaded." :type 'hook :group 'timeclock) (defcustom timeclock-in-hook nil "*A hook run every time an \"in\" event is recorded." :type 'hook :group 'timeclock) (defcustom timeclock-day-over-hook nil "*A hook that is run when the workday has been completed. This hook is only run if the current time remaining is being display in the modeline. See the variable `timeclock-modeline-display'." :type 'hook :group 'timeclock) (defcustom timeclock-out-hook nil "*A hook run every time an \"out\" event is recorded." :type 'hook :group 'timeclock) (defcustom timeclock-done-hook nil "*A hook run every time a project is marked as completed." :type 'hook :group 'timeclock) (defcustom timeclock-event-hook nil "*A hook run every time any event is recorded." :type 'hook :group 'timeclock) (defvar timeclock-last-event nil "A list containing the last event that was recorded. The format of this list is (CODE TIME PROJECT).") (defvar timeclock-last-event-workday nil "The number of seconds in the workday of `timeclock-last-event'.") ;;; Internal Variables: (defvar timeclock-discrepancy nil "A variable containing the time discrepancy before the last event. Normally, timeclock assumes that you intend to work for `timeclock-workday' seconds every day. Any days in which you work more or less than this amount is considered either a positive or negative discrepancy. If you work in such a manner that the discrepancy is always brought back to zero, then you will by definition have worked an average amount equal to `timeclock-workday' each day.") (defvar timeclock-elapsed nil "A variable containing the time elapsed for complete periods today. This value is not accurate enough to be useful by itself. Rather, call `timeclock-workday-elapsed', to determine how much time has been worked so far today. Also, if `timeclock-relative' is nil, this value will be the same as `timeclock-discrepancy'.") (defvar timeclock-last-period nil "Integer representing the number of seconds in the last period. Note that you shouldn't access this value, but should use the function `timeclock-last-period' instead.") (defvar timeclock-mode-string nil "The timeclock string (optionally) displayed in the modeline.") (defvar timeclock-day-over nil "The date of the last day when notified \"day over\" for.") ;;; User Functions: ;;;###autoload (defun timeclock-modeline-display (&optional arg) "Toggle display of the amount of time left today in the modeline. If `timeclock-use-display-time' is non-nil, the modeline will be updated whenever the time display is updated. Otherwise, the timeclock will use its own sixty second timer to do its updating. With prefix ARG, turn modeline display on if and only if ARG is positive. Returns the new status of timeclock modeline display \(non-nil means on)." (interactive "P") (let ((on-p (if arg (> (prefix-numeric-value arg) 0) (not timeclock-modeline-display)))) (if on-p (let ((list-entry (memq 'global-mode-string mode-line-format))) (unless (or (null list-entry) (memq 'timeclock-mode-string mode-line-format)) (setcdr list-entry (cons 'timeclock-mode-string (cdr list-entry)))) (unless (memq 'timeclock-update-modeline timeclock-event-hook) (add-hook 'timeclock-event-hook 'timeclock-update-modeline)) (when timeclock-update-timer (cancel-timer timeclock-update-timer) (setq timeclock-update-timer nil)) (if (boundp 'display-time-hook) (remove-hook 'display-time-hook 'timeclock-update-modeline)) (if timeclock-use-display-time (add-hook 'display-time-hook 'timeclock-update-modeline) (setq timeclock-update-timer (run-at-time nil 60 'timeclock-update-modeline)))) (setq mode-line-format (delq 'timeclock-mode-string mode-line-format)) (remove-hook 'timeclock-event-hook 'timeclock-update-modeline) (if (boundp 'display-time-hook) (remove-hook 'display-time-hook 'timeclock-update-modeline)) (when timeclock-update-timer (cancel-timer timeclock-update-timer) (setq timeclock-update-timer nil))) (force-mode-line-update) on-p)) ;; This has to be here so that the function definition of ;; `timeclock-modeline-display' is known to the "set" function. (defcustom timeclock-modeline-display nil "Toggle modeline display of time remaining. You must modify via \\[customize] for this variable to have an effect." :set (lambda (symbol value) (setq timeclock-modeline-display (timeclock-modeline-display (or value 0)))) :type 'boolean :group 'timeclock :require 'timeclock) ;;;###autoload (defun timeclock-in (&optional arg project find-project) "Clock in, recording the current time moment in the timelog. With a numeric prefix ARG, record the fact that today has only that many hours in it to be worked. If arg is a non-numeric prefix arg \(non-nil, but not a number), 0 is assumed (working on a holiday or weekend). *If not called interactively, ARG should be the number of _seconds_ worked today*. This feature only has effect the first time this function is called within a day. PROJECT as the project being clocked into. If PROJECT is nil, and FIND-PROJECT is non-nil -- or the user calls `timeclock-in' interactively -- call the function `timeclock-get-project-function' to discover the name of the project." (interactive (list (and current-prefix-arg (if (numberp current-prefix-arg) (* current-prefix-arg 60 60) 0)))) (if (equal (car timeclock-last-event) "i") (error "You've already clocked in!") (unless timeclock-last-event (timeclock-reread-log)) (unless (equal (timeclock-time-to-date (cadr timeclock-last-event)) (timeclock-time-to-date (current-time))) (let ((workday (or (and (numberp arg) arg) (and arg 0) (and timeclock-get-workday-function (funcall timeclock-get-workday-function)) timeclock-workday))) (run-hooks 'timeclock-first-in-hook) ;; settle the discrepancy for the new day (setq timeclock-discrepancy (- timeclock-discrepancy workday)) (if (not (= workday timeclock-workday)) (timeclock-log "h" (and (numberp arg) (number-to-string arg)))))) (timeclock-log "i" (or project (and timeclock-get-project-function (or find-project (interactive-p)) (funcall timeclock-get-project-function)))) (run-hooks 'timeclock-in-hook))) ;;;###autoload (defun timeclock-out (&optional arg reason find-reason) "Clock out, recording the current time moment in the timelog. If a prefix ARG is given, the user has completed the project that was begun during the last time segment. REASON is the user's reason for clocking out. If REASON is nil, and FIND-REASON is non-nil -- or the user calls `timeclock-out' interactively -- call the function `timeclock-get-reason-function' to discover the reason." (interactive "P") (or timeclock-last-event (error "You haven't clocked in!")) (if (equal (downcase (car timeclock-last-event)) "o") (error "You've already clocked out!") (timeclock-log (if arg "O" "o") (or reason (and timeclock-get-reason-function (or find-reason (interactive-p)) (funcall timeclock-get-reason-function)))) (run-hooks 'timeclock-out-hook) (if arg (run-hooks 'timeclock-done-hook)))) ;;;###autoload (defun timeclock-status-string (&optional show-seconds today-only) "Report the overall timeclock status at the present moment." (interactive "P") (let* ((remainder (timeclock-workday-remaining)) (last-in (equal (car timeclock-last-event) "i")) status) (setq status (format "Currently %s since %s (%s), %s %s, leave at %s" (if last-in "IN" "OUT") (if show-seconds (format-time-string "%-I:%M:%S %p" (nth 1 timeclock-last-event)) (format-time-string "%-I:%M %p" (nth 1 timeclock-last-event))) (or (nth 2 timeclock-last-event) (if last-in "**UNKNOWN**" "workday over")) (timeclock-seconds-to-string remainder show-seconds t) (if (> remainder 0) "remaining" "over") (timeclock-when-to-leave-string show-seconds today-only))) (if (interactive-p) (message status) status))) ;;;###autoload (defun timeclock-change (&optional arg project) "Change to working on a different project, by clocking in then out. With a prefix ARG, consider the previous project as having been finished at the time of changeover. PROJECT is the name of the last project you were working on." (interactive "P") (timeclock-out arg) (timeclock-in nil project (interactive-p))) ;;;###autoload (defun timeclock-query-out () "Ask the user before clocking out. This is a useful function for adding to `kill-emacs-hook'." (if (and (equal (car timeclock-last-event) "i") (y-or-n-p "You're currently clocking time, clock out? ")) (timeclock-out))) ;;;###autoload (defun timeclock-reread-log () "Re-read the timeclock, to account for external changes. Returns the new value of `timeclock-discrepancy'." (interactive) (setq timeclock-discrepancy nil) (timeclock-find-discrep) (if (and timeclock-discrepancy timeclock-modeline-display) (timeclock-update-modeline)) timeclock-discrepancy) (defun timeclock-seconds-to-string (seconds &optional show-seconds reverse-leader) "Convert SECONDS into a compact time string. If SHOW-SECONDS is non-nil, make the resolution of the return string include the second count. If REVERSE-LEADER is non-nil, it means to output a \"+\" if the time value is negative, rather than a \"-\". This is used when negative time values have an inverted meaning (such as with time remaining, where negative time really means overtime)." (if show-seconds (format "%s%d:%02d:%02d" (if (< seconds 0) (if reverse-leader "+" "-") "") (truncate (/ (abs seconds) 60 60)) (% (truncate (/ (abs seconds) 60)) 60) (% (truncate (abs seconds)) 60)) (format "%s%d:%02d" (if (< seconds 0) (if reverse-leader "+" "-") "") (truncate (/ (abs seconds) 60 60)) (% (truncate (/ (abs seconds) 60)) 60)))) (defsubst timeclock-workday-remaining (&optional today-only) "Return the number of seconds until the workday is complete. The amount returned is relative to the value of `timeclock-workday'. If TODAY-ONLY is non-nil, the value returned will be relative only to the time worked today, and not to past time. This argument only makes a difference if `timeclock-relative' is non-nil." (let ((discrep (timeclock-find-discrep))) (if discrep (if today-only (- (cadr discrep)) (- (car discrep))) 0.0))) (defsubst timeclock-currently-in-p () "Return non-nil if the user is currently clocked in." (equal (car timeclock-last-event) "i")) ;;;###autoload (defun timeclock-workday-remaining-string (&optional show-seconds today-only) "Return a string representing the amount of time left today. Display second resolution if SHOW-SECONDS is non-nil. If TODAY-ONLY is non-nil, the display will be relative only to time worked today. See `timeclock-relative' for more information about the meaning of \"relative to today\"." (interactive) (let ((string (timeclock-seconds-to-string (timeclock-workday-remaining today-only) show-seconds t))) (if (interactive-p) (message string) string))) (defsubst timeclock-workday-elapsed () "Return the number of seconds worked so far today. If RELATIVE is non-nil, the amount returned will be relative to past time worked. The default is to return only the time that has elapsed so far today." (let ((discrep (timeclock-find-discrep))) (if discrep (nth 2 discrep) 0.0))) ;;;###autoload (defun timeclock-workday-elapsed-string (&optional show-seconds) "Return a string representing the amount of time worked today. Display seconds resolution if SHOW-SECONDS is non-nil. If RELATIVE is non-nil, the amount returned will be relative to past time worked." (interactive) (let ((string (timeclock-seconds-to-string (timeclock-workday-elapsed) show-seconds))) (if (interactive-p) (message string) string))) (defsubst timeclock-when-to-leave (&optional today-only) "Return a time value representing at when the workday ends today. If TODAY-ONLY is non-nil, the value returned will be relative only to the time worked today, and not to past time. This argument only makes a difference if `timeclock-relative' is non-nil." (timeclock-seconds-to-time (- (timeclock-time-to-seconds (current-time)) (let ((discrep (timeclock-find-discrep))) (if discrep (if today-only (cadr discrep) (car discrep)) 0.0))))) ;;;###autoload (defun timeclock-when-to-leave-string (&optional show-seconds today-only) "Return a string representing at what time the workday ends today. This string is relative to the value of `timeclock-workday'. If NO-MESSAGE is non-nil, no messages will be displayed in the minibuffer. If SHOW-SECONDS is non-nil, the value printed/returned will include seconds. If TODAY-ONLY is non-nil, the value returned will be relative only to the time worked today, and not to past time. This argument only makes a difference if `timeclock-relative' is non-nil." (interactive) (let* ((then (timeclock-when-to-leave today-only)) (string (if show-seconds (format-time-string "%-I:%M:%S %p" then) (format-time-string "%-I:%M %p" then)))) (if (interactive-p) (message string) string))) ;;; Internal Functions: (defvar timeclock-project-list nil) (defvar timeclock-last-project nil) (defun timeclock-completing-read (prompt alist &optional default) "A version of `completing-read' that works on both Emacs and XEmacs." (if (featurep 'xemacs) (let ((str (completing-read prompt alist))) (if (or (null str) (= (length str) 0)) default str)) (completing-read prompt alist nil nil nil nil default))) (defun timeclock-ask-for-project () "Ask the user for the project they are clocking into." (timeclock-completing-read (format "Clock into which project (default \"%s\"): " (or timeclock-last-project (car timeclock-project-list))) (mapcar 'list timeclock-project-list) (or timeclock-last-project (car timeclock-project-list)))) (defvar timeclock-reason-list nil) (defun timeclock-ask-for-reason () "Ask the user for the reason they are clocking out." (timeclock-completing-read "Reason for clocking out: " (mapcar 'list timeclock-reason-list))) (defun timeclock-update-modeline () "Update the `timeclock-mode-string' displayed in the modeline." (interactive) (let* ((remainder (timeclock-workday-remaining)) (last-in (equal (car timeclock-last-event) "i"))) (when (and (< remainder 0) (not (and timeclock-day-over (equal timeclock-day-over (timeclock-time-to-date (current-time)))))) (setq timeclock-day-over (timeclock-time-to-date (current-time))) (run-hooks 'timeclock-day-over-hook)) (setq timeclock-mode-string (format " %c%s%c" (if last-in ?< ?[) (timeclock-seconds-to-string remainder nil t) (if last-in ?> ?]))))) (defun timeclock-log (code &optional project) "Log the event CODE to the timeclock log, at the time of call. If PROJECT is a string, it represents the project which the event is being logged for. Normally only \"in\" events specify a project." (with-current-buffer (find-file-noselect timeclock-file) (goto-char (point-max)) (if (not (bolp)) (insert "\n")) (let ((now (current-time))) (insert code " " (format-time-string "%Y/%m/%d %H:%M:%S" now) (or (and project (stringp project) (> (length project) 0) (concat " " project)) "") "\n") (if (equal (downcase code) "o") (setq timeclock-last-period (- (timeclock-time-to-seconds now) (timeclock-time-to-seconds (cadr timeclock-last-event))) timeclock-discrepancy (+ timeclock-discrepancy timeclock-last-period))) (setq timeclock-last-event (list code now project))) (save-buffer) (run-hooks 'timeclock-event-hook) (kill-buffer (current-buffer)))) (defvar timeclock-moment-regexp (concat "\\([bhioO]\\)\\s-+" "\\([0-9]+\\)/\\([0-9]+\\)/\\([0-9]+\\)\\s-+" "\\([0-9]+\\):\\([0-9]+\\):\\([0-9]+\\)[ \t]*" "\\([^\n]*\\)")) (defsubst timeclock-read-moment () "Read the moment under point from the timelog." (if (looking-at timeclock-moment-regexp) (let ((code (match-string 1)) (year (string-to-number (match-string 2))) (mon (string-to-number (match-string 3))) (mday (string-to-number (match-string 4))) (hour (string-to-number (match-string 5))) (min (string-to-number (match-string 6))) (sec (string-to-number (match-string 7))) (project (match-string 8))) (list code (encode-time sec min hour mday mon year) project)))) (defsubst timeclock-time-to-seconds (time) "Convert TIME to a floating point number." (+ (* (car time) 65536.0) (cadr time) (/ (or (car (cdr (cdr time))) 0) 1000000.0))) (defsubst timeclock-seconds-to-time (seconds) "Convert SECONDS (a floating point number) to an Emacs time structure." (list (floor seconds 65536) (floor (mod seconds 65536)) (floor (* (- seconds (ffloor seconds)) 1000000)))) (defsubst timeclock-time-to-date (time) "Convert the TIME value to a textual date string." (format-time-string "%Y/%m/%d" time)) (defun timeclock-last-period (&optional moment) "Return the value of the last event period. If the last event was a clock-in, the period will be open ended, and growing every second. Otherwise, it is a fixed amount which has been recorded to disk. If MOMENT is non-nil, use that as the current time. This is only provided for coherency when used by `timeclock-discrepancy'." (if (equal (car timeclock-last-event) "i") (- (timeclock-time-to-seconds (or moment (current-time))) (timeclock-time-to-seconds (cadr timeclock-last-event))) timeclock-last-period)) (defsubst timeclock-entry-length (entry) (- (timeclock-time-to-seconds (cadr entry)) (timeclock-time-to-seconds (car entry)))) (defsubst timeclock-entry-begin (entry) (car entry)) (defsubst timeclock-entry-end (entry) (cadr entry)) (defsubst timeclock-entry-project (entry) (nth 2 entry)) (defsubst timeclock-entry-comment (entry) (nth 3 entry)) (defsubst timeclock-entry-list-length (entry-list) (let ((length 0)) (while entry-list (setq length (+ length (timeclock-entry-length (car entry-list)))) (setq entry-list (cdr entry-list))) length)) (defsubst timeclock-entry-list-begin (entry-list) (timeclock-entry-begin (car entry-list))) (defsubst timeclock-entry-list-end (entry-list) (timeclock-entry-end (car (last entry-list)))) (defsubst timeclock-entry-list-span (entry-list) (- (timeclock-time-to-seconds (timeclock-entry-list-end entry-list)) (timeclock-time-to-seconds (timeclock-entry-list-begin entry-list)))) (defsubst timeclock-entry-list-break (entry-list) (- (timeclock-entry-list-span entry-list) (timeclock-entry-list-length entry-list))) (defsubst timeclock-entry-list-projects (entry-list) (let (projects) (while entry-list (let ((project (timeclock-entry-project (car entry-list)))) (if projects (add-to-list 'projects project) (setq projects (list project)))) (setq entry-list (cdr entry-list))) projects)) (defsubst timeclock-day-required (day) (or (car day) timeclock-workday)) (defsubst timeclock-day-length (day) (timeclock-entry-list-length (cdr day))) (defsubst timeclock-day-debt (day) (- (timeclock-day-required day) (timeclock-day-length day))) (defsubst timeclock-day-begin (day) (timeclock-entry-list-begin (cdr day))) (defsubst timeclock-day-end (day) (timeclock-entry-list-end (cdr day))) (defsubst timeclock-day-span (day) (timeclock-entry-list-span (cdr day))) (defsubst timeclock-day-break (day) (timeclock-entry-list-break (cdr day))) (defsubst timeclock-day-projects (day) (timeclock-entry-list-projects (cdr day))) (defmacro timeclock-day-list-template (func) `(let ((length 0)) (while day-list (setq length (+ length (,(eval func) (car day-list)))) (setq day-list (cdr day-list))) length)) (defun timeclock-day-list-required (day-list) (timeclock-day-list-template 'timeclock-day-required)) (defun timeclock-day-list-length (day-list) (timeclock-day-list-template 'timeclock-day-length)) (defun timeclock-day-list-debt (day-list) (timeclock-day-list-template 'timeclock-day-debt)) (defsubst timeclock-day-list-begin (day-list) (timeclock-day-begin (car day-list))) (defsubst timeclock-day-list-end (day-list) (timeclock-day-end (car (last day-list)))) (defun timeclock-day-list-span (day-list) (timeclock-day-list-template 'timeclock-day-span)) (defun timeclock-day-list-break (day-list) (timeclock-day-list-template 'timeclock-day-break)) (defun timeclock-day-list-projects (day-list) (let (projects) (while day-list (let ((projs (timeclock-day-projects (car day-list)))) (while projs (if projects (add-to-list 'projects (car projs)) (setq projects (list (car projs)))) (setq projs (cdr projs)))) (setq day-list (cdr day-list))) projects)) (defsubst timeclock-current-debt (&optional log-data) (nth 0 (or log-data (timeclock-log-data)))) (defsubst timeclock-day-alist (&optional log-data) (nth 1 (or log-data (timeclock-log-data)))) (defun timeclock-day-list (&optional log-data) (let ((alist (timeclock-day-alist log-data)) day-list) (while alist (setq day-list (cons (cdar alist) day-list) alist (cdr alist))) day-list)) (defsubst timeclock-project-alist (&optional log-data) (nth 2 (or log-data (timeclock-log-data)))) (defun timeclock-log-data (&optional recent-only filename) "Return the contents of the timelog file, in a useful format. A timelog contains data in the form of a single entry per line. Each entry has the form: CODE YYYY/MM/DD HH:MM:SS [COMMENT] CODE is one of: b, h, i, o or O. COMMENT is optional when the code is i, o or O. The meanings of the codes are: b Set the current time balance, or \"time debt\". Useful when archiving old log data, when a debt must be carried forward. The COMMENT here is the number of seconds of debt. h Set the required working time for the given day. This must be the first entry for that day. The COMMENT in this case is the number of hours that must be worked. Floating point amounts are allowed. i Clock in. The COMMENT in this case should be the name of the project worked on. o Clock out. COMMENT is unnecessary, but can be used to provide a description of how the period went, for example. O Final clock out. Whatever project was being worked on, it is now finished. Useful for creating summary reports. When this function is called, it will return a data structure with the following format: (DEBT ENTRIES-BY-DAY ENTRIES-BY-PROJECT) DEBT is a floating point number representing the number of seconds \"owed\" before any work was done. For a new file (one without a 'b' entry), this is always zero. The two entries lists have similar formats. They are both alists, where the CAR is the index, and the CDR is a list of time entries. For ENTRIES-BY-DAY, the CAR is a textual date string, of the form YYYY/MM/DD. For ENTRIES-BY-PROJECT, it is the name of the project worked on, or t for the default project. The CDR for ENTRIES-BY-DAY is slightly different than for ENTRIES-BY-PROJECT. It has the following form: (DAY-LENGTH TIME-ENTRIES...) For ENTRIES-BY-PROJECT, there is no DAY-LENGTH member. It is simply a list of TIME-ENTRIES. Note that if DAY-LENGTH is nil, it means whatever is the default should be used. A TIME-ENTRY is a recorded time interval. It has the following format \(although generally one does not have to manipulate these entries directly; see below): (BEGIN-TIME END-TIME PROJECT [COMMENT] [FINAL-P]) Anyway, suffice it to say there are a lot of structures. Typically the user is expected to manipulate to the day(s) or project(s) that he or she wants, at which point the following helper functions may be used: timeclock-day-required timeclock-day-length timeclock-day-debt timeclock-day-begin timeclock-day-end timeclock-day-span timeclock-day-break timeclock-day-projects timeclock-day-list-required timeclock-day-list-length timeclock-day-list-debt timeclock-day-list-begin timeclock-day-list-end timeclock-day-list-span timeclock-day-list-break timeclock-day-list-projects timeclock-entry-length timeclock-entry-begin timeclock-entry-end timeclock-entry-project timeclock-entry-comment timeclock-entry-list-length timeclock-entry-list-begin timeclock-entry-list-end timeclock-entry-list-span timeclock-entry-list-break timeclock-entry-list-projects A few comments should make the use of the above functions obvious: `required' is the amount of time that must be spent during a day, or sequence of days, in order to have no debt. `length' is the actual amount of time that was spent. `debt' is the difference between required time and length. A negative debt signifies overtime. `begin' is the earliest moment at which work began. `end' is the final moment work was done. `span' is the difference between begin and end. `break' is the difference between span and length. `project' is the project that was worked on, and `projects' is a list of all the projects that were worked on during a given period. `comment', where it applies, could mean anything. There are a few more functions available, for locating day and entry lists: timeclock-day-alist LOG-DATA timeclock-project-alist LOG-DATA timeclock-current-debt LOG-DATA See the documentation for the given function if more info is needed." (let* ((log-data (list 0.0 nil nil)) (now (current-time)) (todays-date (timeclock-time-to-date now)) last-date-limited last-date-seconds last-date (line 0) last beg day entry event) (with-temp-buffer (insert-file-contents (or filename timeclock-file)) (when recent-only (goto-char (point-max)) (unless (re-search-backward "^b\\s-+" nil t) (goto-char (point-min)))) (while (or (setq event (timeclock-read-moment)) (and beg (not last) (setq last t event (list "o" now)))) (setq line (1+ line)) (cond ((equal (car event) "b") (setcar log-data (string-to-number (nth 2 event)))) ((equal (car event) "h") (setq last-date-limited (timeclock-time-to-date (cadr event)) last-date-seconds (* (string-to-number (nth 2 event)) 3600.0))) ((equal (car event) "i") (if beg (error "Error in format of timelog file, line %d" line) (setq beg t)) (setq entry (list (cadr event) nil (and (> (length (nth 2 event)) 0) (nth 2 event)))) (let ((date (timeclock-time-to-date (cadr event)))) (if (and last-date (not (equal date last-date))) (progn (setcar (cdr log-data) (cons (cons last-date day) (cadr log-data))) (setq day (list (and last-date-limited last-date-seconds)))) (unless day (setq day (list (and last-date-limited last-date-seconds))))) (setq last-date date last-date-limited nil))) ((equal (downcase (car event)) "o") (if (not beg) (error "Error in format of timelog file, line %d" line) (setq beg nil)) (setcar (cdr entry) (cadr event)) (let ((desc (and (> (length (nth 2 event)) 0) (nth 2 event)))) (if desc (nconc entry (list (nth 2 event)))) (if (equal (car event) "O") (nconc entry (if desc (list t) (list nil t)))) (nconc day (list entry)) (setq desc (nth 2 entry)) (let ((proj (assoc desc (nth 2 log-data)))) (if (null proj) (setcar (cddr log-data) (cons (cons desc (list entry)) (car (cddr log-data)))) (nconc (cdr proj) (list entry))))))) (forward-line)) (if day (setcar (cdr log-data) (cons (cons last-date day) (cadr log-data)))) log-data))) (defun timeclock-find-discrep () "Find overall discrepancy from `timeclock-workday' (in seconds)." ;; This is not implemented in terms of the functions above, because ;; it's a bit wasteful to read all of that data in, just to throw ;; away more than 90% of the information afterwards. ;; ;; If it were implemented using those functions, it would look ;; something like this: ;; (let ((days (timeclock-day-alist (timeclock-log-data))) ;; (total 0.0)) ;; (while days ;; (setq total (+ total (- (timeclock-day-length (cdar days)) ;; (timeclock-day-required (cdar days)))) ;; days (cdr days))) ;; total) (let* ((now (current-time)) (todays-date (timeclock-time-to-date now)) (first t) (accum 0) (elapsed 0) event beg last-date avg last-date-limited last-date-seconds) (unless timeclock-discrepancy (when (file-readable-p timeclock-file) (setq timeclock-project-list nil timeclock-last-project nil timeclock-reason-list nil timeclock-elapsed 0) (with-temp-buffer (insert-file-contents timeclock-file) (goto-char (point-max)) (unless (re-search-backward "^b\\s-+" nil t) (goto-char (point-min))) (while (setq event (timeclock-read-moment)) (cond ((equal (car event) "b") (setq accum (string-to-number (nth 2 event)))) ((equal (car event) "h") (setq last-date-limited (timeclock-time-to-date (cadr event)) last-date-seconds (* (string-to-number (nth 2 event)) 3600.0))) ((equal (car event) "i") (when (and (nth 2 event) (> (length (nth 2 event)) 0)) (add-to-list 'timeclock-project-list (nth 2 event)) (setq timeclock-last-project (nth 2 event))) (let ((date (timeclock-time-to-date (cadr event)))) (if (if last-date (not (equal date last-date)) first) (setq first nil accum (- accum (if last-date-limited last-date-seconds timeclock-workday)))) (setq last-date date last-date-limited nil) (if beg (error "Error in format of timelog file!") (setq beg (timeclock-time-to-seconds (cadr event)))))) ((equal (downcase (car event)) "o") (if (and (nth 2 event) (> (length (nth 2 event)) 0)) (add-to-list 'timeclock-reason-list (nth 2 event))) (if (not beg) (error "Error in format of timelog file!") (setq timeclock-last-period (- (timeclock-time-to-seconds (cadr event)) beg) accum (+ timeclock-last-period accum) beg nil)) (if (equal last-date todays-date) (setq timeclock-elapsed (+ timeclock-last-period timeclock-elapsed))))) (setq timeclock-last-event event timeclock-last-event-workday (if (equal (timeclock-time-to-date now) last-date-limited) last-date-seconds timeclock-workday)) (forward-line)) (setq timeclock-discrepancy accum)))) (unless timeclock-last-event-workday (setq timeclock-last-event-workday timeclock-workday)) (setq accum timeclock-discrepancy elapsed (or timeclock-elapsed elapsed)) (if timeclock-last-event (if (equal (car timeclock-last-event) "i") (let ((last-period (timeclock-last-period now))) (setq accum (+ accum last-period) elapsed (+ elapsed last-period))) (if (not (equal (timeclock-time-to-date (cadr timeclock-last-event)) (timeclock-time-to-date now))) (setq accum (- accum timeclock-last-event-workday))))) (list accum (- elapsed timeclock-last-event-workday) elapsed))) ;;; A reporting function that uses timeclock-log-data (defun timeclock-time-less-p (t1 t2) "Say whether time T1 is less than time T2." (or (< (car t1) (car t2)) (and (= (car t1) (car t2)) (< (nth 1 t1) (nth 1 t2))))) (defun timeclock-day-base (&optional time) "Given a time within a day, return 0:0:0 within that day." (let ((decoded (decode-time (or time (current-time))))) (setcar (nthcdr 0 decoded) 0) (setcar (nthcdr 1 decoded) 0) (setcar (nthcdr 2 decoded) 0) (apply 'encode-time decoded))) (defun timeclock-geometric-mean (l) "Compute the geometric mean of the list L." (let ((total 0) (count 0)) (while l (setq total (+ total (car l)) count (1+ count) l (cdr l))) (if (> count 0) (/ total count) 0))) (defun timeclock-generate-report (&optional html-p) "Generate a summary report based on the current timelog file." (interactive) (let ((log (timeclock-log-data)) (today (timeclock-day-base))) (if html-p (insert "<p>")) (insert "Currently ") (let ((project (nth 2 timeclock-last-event)) (begin (nth 1 timeclock-last-event)) done) (if (timeclock-currently-in-p) (insert "IN") (if (or (null project) (= (length project) 0)) (progn (insert "Done Working Today") (setq done t)) (insert "OUT"))) (unless done (insert " since " (format-time-string "%Y/%m/%d %-I:%M %p" begin)) (if html-p (insert "<br>\n<b>") (insert "\n*")) (if (timeclock-currently-in-p) (insert "Working on ")) (if html-p (insert project "</b><br>\n") (insert project "*\n")) (let ((proj-data (cdr (assoc project (timeclock-project-alist log)))) (two-weeks-ago (timeclock-seconds-to-time (- (timeclock-time-to-seconds today) (* 2 7 24 60 60)))) two-week-len today-len) (while proj-data (if (not (timeclock-time-less-p (timeclock-entry-begin (car proj-data)) today)) (setq today-len (timeclock-entry-list-length proj-data) proj-data nil) (if (and (null two-week-len) (not (timeclock-time-less-p (timeclock-entry-begin (car proj-data)) two-weeks-ago))) (setq two-week-len (timeclock-entry-list-length proj-data))) (setq proj-data (cdr proj-data)))) (if (null two-week-len) (setq two-week-len today-len)) (if html-p (insert "<p>")) (if today-len (insert "\nTime spent on this task today: " (timeclock-seconds-to-string today-len) ". In the last two weeks: " (timeclock-seconds-to-string two-week-len)) (if two-week-len (insert "\nTime spent on this task in the last two weeks: " (timeclock-seconds-to-string two-week-len)))) (if html-p (insert "<br>")) (insert "\n" (timeclock-seconds-to-string (timeclock-workday-elapsed)) " worked today, " (timeclock-seconds-to-string (timeclock-workday-remaining)) " remaining, done at " (timeclock-when-to-leave-string) "\n"))) (if html-p (insert "<p>")) (insert "\nThere have been " (number-to-string (length (timeclock-day-alist log))) " days of activity, starting " (caar (last (timeclock-day-alist log)))) (if html-p (insert "</p>")) (when html-p (insert "<p> <table> <td width=\"25\"><br></td><td> <table border=1 cellpadding=3> <tr><th><i>Statistics</i></th> <th>Entire</th> <th>-30 days</th> <th>-3 mons</th> <th>-6 mons</th> <th>-1 year</th> </tr>") (let* ((day-list (timeclock-day-list)) (thirty-days-ago (timeclock-seconds-to-time (- (timeclock-time-to-seconds today) (* 30 24 60 60)))) (three-months-ago (timeclock-seconds-to-time (- (timeclock-time-to-seconds today) (* 90 24 60 60)))) (six-months-ago (timeclock-seconds-to-time (- (timeclock-time-to-seconds today) (* 180 24 60 60)))) (one-year-ago (timeclock-seconds-to-time (- (timeclock-time-to-seconds today) (* 365 24 60 60)))) (time-in (vector (list t) (list t) (list t) (list t) (list t))) (time-out (vector (list t) (list t) (list t) (list t) (list t))) (breaks (vector (list t) (list t) (list t) (list t) (list t))) (workday (vector (list t) (list t) (list t) (list t) (list t))) (lengths (vector '(0 0) thirty-days-ago three-months-ago six-months-ago one-year-ago))) ;; collect statistics from complete timelog (while day-list (let ((i 0) (l 5)) (while (< i l) (unless (timeclock-time-less-p (timeclock-day-begin (car day-list)) (aref lengths i)) (let ((base (timeclock-time-to-seconds (timeclock-day-base (timeclock-day-begin (car day-list)))))) (nconc (aref time-in i) (list (- (timeclock-time-to-seconds (timeclock-day-begin (car day-list))) base))) (let ((span (timeclock-day-span (car day-list))) (len (timeclock-day-length (car day-list))) (req (timeclock-day-required (car day-list)))) ;; If the day's actual work length is less than ;; 70% of its span, then likely the exit time ;; and break amount are not worthwhile adding to ;; the statistic (when (and (> span 0) (> (/ (float len) (float span)) 0.70)) (nconc (aref time-out i) (list (- (timeclock-time-to-seconds (timeclock-day-end (car day-list))) base))) (nconc (aref breaks i) (list (- span len)))) (if req (setq len (+ len (- timeclock-workday req)))) (nconc (aref workday i) (list len))))) (setq i (1+ i)))) (setq day-list (cdr day-list))) ;; average statistics (let ((i 0) (l 5)) (while (< i l) (aset time-in i (timeclock-geometric-mean (cdr (aref time-in i)))) (aset time-out i (timeclock-geometric-mean (cdr (aref time-out i)))) (aset breaks i (timeclock-geometric-mean (cdr (aref breaks i)))) (aset workday i (timeclock-geometric-mean (cdr (aref workday i)))) (setq i (1+ i)))) ;; Output the HTML table (insert "<tr>\n") (insert "<td align=\"center\">Time in</td>\n") (let ((i 0) (l 5)) (while (< i l) (insert "<td align=\"right\">" (timeclock-seconds-to-string (aref time-in i)) "</td>\n") (setq i (1+ i)))) (insert "</tr>\n") (insert "<tr>\n") (insert "<td align=\"center\">Time out</td>\n") (let ((i 0) (l 5)) (while (< i l) (insert "<td align=\"right\">" (timeclock-seconds-to-string (aref time-out i)) "</td>\n") (setq i (1+ i)))) (insert "</tr>\n") (insert "<tr>\n") (insert "<td align=\"center\">Break</td>\n") (let ((i 0) (l 5)) (while (< i l) (insert "<td align=\"right\">" (timeclock-seconds-to-string (aref breaks i)) "</td>\n") (setq i (1+ i)))) (insert "</tr>\n") (insert "<tr>\n") (insert "<td align=\"center\">Workday</td>\n") (let ((i 0) (l 5)) (while (< i l) (insert "<td align=\"right\">" (timeclock-seconds-to-string (aref workday i)) "</td>\n") (setq i (1+ i)))) (insert "</tr>\n")) (insert "<tfoot> <td colspan=\"6\" align=\"center\"> <i>These are approximate figures</i></td> </tfoot> </table> </td></table>"))))) ;;; A helpful little function (defun timeclock-visit-timelog () "Open up the .timelog file in another window." (interactive) (find-file-other-window timeclock-file)) (provide 'timeclock) (run-hooks 'timeclock-load-hook) ;; make sure we know the list of reasons, projects, and have computed ;; the last event and current discrepancy. (if (file-readable-p timeclock-file) (timeclock-reread-log)) ;;; timeclock.el ends here 1.1 XEmacs/packages/xemacs-packages/calendar/todo-mode.el Index: todo-mode.el =================================================================== ;;; todo-mode.el --- major mode for editing TODO list files ;; Copyright (C) 1997, 1999, 2001 Free Software Foundation, Inc. ;; Author: Oliver Seidel <os10000(a)seidel-space.de&gt; ;; [Not clear the above works, July 2000] ;; Created: 2 Aug 1997 ;; Version: $Id: todo-mode.el,v 1.1 2006/07/31 02:15:24 jmiller Exp $ ;; Keywords: calendar, todo ;; This file is part of GNU Emacs. ;; 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, or (at your option) ;; any later version. ;; 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 GNU Emacs; see the file COPYING. If not, write to the ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;; --------------------------------------------------------------------------- ;;; Commentary: ;; Mode Description ;; ;; TODO is a major mode for EMACS which offers functionality to ;; treat most lines in one buffer as a list of items one has to ;; do. There are facilities to add new items, which are ;; categorised, to edit or even delete items from the buffer. ;; The buffer contents are currently compatible with the diary, ;; so that the list of todo-items will show up in the FANCY diary ;; mode. ;; ;; Notice: Besides the major mode, this file also exports the ;; function `todo-show' which will change to the one specific ;; TODO file that has been specified in the todo-file-do ;; variable. If this file does not conform to the TODO mode ;; conventions, the todo-show function will add the appropriate ;; header and footer. I don't anticipate this to cause much ;; grief, but be warned, in case you attempt to read a plain text ;; file. ;; ;; Preface, Quickstart Installation ;; ;; To get this to work, make emacs execute the line ;; ;; (autoload 'todo-mode "todo-mode" ;; "Major mode for editing TODO lists." t) ;; (autoload 'todo-show "todo-mode" ;; "Show TODO items." t) ;; (autoload 'todo-insert-item "todo-mode" ;; "Add TODO item." t) ;; ;; You may now enter new items by typing "M-x todo-insert-item", ;; or enter your TODO list file by typing "M-x todo-show". ;; ;; The TODO list file has a special format and some auxiliary ;; information, which will be added by the todo-show function if ;; it attempts to visit an un-initialised file. Hence it is ;; recommended to use the todo-show function for the first time, ;; in order to initialise the file, but it is not necessary ;; afterwards. ;; ;; As these commands are quite long to type, I would recommend ;; the addition of two bindings to your to your global keymap. I ;; personally have the following in my initialisation file: ;; ;; (global-set-key "\C-ct" 'todo-show) ;; switch to TODO buffer ;; (global-set-key "\C-ci" 'todo-insert-item) ;; insert new item ;; ;; Note, however, that this recommendation has prompted some ;; criticism, since the keys C-c LETTER are reserved for user ;; functions. I believe my recommendation is acceptable, since ;; the Emacs Lisp Manual *Tips* section also details that the ;; mode itself should not bind any functions to those keys. The ;; express aim of the above two bindings is to work outside the ;; mode, which doesn't need the show function and offers a ;; different binding for the insert function. They serve as ;; shortcuts and are not even needed (since the TODO mode will be ;; entered by visiting the TODO file, and later by switching to ;; its buffer). ;; ;; If you are an advanced user of this package, please consult ;; the whole source code for autoloads, because there are several ;; extensions that are not explicitly listed in the above quick ;; installation. ;; ;; Version ;; ;; Which version of todo-mode.el does this documentation refer to? ;; ;; $Id: todo-mode.el,v 1.1 2006/07/31 02:15:24 jmiller Exp $ ;; ;; Pre-Requisites ;; ;; This package will require the following packages to be ;; available on the load-path: ;; ;; time-stamp ;; easymenu ;; ;; Operation ;; ;; You will have the following facilities available: ;; ;; M-x todo-show will enter the todo list screen, here type ;; ;; + to go to next category ;; - to go to previous category ;; d to file the current entry, including a ;; comment and timestamp ;; e to edit the current entry ;; E to edit a multi-line entry ;; f to file the current entry, including a ;; comment and timestamp ;; i to insert a new entry, with prefix, omit category ;; I to insert a new entry at current cursor position ;; j jump to category ;; k to kill the current entry ;; l to lower the current entry's priority ;; n for the next entry ;; p for the previous entry ;; P print ;; q to save the list and exit the buffer ;; r to raise the current entry's priority ;; s to save the list ;; S to save the list of top priorities ;; t show top priority items for each category ;; ;; When you add a new entry, you are asked for the text and then ;; for the category. I for example have categories for things ;; that I want to do in the office (like mail my mum), that I ;; want to do in town (like buy cornflakes) and things I want to ;; do at home (move my suitcases). The categories can be ;; selected with the cursor keys and if you type in the name of a ;; category which didn't exist before, an empty category of the ;; desired name will be added and filled with the new entry. ;; ;; Configuration ;; ;; Variable todo-prefix ;; ;; I would like to recommend that you use the prefix "*/*" (by ;; leaving the variable 'todo-prefix' untouched) so that the ;; diary displays each entry every day. ;; ;; To understand what I mean, please read the documentation that ;; goes with the calendar since that will tell you how you can ;; set up the fancy diary display and use the #include command to ;; include your todo list file as part of your diary. ;; ;; If you have the diary package set up to usually display more ;; than one day's entries at once, consider using ;; ;; "&%%(equal (calendar-current-date) date)" ;; ;; as the value of `todo-prefix'. Please note that this may slow ;; down the processing of your diary file some. ;; ;; Carsten Dominik <dominik(a)strw.LeidenUniv.nl&gt; suggested that ;; ;; "&%%(todo-cp)" ;; ;; might be nicer and to that effect a function has been declared ;; further down in the code. You may wish to auto-load this. ;; ;; Carsten also writes that that *changing* the prefix after the ;; todo list is already established is not as simple as changing ;; the variable - the todo files have to be changed by hand. ;; ;; Variable todo-file-do ;; ;; This variable is fairly self-explanatory. You have to store ;; your TODO list somewhere. This variable tells the package ;; where to go and find this file. ;; ;; Variable todo-file-done ;; ;; Even when you're done, you may wish to retain the entries. ;; Given that they're timestamped and you are offered to add a ;; comment, this can make a useful diary of past events. It will ;; even blend in with the EMACS diary package. So anyway, this ;; variable holds the name of the file for the filed todo-items. ;; ;; Variable todo-file-top ;; ;; File storing the top priorities of your TODO list when ;; todo-save-top-priorities is non-nil. Nice to include in your ;; diary instead of the complete TODO list. ;; ;; Variable todo-mode-hook ;; ;; Just like other modes, too, this mode offers to call your ;; functions before it goes about its business. This variable ;; will be inspected for any functions you may wish to have ;; called once the other TODO mode preparations have been ;; completed. ;; ;; Variable todo-insert-threshold ;; ;; Another nifty feature is the insertion accuracy. If you have ;; 8 items in your TODO list, then you may get asked 4 questions ;; by the binary insertion algorithm. However, you may not ;; really have a need for such accurate priorities amongst your ;; TODO items. If you now think about the binary insertion ;; halfing the size of the window each time, then the threshhold ;; is the window size at which it will stop. If you set the ;; threshhold to zero, the upper and lower bound will coincide at ;; the end of the loop and you will insert your item just before ;; that point. If you set the threshhold to, e.g. 8, it will stop ;; as soon as the window size drops below that amount and will ;; insert the item in the approximate centre of that window. I ;; got the idea for this feature after reading a very helpful ;; e-mail reply from Trey Jackson <trey(a)cs.berkeley.edu&gt; who ;; corrected some of my awful coding and pointed me towards some ;; good reading. Thanks Trey! ;; ;; Things to do ;; ;; These originally were my ideas, but now also include all the ;; suggestions that I included before forgetting them: ;; ;; o Fancy fonts for todo/top-priority buffer ;; o Remove todo-prefix option in todo-top-priorities ;; o Rename category ;; o Move entry from one category to another one ;; o Entries which both have the generic */* prefix and a ;; "deadline" entry which are understood by diary, indicating ;; an event (unless marked by &) ;; o The optional COUNT variable of todo-forward-item should be ;; applied to the other functions performing similar tasks ;; o Modularization could be done for repeaded elements of ;; the code, like the completing-read lines of code. ;; o license / version function ;; o export to diary file ;; o todo-report-bug ;; o GNATS support ;; o elide multiline (as in bbdb, or, to a lesser degree, in ;; outline mode) ;; o rewrite complete package to store data as lisp objects ;; and have display modes for display, for diary export, ;; etc. (Richard Stallman pointed out this is a bad idea) ;; o so base todo-mode.el on generic-mode.el instead ;; ;; History and Gossip ;; ;; Many thanks to all the ones who have contributed to the ;; evolution of this package! I hope I have listed all of you ;; somewhere in the documentation or at least in the RCS history! ;; ;; Enjoy this package and express your gratitude by sending nice ;; things to my parents' address! ;; ;; Oliver Seidel ;; (Lessingstr. 8, 65760 Eschborn, Federal Republic of Germany) ;;; Code: ;; XEmacs (eval-and-compile (unless (fboundp 'line-beginning-position) (defalias 'line-beginning-position 'point-at-bol)) (unless (fboundp 'line-end-position) (defalias 'line-end-position 'point-at-eol))) ;; User-configurable variables: (defgroup todo nil "Maintain a list of todo items." :link '(emacs-commentary-link "todo-mode") :version "21.1" :group 'calendar) (defcustom todo-prefix "*/*" "*TODO mode prefix for entries. This is useful in conjunction with `calendar' and `diary' if you use #include \"~/.todo-do\" in your diary file to include your todo list file as part of your diary. With the default value \"*/*\" the diary displays each entry every day and it may also be marked on every day of the calendar. Using \"&%%(equal (calendar-current-date) date)\" instead will only show and mark todo entreis for today, but may slow down processing of the diary file somewhat." :type 'string :group 'todo) (defcustom todo-file-do "~/.todo-do" "*TODO mode list file." :type 'file :group 'todo) (defcustom todo-file-done "~/.todo-done" "*TODO mode archive file." :type 'file :group 'todo) (defcustom todo-mode-hook nil "*TODO mode hooks." :type 'hook :group 'todo) (defcustom todo-edit-mode-hook nil "*TODO Edit mode hooks." :type 'hook :group 'todo) (defcustom todo-insert-threshold 0 "*TODO mode insertion accuracy. If you have 8 items in your TODO list, then you may get asked 4 questions by the binary insertion algorithm. However, you may not really have a need for such accurate priorities amongst your TODO items. If you now think about the binary insertion halfing the size of the window each time, then the threshhold is the window size at which it will stop. If you set the threshhold to zero, the upper and lower bound will coincide at the end of the loop and you will insert your item just before that point. If you set the threshhold to, e.g. 8, it will stop as soon as the window size drops below that amount and will insert the item in the approximate centre of that window." :type 'integer :group 'todo) (defvar todo-edit-buffer " *TODO Edit*" "TODO Edit buffer name.") (defcustom todo-file-top "~/.todo-top" "*TODO mode top priorities file. Not in TODO format, but diary compatible. Automatically generated when `todo-save-top-priorities' is non-nil." :type 'string :group 'todo) (defcustom todo-print-function 'ps-print-buffer-with-faces "*Function to print the current buffer." :type 'symbol :group 'todo) (defcustom todo-show-priorities 1 "*Default number of priorities to show by \\[todo-top-priorities]. 0 means show all entries." :type 'integer :group 'todo) (defcustom todo-print-priorities 0 "*Default number of priorities to print by \\[todo-print]. 0 means print all entries." :type 'integer :group 'todo) (defcustom todo-remove-separator t "*Non-nil to remove category separators in\ \\[todo-top-priorities] and \\[todo-print]." :type 'boolean :group 'todo) (defcustom todo-save-top-priorities-too t "*Non-nil makes `todo-save' automatically save top-priorities in `todo-file-top'." :type 'boolean :group 'todo) ;; Thanks for the ISO time stamp format go to Karl Eichwalder <ke(a)suse.de&gt; ;; My format string for the appt.el package is "%3b %2d, %y, %02I:%02M%p". ;; (defcustom todo-time-string-format "%:y-%02m-%02d %02H:%02M" "*TODO mode time string format for done entries. For details see the variable `time-stamp-format'." :type 'string :group 'todo) (defcustom todo-entry-prefix-function 'todo-entry-timestamp-initials "*Function producing text to insert at start of todo entry." :type 'symbol :group 'todo) (defcustom todo-initials (or (getenv "INITIALS") (user-login-name)) "*Initials of todo item author." :type 'string :group 'todo) (autoload 'time-stamp-string "time-stamp") (defun todo-entry-timestamp-initials () "Prepend timestamp and your initials to the head of a TODO entry." (let ((time-stamp-format todo-time-string-format)) (concat (time-stamp-string) " " todo-initials ": "))) ;; --------------------------------------------------------------------------- ;; Set up some helpful context ... (defvar todo-categories nil "TODO categories.") (defvar todo-cats nil "Old variable for holding the TODO categories. Use `todo-categories' instead.") (defvar todo-previous-line 0 "Previous line asked about.") (defvar todo-previous-answer 0 "Previous answer got.") (defvar todo-mode-map (let ((map (make-keymap))) (suppress-keymap map t) (define-key map "+" 'todo-forward-category) (define-key map "-" 'todo-backward-category) (define-key map "d" 'todo-file-item) ;done/delete (define-key map "e" 'todo-edit-item) (define-key map "E" 'todo-edit-multiline) (define-key map "f" 'todo-file-item) (define-key map "i" 'todo-insert-item) (define-key map "I" 'todo-insert-item-here) (define-key map "j" 'todo-jump-to-category) (define-key map "k" 'todo-delete-item) (define-key map "l" 'todo-lower-item) (define-key map "n" 'todo-forward-item) (define-key map "p" 'todo-backward-item) (define-key map "P" 'todo-print) (define-key map "q" 'todo-quit) (define-key map "r" 'todo-raise-item) (define-key map "s" 'todo-save) (define-key map "S" 'todo-save-top-priorities) (define-key map "t" 'todo-top-priorities) map) "TODO mode keymap.") (defvar todo-category-number 0 "TODO category number.") (defvar todo-tmp-buffer-name " *todo tmp*") (defvar todo-category-sep (make-string 75 ?-) "Category separator.") (defvar todo-category-beg " --- " "Category start separator to be prepended onto category name.") (defvar todo-category-end "--- End" "Separator after a category.") (defvar todo-header "-*- mode: todo; " "Header of todo files.") ;; --------------------------------------------------------------------------- (defun todo-category-select () "Make TODO mode display the current category correctly." (let ((name (nth todo-category-number todo-categories))) (setq mode-line-buffer-identification ;; (concat "Category: " name)) (concat "Category: " (format "%18s" name))) (widen) (goto-char (point-min)) (search-forward-regexp (concat "^" (regexp-quote (concat todo-prefix todo-category-beg name)) "$")) (let ((begin (1+ (line-end-position)))) (search-forward-regexp (concat "^" todo-category-end)) (narrow-to-region begin (line-beginning-position)) (goto-char (point-min))))) (defalias 'todo-cat-slct 'todo-category-select) (defun todo-forward-category () "Go forward to TODO list of next category." (interactive) (setq todo-category-number (mod (1+ todo-category-number) (length todo-categories))) (todo-category-select)) (defalias 'todo-cmd-forw 'todo-forward-category) (defun todo-backward-category () "Go back to TODO list of previous category." (interactive) (setq todo-category-number (mod (1- todo-category-number) (length todo-categories))) (todo-category-select)) (defalias 'todo-cmd-back 'todo-backward-category) (defun todo-backward-item () "Select previous entry of TODO list." (interactive) (search-backward-regexp (concat "^" (regexp-quote todo-prefix)) nil t) (message "")) (defalias 'todo-cmd-prev 'todo-backward-item) (defun todo-forward-item (&optional count) "Select COUNT-th next entry of TODO list." (interactive "P") (if (listp count) (setq count (car count))) (end-of-line) (search-forward-regexp (concat "^" (regexp-quote todo-prefix)) nil 'goto-end count) (beginning-of-line) (message "")) (defalias 'todo-cmd-next 'todo-forward-item) (defun todo-save () "Save the TODO list." (interactive) (save-excursion (save-restriction (save-buffer) (if todo-save-top-priorities-too (todo-save-top-priorities)) ))) (defalias 'todo-cmd-save 'todo-save) (defun todo-quit () "Done with TODO list for now." (interactive) (widen) (todo-save) (message "") (bury-buffer)) (defalias 'todo-cmd-done 'todo-quit) (defun todo-edit-item () "Edit current TODO list entry." (interactive) (let ((item (todo-item-string))) (if (todo-string-multiline-p item) (todo-edit-multiline) (let ((new (read-from-minibuffer "Edit: " item))) (todo-remove-item) (insert new "\n") (todo-backward-item) (message ""))))) (defalias 'todo-cmd-edit 'todo-edit-item) (defun todo-edit-multiline () "Set up a buffer for editing a multiline TODO list entry." (interactive) (let ((buffer-name (generate-new-buffer-name todo-edit-buffer))) (switch-to-buffer (make-indirect-buffer (file-name-nondirectory todo-file-do) buffer-name)) (message "To exit, simply kill this buffer and return to list.") (todo-edit-mode) (narrow-to-region (todo-item-start) (todo-item-end)))) ;;;###autoload (defun todo-add-category (cat) "Add new category CAT to the TODO list." (interactive "sCategory: ") (save-window-excursion (setq todo-categories (cons cat todo-categories)) (find-file todo-file-do) (widen) (goto-char (point-min)) (let ((posn (search-forward "-*- mode: todo; " 17 t))) (if (not (null posn)) (goto-char posn)) (if (equal posn nil) (progn (insert "-*- mode: todo; \n") (forward-char -1)) (kill-line))) (insert (format "todo-categories: %S; -*-" todo-categories)) (forward-char 1) (insert (format "%s%s%s\n%s\n%s %s\n" todo-prefix todo-category-beg cat todo-category-end todo-prefix todo-category-sep))) 0) ;;;###autoload (defun todo-add-item-non-interactively (new-item category) "Insert NEW-ITEM in TODO list as a new entry in CATEGORY." (save-excursion (todo-show)) (save-excursion (if (string= "" category) (setq category (nth todo-category-number todo-categories))) (let ((cat-exists (member category todo-categories))) (setq todo-category-number (if cat-exists (- (length todo-categories) (length cat-exists)) (todo-add-category category)))) (todo-show) (setq todo-previous-line 0) (let ((top 1) (bottom (1+ (count-lines (point-min) (point-max))))) (while (> (- bottom top) todo-insert-threshold) (let* ((current (/ (+ top bottom) 2)) (answer (if (< current bottom) (todo-more-important-p current) nil))) (if answer (setq bottom current) (setq top (1+ current))))) (setq top (/ (+ top bottom) 2)) ;; goto-line doesn't have the desired behavior in a narrowed buffer (goto-char (point-min)) (forward-line (1- top))) (insert new-item "\n") (todo-backward-item) (todo-save) (message ""))) ;;;###autoload (defun todo-insert-item (arg) "Insert new TODO list entry. With a prefix argument solicit the category, otherwise use the current category." (interactive "P") (save-excursion (if (not (string-equal mode-name "TODO")) (todo-show)) (let* ((new-item (concat todo-prefix " " (read-from-minibuffer "New TODO entry: " (if todo-entry-prefix-function (funcall todo-entry-prefix-function))))) (categories todo-categories) (history (cons 'categories (1+ todo-category-number))) (current-category (nth todo-category-number todo-categories)) (category (if arg current-category (completing-read (concat "Category [" current-category "]: ") (todo-category-alist) nil nil nil history current-category)))) (todo-add-item-non-interactively new-item category)))) (defalias 'todo-cmd-inst 'todo-insert-item) (defun todo-insert-item-here () "Insert new TODO list entry under the cursor." (interactive "") (save-excursion (if (not (string-equal mode-name "TODO")) (todo-show)) (let* ((new-item (concat todo-prefix " " (read-from-minibuffer "New TODO entry: " (if todo-entry-prefix-function (funcall todo-entry-prefix-function)))))) (insert (concat new-item "\n"))))) (defun todo-more-important-p (line) "Ask whether entry is more important than the one at LINE." (if (not (equal todo-previous-line line)) (progn (setq todo-previous-line line) (goto-char (point-min)) (forward-line (1- todo-previous-line)) (let ((item (todo-item-string-start))) (setq todo-previous-answer (y-or-n-p (concat "More important than '" item "'? ")))))) todo-previous-answer) (defalias 'todo-ask-p 'todo-more-important-p) (defun todo-delete-item () "Delete current TODO list entry." (interactive) (if (> (count-lines (point-min) (point-max)) 0) (let* ((todo-entry (todo-item-string-start)) (todo-answer (y-or-n-p (concat "Permanently remove '" todo-entry "'? ")))) (if todo-answer (progn (todo-remove-item) (todo-backward-item))) (message "")) (error "No TODO list entry to delete"))) (defalias 'todo-cmd-kill 'todo-delete-item) (defun todo-raise-item () "Raise priority of current entry." (interactive) (if (> (count-lines (point-min) (point)) 0) (let ((item (todo-item-string))) (todo-remove-item) (todo-backward-item) (save-excursion (insert item "\n")) (message "")) (error "No TODO list entry to raise"))) (defalias 'todo-cmd-rais 'todo-raise-item) (defun todo-lower-item () "Lower priority of current entry." (interactive) (if (> (count-lines (point) (point-max)) 1) ;; Assume there is a final newline (let ((item (todo-item-string))) (todo-remove-item) (todo-forward-item) (save-excursion (insert item "\n")) (message "")) (error "No TODO list entry to lower"))) (defalias 'todo-cmd-lowr 'todo-lower-item) (defun todo-file-item (&optional comment) "File the current TODO list entry away, annotated with an optional COMMENT." (interactive "sComment: ") (or (> (count-lines (point-min) (point-max)) 0) (error "No TODO list entry to file away")) (let ((time-stamp-format todo-time-string-format)) (if (and comment (> (length comment) 0)) (progn (goto-char (todo-item-end)) (insert (if (save-excursion (beginning-of-line) (looking-at (regexp-quote todo-prefix))) " " "\n\t") "(" comment ")"))) (goto-char (todo-item-end)) (insert " [" (nth todo-category-number todo-categories) "]") (goto-char (todo-item-start)) (let ((temp-point (point))) (if (looking-at (regexp-quote todo-prefix)) (replace-match (time-stamp-string)) ;; Standard prefix -> timestamp ;; Else prefix non-standard item start with timestamp (insert (time-stamp-string))) (append-to-file temp-point (1+ (todo-item-end)) todo-file-done) (delete-region temp-point (1+ (todo-item-end)))) (todo-backward-item) (message ""))) ;; --------------------------------------------------------------------------- ;; Utility functions: ;;;###autoload (defun todo-top-priorities (&optional nof-priorities category-pr-page) "List top priorities for each category. Number of entries for each category is given by NOF-PRIORITIES which defaults to \'todo-show-priorities\'. If CATEGORY-PR-PAGE is non-nil, a page separator \'^L\' is inserted between each category." (interactive "P") (or nof-priorities (setq nof-priorities todo-show-priorities)) (if (listp nof-priorities) ;universal argument (setq nof-priorities (car nof-priorities))) (let ((todo-print-buffer-name todo-tmp-buffer-name) ;;(todo-print-category-number 0) (todo-category-break (if category-pr-page "" "")) (cat-end (concat (if todo-remove-separator (concat todo-category-end "\n" (regexp-quote todo-prefix) " " todo-category-sep "\n") (concat todo-category-end "\n")))) beg end) (todo-show) (save-excursion (save-restriction (widen) (copy-to-buffer todo-print-buffer-name (point-min) (point-max)) (set-buffer todo-print-buffer-name) (goto-char (point-min)) (when (re-search-forward (regexp-quote todo-header) nil t) (beginning-of-line 1) (delete-region (point) (line-end-position))) (while (re-search-forward ;Find category start (regexp-quote (concat todo-prefix todo-category-beg)) nil t) (setq beg (+ (line-end-position) 1)) ;Start of first entry. (re-search-forward cat-end nil t) (setq end (match-beginning 0)) (replace-match todo-category-break) (narrow-to-region beg end) ;In case we have too few entries. (goto-char (point-min)) (if (= 0 nof-priorities) ;Traverse entries. (goto-char end) ;All entries (todo-forward-item nof-priorities)) (setq beg (point)) (delete-region beg end) (widen)) (and (looking-at "") (replace-match "")) ;Remove trailing form-feed. (goto-char (point-min)) ;Due to display buffer )) ;; Could have used switch-to-buffer as it has a norecord argument, ;; which is nice when we are called from e.g. todo-print. ;; Else we could have used pop-to-buffer. (display-buffer todo-print-buffer-name) (message "Type C-x 1 to remove %s window. M-C-v to scroll the help." todo-print-buffer-name))) (defun todo-save-top-priorities (&optional nof-priorities) "Save top priorities for each category in `todo-file-top'. Number of entries for each category is given by NOF-PRIORITIES which defaults to `todo-show-priorities'." (interactive "P") (save-window-excursion (save-excursion (save-restriction (todo-top-priorities nof-priorities) (set-buffer todo-tmp-buffer-name) (write-file todo-file-top) (kill-this-buffer))))) ;;;###autoload (defun todo-print (&optional category-pr-page) "Print todo summary using `todo-print-function'. If CATEGORY-PR-PAGE is non-nil, a page separator `^L' is inserted between each category. Number of entries for each category is given by `todo-print-priorities'." (interactive "P") (save-window-excursion (save-excursion (save-restriction (todo-top-priorities todo-print-priorities category-pr-page) (set-buffer todo-tmp-buffer-name) (and (funcall todo-print-function) (kill-this-buffer)) (message "Todo printing done."))))) (defun todo-jump-to-category () "Jump to a category. Default is previous category." (interactive) (let* ((categories todo-categories) (history (cons 'categories (1+ todo-category-number))) (default (nth todo-category-number todo-categories)) (category (completing-read (concat "Category [" default "]: ") (todo-category-alist) nil nil nil history default))) (if (string= "" category) (setq category (nth todo-category-number todo-categories))) (setq todo-category-number (if (member category todo-categories) (- (length todo-categories) (length (member category todo-categories))) (todo-add-category category))) (todo-show))) (defun todo-line-string () "Return current line in buffer as a string." (buffer-substring (line-beginning-position) (line-end-position))) (defun todo-item-string-start () "Return the start of this TODO list entry as a string." ;; Suitable for putting in the minibuffer when asking the user (let ((item (todo-item-string))) (if (> (length item) 60) (setq item (concat (substring item 0 56) "..."))) item)) (defun todo-item-start () "Return point at start of current TODO list item." (save-excursion (beginning-of-line) (if (not (looking-at (regexp-quote todo-prefix))) (search-backward-regexp (concat "^" (regexp-quote todo-prefix)) nil t)) (point))) (defun todo-item-end () "Return point at end of current TODO list item." (save-excursion (end-of-line) (search-forward-regexp (concat "^" (regexp-quote todo-prefix)) nil 'goto-end) (1- (line-beginning-position)))) (defun todo-remove-item () "Delete the current entry from the TODO list." (delete-region (todo-item-start) (1+ (todo-item-end)))) (defun todo-item-string () "Return current TODO list entry as a string." (buffer-substring (todo-item-start) (todo-item-end))) (defun todo-string-count-lines (string) "Return the number of lines STRING spans." (length (split-string string "\n"))) (defun todo-string-multiline-p (string) "Return non-nil if STRING spans several lines." (> (todo-string-count-lines string) 1)) (defun todo-category-alist () "Generate an alist for use in `completing-read' from `todo-categories'." (mapcar #'list todo-categories)) ;; --------------------------------------------------------------------------- (easy-menu-define todo-menu todo-mode-map "Todo Menu" '("Todo" ["Next category" todo-forward-category t] ["Previous category" todo-backward-category t] ["Jump to category" todo-jump-to-category t] ["Show top priority items" todo-top-priorities t] ["Print categories" todo-print t] "---" ["Edit item" todo-edit-item t] ["File item" todo-file-item t] ["Insert new item" todo-insert-item t] ["Insert item here" todo-insert-item-here t] ["Kill item" todo-delete-item t] "---" ["Lower item priority" todo-lower-item t] ["Raise item priority" todo-raise-item t] "---" ["Next item" todo-forward-item t] ["Previous item" todo-backward-item t] "---" ["Save" todo-save t] ["Save Top Priorities" todo-save-top-priorities t] "---" ["Quit" todo-quit t] )) ;; As calendar reads .todo-do before todo-mode is loaded. ;;;###autoload (defun todo-mode () "Major mode for editing TODO lists. \\{todo-mode-map}" (interactive) (setq major-mode 'todo-mode) (setq mode-name "TODO") (use-local-map todo-mode-map) (easy-menu-add todo-menu) (run-hooks 'todo-mode-hook)) (eval-when-compile (defvar date) (defvar entry)) ;; Read about this function in the setup instructions above! ;;;###autoload (defun todo-cp () "Make a diary entry appear only in the current date's diary." (if (equal (calendar-current-date) date) entry)) (define-derived-mode todo-edit-mode text-mode "TODO Edit" "Major mode for editing items in the TODO list. \\{todo-edit-mode-map}") ;;;###autoload (defun todo-show () "Show TODO list." (interactive) (if (file-exists-p todo-file-do) (find-file todo-file-do) (todo-initial-setup)) (if (null todo-categories) (if (null todo-cats) (error "Error in %s: No categories in list `todo-categories'" todo-file-do) (goto-char (point-min)) (and (search-forward "todo-cats:" nil t) (replace-match "todo-categories:")) (make-local-variable 'todo-categories) (setq todo-categories todo-cats))) (beginning-of-line) (todo-category-select)) (defun todo-initial-setup () "Set up things to work properly in TODO mode." (find-file todo-file-do) (erase-buffer) (todo-mode) (todo-add-category "Todo")) (provide 'todo-mode) ;;; todo-mode.el ends here