Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-25 14:27:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Re-introduce variable for world clock timer

Browse source 
* lisp/time.el (world-clock--timer): New variable.
(world-clock): Save timer to above variable when it is started.
(world-clock-cancel-timer): Delete timer saved in variable instead of
searching for the function name.
This commit is contained in:
Stefan Kangas 2020-10-24 15:47:26 +02:00
parent 6f92674ce8
commit 97267d2bf1
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lisp/time.el
View file

@ -531,6 +531,9 @@ See `world-clock'."
(setq-local revert-buffer-function #'world-clock-update)
(setq show-trailing-whitespace nil))
(defvar world-clock--timer nil
"The current world clock timer.")
(defun world-clock-display (alist)
"Replace current buffer text with times in various zones, based on ALIST."
(let ((inhibit-read-only t)
@ -571,7 +574,8 @@ To turn off the world time display, go to the window and type `\\[quit-window]'.
(pop-to-buffer buffer)
(pop-to-buffer world-clock-buffer-name)
(when world-clock-timer-enable
(run-at-time t world-clock-timer-second #'world-clock-update)
(setq world-clock--timer
(run-at-time t world-clock-timer-second #'world-clock-update))
(add-hook 'kill-buffer-hook #'world-clock-cancel-timer nil t)))
(world-clock-display (time--display-world-list))
(world-clock-mode)
@ -579,12 +583,9 @@ To turn off the world time display, go to the window and type `\\[quit-window]'.
(defun world-clock-cancel-timer ()
"Cancel the world clock timer."
(let ((list timer-list))
(while list
(let ((elt (pop list)))
(when (equal (symbol-name (timer--function elt))
"world-clock-update")
(cancel-timer elt))))))
(when world-clock--timer
(cancel-timer world-clock--timer)
(setq world-clock--timer nil))))
(defun world-clock-update (&optional _arg _noconfirm)
"Update the `world-clock' buffer."