User: jmiller Date: 06/08/01 03:52:15 Modified: packages/xemacs-packages/calendar ChangeLog Makefile timeclock.el Log: remove the timeclock.el dependency on fsf-compat Revision Changes Path 1.32 +8 -0 XEmacs/packages/xemacs-packages/calendar/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/calendar/ChangeLog,v retrieving revision 1.31 retrieving revision 1.32 diff -u -p -r1.31 -r1.32 --- ChangeLog 2006/07/31 02:38:09 1.31 +++ ChangeLog 2006/08/01 01:52:15 1.32 ＠＠ -1,3 +1,11 ＠＠ +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. + 2006-07-30 Jeff Miller <jeff.miller(a)xemacs.org&gt; Add some 21.4 syncs I missed earlier 1.31 +1 -1 XEmacs/packages/xemacs-packages/calendar/Makefile Index: Makefile =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/calendar/Makefile,v retrieving revision 1.30 retrieving revision 1.31 diff -u -p -r1.30 -r1.31 --- Makefile 2006/07/31 02:15:22 1.30 +++ Makefile 2006/08/01 01:52:15 1.31 ＠＠ -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 1.2 +5 -3 XEmacs/packages/xemacs-packages/calendar/timeclock.el Index: timeclock.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/calendar/timeclock.el,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- timeclock.el 2006/07/31 02:15:24 1.1 +++ timeclock.el 2006/08/01 01:52:15 1.2 ＠＠ -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))