summaryrefslogtreecommitdiff
path: root/lisp/gnus/shr.el
diff options
context:
space:
mode:
authorGnus developers <ding@gnus.org>2012-01-28 02:25:57 +0000
committerKatsumi Yamaoka <yamaoka@jpl.org>2012-01-28 02:25:57 +0000
commit39ddff397cb6bb1a57dca74f67e590d8eeb07f99 (patch)
treed8b52f1c735c57743be21ff7229ce446d9dd4756 /lisp/gnus/shr.el
parent0f2bad27087f219b48a06a6b0f9ed8a78452a6f5 (diff)
downloademacs-39ddff397cb6bb1a57dca74f67e590d8eeb07f99.tar.gz
Merge changes made in Gnus trunk
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.
Diffstat (limited to 'lisp/gnus/shr.el')
-rw-r--r--lisp/gnus/shr.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el
index 969d893c2d4..acce7660263 100644
--- a/lisp/gnus/shr.el
+++ b/lisp/gnus/shr.el
@@ -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.