comparison lisp/gnus/shr.el @ 111450:eb9988805a37

Merge changes made in Gnus trunk. message.el (message-mailto): New function. message.el (message-mailto): Should accept other parameters. message.el (message-mailto): Remove since it duplicates browse-url-mailto functionality. shr.el (shr-browse-url): Call browse-url-mailto for mailto: links. message.el (message-subject-trailing-was-ask-regexp): A ] in a [] regexp doesn't need quoting. gnus-art.el (article-treat-non-ascii): New command and keystroke. shr.el (browse-url-mailto): Autoload. gnus.texi (Article Washing): Document gnus-article-treat-non-ascii.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Tue, 09 Nov 2010 22:17:36 +0000
parents 733acab855e4
children 4c3fdb97fdaf
comparison
equal deleted inserted replaced
111449:132f2dfd549f 111450:eb9988805a37
342 (let ((url (get-text-property (point) 'shr-url))) 342 (let ((url (get-text-property (point) 'shr-url)))
343 (cond 343 (cond
344 ((not url) 344 ((not url)
345 (message "No link under point")) 345 (message "No link under point"))
346 ((string-match "^mailto:" url) 346 ((string-match "^mailto:" url)
347 (gnus-url-mailto url)) 347 (browse-url-mailto url))
348 (t 348 (t
349 (browse-url url))))) 349 (browse-url url)))))
350 350
351 (defun shr-save-contents (directory) 351 (defun shr-save-contents (directory)
352 "Save the contents from URL in a file." 352 "Save the contents from URL in a file."
416 image))) 416 image)))
417 417
418 ;; url-cache-extract autoloads url-cache. 418 ;; url-cache-extract autoloads url-cache.
419 (declare-function url-cache-create-filename "url-cache" (url)) 419 (declare-function url-cache-create-filename "url-cache" (url))
420 (autoload 'mm-disable-multibyte "mm-util") 420 (autoload 'mm-disable-multibyte "mm-util")
421 (autoload 'browse-url-mailto "browse-url")
421 422
422 (defun shr-get-image-data (url) 423 (defun shr-get-image-data (url)
423 "Get image data for URL. 424 "Get image data for URL.
424 Return a string with image data." 425 Return a string with image data."
425 (with-temp-buffer 426 (with-temp-buffer