From 2da9c605f8b27d3d23c303e8d02dbe1623efee01 Mon Sep 17 00:00:00 2001 From: Gnus developers Date: Tue, 31 May 2011 22:08:51 +0000 Subject: [PATCH] Merge changes made in Gnus trunk. gnus.texi (Store custom flags and keywords): Refer to `gnus-registry-article-marks-to-{chars,names}' instead of `gnus-registry-user-format-function-{M,M2}'. shr.el (shr-rescale-image): Add an :ascent of 100 to images so that the underline comes at the bottom. gnus-registry.el (gnus-registry-article-marks-to-chars): Rename from `gnus-registry-user-format-function-M' and declare the latter obsolete. (gnus-registry-article-marks-to-names): Rename from `gnus-registry-user-format-function-M2'. shr.el (shr-browse-image): Copy the URL if called interactively. --- doc/misc/ChangeLog | 6 ++++++ doc/misc/gnus.texi | 4 ++-- lisp/gnus/ChangeLog | 12 ++++++++++++ lisp/gnus/gnus-registry.el | 15 +++++++++------ lisp/gnus/shr.el | 32 ++++++++++++++++++++++---------- 5 files changed, 51 insertions(+), 18 deletions(-) diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 917ebf0d675..aaf4bcae1b3 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,9 @@ +2011-05-31 Teodor Zlatanov + + * gnus.texi (Store custom flags and keywords): Refer to + `gnus-registry-article-marks-to-{chars,names}' instead of + `gnus-registry-user-format-function-{M,M2}'. + 2011-05-18 Teodor Zlatanov * gnus.texi (Gnus Registry Setup): Rename from "Setup". diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index a6b79237f08..82200780e19 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -26094,10 +26094,10 @@ their @code{:char} property, or showing the marks as full strings. @lisp ;; show the marks as single characters (see the :char property in ;; `gnus-registry-marks'): -;; (defalias 'gnus-user-format-function-M 'gnus-registry-user-format-function-M) +;; (defalias 'gnus-user-format-function-M 'gnus-registry-article-marks-to-chars) ;; show the marks by name (see `gnus-registry-marks'): -;; (defalias 'gnus-user-format-function-M 'gnus-registry-user-format-function-M2) +;; (defalias 'gnus-user-format-function-M 'gnus-registry-article-marks-to-names) @end lisp diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index a40dee2d20a..accd0c52b13 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,15 @@ +2011-05-31 Lars Magne Ingebrigtsen + + * shr.el (shr-rescale-image): Add an :ascent of 100 to images so that + the underline comes at the bottom. + +2011-05-31 Teodor Zlatanov + + * gnus-registry.el (gnus-registry-article-marks-to-chars): Rename from + `gnus-registry-user-format-function-M' and declare the latter obsolete. + (gnus-registry-article-marks-to-names): Rename from + `gnus-registry-user-format-function-M2'. + 2011-05-31 Katsumi Yamaoka * gnus-sum.el (gnus-summary-exit): Make sure to kill article buffer in diff --git a/lisp/gnus/gnus-registry.el b/lisp/gnus/gnus-registry.el index e0efbaf4f30..f6c0daaaa93 100644 --- a/lisp/gnus/gnus-registry.el +++ b/lisp/gnus/gnus-registry.el @@ -62,10 +62,10 @@ ;; show the marks as single characters (see the :char property in ;; `gnus-registry-marks'): -;; (defalias 'gnus-user-format-function-M 'gnus-registry-user-format-function-M) +;; (defalias 'gnus-user-format-function-M 'gnus-registry-article-marks-to-chars) ;; show the marks by name (see `gnus-registry-marks'): -;; (defalias 'gnus-user-format-function-M 'gnus-registry-user-format-function-M2) +;; (defalias 'gnus-user-format-function-M 'gnus-registry-article-marks-to-names) ;; TODO: @@ -897,9 +897,12 @@ Uses `gnus-registry-marks' to find what shortcuts to install." nil (cons "Registry Marks" gnus-registry-misc-menus)))))) +(make-obsolete 'gnus-registry-user-format-function-M + 'gnus-registry-article-marks-to-chars "24.1") ? + ;; use like this: -;; (defalias 'gnus-user-format-function-M 'gnus-registry-user-format-function-M) -(defun gnus-registry-user-format-function-M (headers) +;; (defalias 'gnus-user-format-function-M 'gnus-registry-article-marks-to-chars) +(defun gnus-registry-article-marks-to-chars (headers) "Show the marks for an article by the :char property" (let* ((id (mail-header-message-id headers)) (marks (when id (gnus-registry-get-id-key id 'mark)))) @@ -911,8 +914,8 @@ Uses `gnus-registry-marks' to find what shortcuts to install." marks ""))) ;; use like this: -;; (defalias 'gnus-user-format-function-M 'gnus-registry-user-format-function-M2) -(defun gnus-registry-user-format-function-M2 (headers) +;; (defalias 'gnus-user-format-function-M 'gnus-registry-article-marks-to-names) +(defun gnus-registry-article-marks-to-names (headers) "Show the marks for an article by name" (let* ((id (mail-header-message-id headers)) (marks (when id (gnus-registry-get-id-key id 'mark)))) diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el index ebd854930df..67effc07ee2 100644 --- a/lisp/gnus/shr.el +++ b/lisp/gnus/shr.el @@ -183,14 +183,23 @@ redirects somewhere else." (message "No image under point") (message "%s" text)))) -(defun shr-browse-image () - "Browse the image under point." - (interactive) +(defun shr-browse-image (&optional copy-url) + "Browse the image under point. +If COPY-URL (the prefix if called interactively) is non-nil, copy +the URL of the image to the kill buffer instead." + (interactive "P") (let ((url (get-text-property (point) 'image-url))) - (if (not url) - (message "No image under point") + (cond + ((not url) + (message "No image under point")) + (copy-url + (with-temp-buffer + (insert url) + (copy-region-as-kill (point-min) (point-max)) + (message "Copied %s" url))) + (t (message "Browsing %s..." url) - (browse-url url)))) + (browse-url url))))) (defun shr-insert-image () "Insert the image under point into the buffer." @@ -524,8 +533,9 @@ redirects somewhere else." (defun shr-rescale-image (data) (if (or (not (fboundp 'imagemagick-types)) (not (get-buffer-window (current-buffer)))) - (create-image data nil t) - (let* ((image (create-image data nil t)) + (create-image data nil t + :ascent 100) + (let* ((image (create-image data nil t :ascent 100)) (size (image-size image t)) (width (car size)) (height (cdr size)) @@ -544,11 +554,13 @@ redirects somewhere else." (when (> (car size) window-width) (setq image (or (create-image data 'imagemagick t - :width window-width) + :width window-width + :ascent 100) image))) (when (and (fboundp 'create-animated-image) (eq (image-type data nil t) 'gif)) - (setq image (create-animated-image data 'gif t))) + (setq image (create-animated-image data 'gif t + :ascent 100))) image))) ;; url-cache-extract autoloads url-cache. -- 2.11.4.GIT