mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-03 06:00:50 -08:00
Code Issues Projects Releases Wiki Activity

Merge changes made in Gnus trunk

Browse source 
shr.el (shr-browse-url): Fix the name of the `browse-url-mail' function call.
gnus-demon.el (gnus-demon-run-callback, gnus-demon-init): Convert to seconds, and make the repeat clause with HH:MM specs work as documented.
This commit is contained in:
Gnus developers 2012-01-28 02:25:57 +00:00 • committed by Katsumi Yamaoka
parent 0f2bad2708
commit 39ddff397c
3 changed files with 27 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lisp/gnus/ChangeLog
View file

@ -1,3 +1,14 @@
2012-01-27 Elias Pipping <pipping@lavabit.com> (tiny change)
* shr.el (shr-browse-url): Fix the name of the `browse-url-mail'
function call.
2012-01-27 Vida Gábor <vidagabor@gmail.com> (tiny change)
* gnus-demon.el (gnus-demon-run-callback, gnus-demon-init): Convert to
seconds, and make the repeat clause with HH:MM specs work as
documented.
2012-01-27 Lars Ingebrigtsen <larsi@gnus.org>
* gnus-start.el (gnus-get-unread-articles): Clear out "early" methods

27
lisp/gnus/gnus-demon.el
View file

@ -102,6 +102,7 @@ Emacs has been idle for IDLE `gnus-demon-timestep's."
"Run FUNC if Emacs has been idle for longer than IDLE seconds."
(unless gnus-inhibit-demon
(when (or (not idle)
(and (eq idle t) (> (gnus-demon-idle-since) 0))
(<= idle (gnus-demon-idle-since)))
(with-local-quit
(ignore-errors
@ -115,6 +116,7 @@ Emacs has been idle for IDLE `gnus-demon-timestep's."
;; Set up the timer.
(let* ((func (nth 0 handler))
(time (nth 1 handler))
(time-type (type-of time))
(idle (nth 2 handler))
;; Compute time according with timestep.
;; If t, replace by 1
@ -123,33 +125,32 @@ Emacs has been idle for IDLE `gnus-demon-timestep's."
((null time)
nil)
((stringp time)
(gnus-demon-time-to-step time))
(* (gnus-demon-time-to-step time) gnus-demon-timestep))
(t
(* time gnus-demon-timestep))))
(idle (if (numberp idle)
(* idle gnus-demon-timestep)
idle))
(timer
(cond
;; (func number t)
;; Call when Emacs has been idle for `time'
((and (numberp time) (eq idle t))
(run-with-timer time time 'gnus-demon-run-callback func time))
;; (func number number)
;; Call every `time' when Emacs has been idle for `idle'
((and (numberp time) (numberp idle))
(run-with-timer time time 'gnus-demon-run-callback func idle))
;; (func nil number)
;; Only call when Emacs has been idle for `idle'
((and (null time) (numberp idle))
(run-with-idle-timer (* idle gnus-demon-timestep) t
'gnus-demon-run-callback func))
;; (func number nil)
;; (func number any)
;; Call every `time'
((and (numberp time) (null idle))
(run-with-timer time time 'gnus-demon-run-callback func)))))
((eq time-type 'integer)
(run-with-timer time time 'gnus-demon-run-callback func idle))
;; (func string any)
((eq time-type 'string)
(run-with-timer time (* 24 60 60) 'gnus-demon-run-callback func idle)))))
(when timer
(add-to-list 'gnus-demon-timers timer)))))
(defun gnus-demon-time-to-step (time)
"Find out how many seconds to TIME, which is on the form \"17:43\"."
"Find out how many steps to TIME, which is on the form \"17:43\"."
(let* ((now (current-time))
;; obtain NOW as discrete components -- make a vector for speed
(nowParts (decode-time now))

4
lisp/gnus/shr.el
View file

@ -480,7 +480,7 @@ the URL of the image to the kill buffer instead."
((not url)
(message "No link under point"))
((string-match "^mailto:" url)
(browse-url-mailto url))
(browse-url-mail url))
(t
(browse-url url)))))
@ -566,7 +566,7 @@ the URL of the image to the kill buffer instead."
;; url-cache-extract autoloads url-cache.
(declare-function url-cache-create-filename "url-cache" (url))
(autoload 'mm-disable-multibyte "mm-util")
(autoload 'browse-url-mailto "browse-url")
(autoload 'browse-url-mail "browse-url")
(defun shr-get-image-data (url)
"Get image data for URL.