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.

2 files changed, 8 insertions, 2 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  <tzz@lifelogs.com>
+
+        * 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  <tzz@lifelogs.com>
 
         * 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