From c8b868b1e2532aa07dbf4959798dbdc52ea9b5d5 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sun, 27 Mar 2016 18:15:06 +0300 Subject: [PATCH] Don't start the 'midnight' timer twice * lisp/midnight.el (midnight-mode): Avoid starting the midnight timer twice when activating the mode the first time. (Bug#23123) --- lisp/midnight.el | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lisp/midnight.el b/lisp/midnight.el index 0e68eb923cd..878c5a7f71f 100644 --- a/lisp/midnight.el +++ b/lisp/midnight.el @@ -53,8 +53,12 @@ the time when it is run.") "Non-nil means run `midnight-hook' at midnight." :global t :initialize #'custom-initialize-default - (if midnight-mode (timer-activate midnight-timer) - (cancel-timer midnight-timer))) + ;; Disable first, since the ':initialize' function above already + ;; starts the timer when the mode is turned on for the first time, + ;; via setting 'midnight-delay', which calls 'midnight-delay-set', + ;; which starts the timer. + (when (timerp midnight-timer) (cancel-timer midnight-timer)) + (if midnight-mode (timer-activate midnight-timer))) ;;; time conversion -- 2.39.5