org-mode calls `timer-activate-when-idle' on live timers, which makes our version barf. 2013-12-03 Michael Sperber <mike(a)xemacs.org&gt; * timer.el (timer-activate-when-idle): Only call `activate-timer' on non-active-timers. I intend to push on Wednesday if nobody objects. -- Regards, Mike diff --git a/timer.el b/timer.el --- a/timer.el +++ b/timer.el ＠＠ -113,8 +113,10 ＠＠ (defun timer-activate-when-idle (timer &optional dont-wait) "Arrange to activate TIMER whenever Emacs is next idle. DONT-WAIT is for Emacs compatibility and is currently ignored." - (set-itimer-is-idle timer t) - (activate-itimer timer)) + (when (and (not (itimer-live-p timer)) + (not (get-itimer (itimer-name timer)))) + (set-itimer-is-idle timer t) + (activate-itimer timer))) ;; can't do this, different kind of timer ;;(defalias 'disable-timeout 'cancel-timer) _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://lists.xemacs.org/mailman/listinfo/xemacs-patches