This patch removes calendar's dependence on the fsf-compat package. Always a good thing. :-) BTW, Jeff, I think you mentioned something about not knowing how to get patcher to include new files... (setq patcher-default-diff-command "cvs -q diff -uN %f") It's all in the `N'. calendar patch: ChangeLog files diff command: cvs -q diff -U 0 Files affected: ChangeLog Source files diff command: cvs -q diff -uN Files affected: timeclock.el Makefile Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/calendar/ChangeLog,v retrieving revision 1.31 diff -u -p -U0 -r1.31 ChangeLog --- ChangeLog 31 Jul 2006 02:38:09 -0000 1.31 +++ ChangeLog 31 Jul 2006 06:55:25 -0000 ＠＠ -0,0 +1,8 ＠＠ +2006-07-31 Steve Youngs <steve(a)sxemacs.org&gt; + + * Makefile (REQUIRES): Remove fsf-compat. + + * timeclock.el (timeclock-cancel-timer): In XEmacs this is + `delete-itimer', in GNU/Emacs it is `cancel-timer'. + (timeclock-modeline-display): Use it. + Index: Makefile =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/calendar/Makefile,v retrieving revision 1.30 diff -u -p -u -r1.30 Makefile --- Makefile 31 Jul 2006 02:15:22 -0000 1.30 +++ Makefile 31 Jul 2006 06:55:16 -0000 ＠＠ -22,7 +22,7 ＠＠ AUTHOR_VERSION = MAINTAINER = Jeff Miller <jeff.miller(a)xemacs.org&gt; PACKAGE = calendar PKG_TYPE = regular -REQUIRES = xemacs-base ibuffer fsf-compat +REQUIRES = xemacs-base ibuffer CATEGORY = standard include ../../Local.rules.inc Index: timeclock.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/calendar/timeclock.el,v retrieving revision 1.1 diff -u -p -u -r1.1 timeclock.el --- timeclock.el 31 Jul 2006 02:15:24 -0000 1.1 +++ timeclock.el 31 Jul 2006 06:55:16 -0000 ＠＠ -77,7 +77,9 ＠＠ ;;; Code: -(require 'timer) +(if (featurep 'xemacs) + (defalias 'timeclock-cancel-timer 'delete-itimer) + (defalias 'timeclock-cancel-timer 'cancel-timer)) (defgroup timeclock nil "Keeping track time of the time that gets spent." ＠＠ -285,7 +287,7 ＠＠ positive. Returns the new status of tim (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) + (timeclock-cancel-timer timeclock-update-timer) (setq timeclock-update-timer nil)) (if (boundp 'display-time-hook) (remove-hook 'display-time-hook 'timeclock-update-modeline)) ＠＠ -300,7 +302,7 ＠＠ positive. Returns the new status of tim (remove-hook 'display-time-hook 'timeclock-update-modeline)) (when timeclock-update-timer - (cancel-timer timeclock-update-timer) + (timeclock-cancel-timer timeclock-update-timer) (setq timeclock-update-timer nil))) (force-mode-line-update) on-p)) -- |---<Steve Youngs>---------------<GnuPG KeyID: A94B3003>---| | I am Dyslexic of Borg. | | Fusistance is retile. Your arse will be laminated. | |------------------------------------&lt;steve(a)sxemacs.org&gt;---|