[Emacs-diffs] /srv/bzr/emacs/trunk r104459: Merge changes made in Gnus trunk.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 104459
author: Gnus developers <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Tue 2011-05-31 22:08:51 +0000
message:
  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.
modified:
  doc/misc/ChangeLog
  doc/misc/gnus.texi
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-registry.el
  lisp/gnus/shr.el

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2011-05-18 22:16:26 +0000
+++ b/doc/misc/ChangeLog        2011-05-31 22:08:51 +0000
@@ -1,3 +1,9 @@
+2011-05-31  Teodor Zlatanov  <address@hidden>
+
+       * 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  <address@hidden>
 
        * gnus.texi (Gnus Registry Setup): Rename from "Setup".

=== modified file 'doc/misc/gnus.texi'
--- a/doc/misc/gnus.texi        2011-05-18 22:16:26 +0000
+++ b/doc/misc/gnus.texi        2011-05-31 22:08:51 +0000
@@ -26094,10 +26094,10 @@
 @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
 
 

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2011-05-31 10:37:35 +0000
+++ b/lisp/gnus/ChangeLog       2011-05-31 22:08:51 +0000
@@ -1,3 +1,15 @@
+2011-05-31  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * 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  <address@hidden>
+
+       * 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  <address@hidden>
 
        * gnus-sum.el (gnus-summary-exit): Make sure to kill article buffer in

=== modified file 'lisp/gnus/gnus-registry.el'
--- a/lisp/gnus/gnus-registry.el        2011-05-18 22:16:26 +0000
+++ b/lisp/gnus/gnus-registry.el        2011-05-31 22:08:51 +0000
@@ -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 @@
                  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 @@
                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))))

=== modified file 'lisp/gnus/shr.el'
--- a/lisp/gnus/shr.el  2011-05-29 23:28:45 +0000
+++ b/lisp/gnus/shr.el  2011-05-31 22:08:51 +0000
@@ -183,14 +183,23 @@
        (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 @@
 (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 @@
       (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.