From 367f7f81d1923c6418c4d5beb04144d3dbef476a Mon Sep 17 00:00:00 2001
From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Sat, 2 Oct 2010 10:30:06 +0000
Subject: [PATCH] Merge changes made in Gnus trunk.

gnus-topic.el (gnus-topic-move-group): Fix the syntax of the completing read.
gnus-html.el (gnus-html-schedule-image-fetching): Be silent.
shr.el: New file.
---
 lisp/gnus/ChangeLog     |  9 +++++++++
 lisp/gnus/gnus-html.el  | 11 +++++++----
 lisp/gnus/gnus-topic.el |  5 +++--
 lisp/gnus/shr.el        | 35 +++++++++++++++++++++++++++++++++++
 4 files changed, 54 insertions(+), 6 deletions(-)
 create mode 100644 lisp/gnus/shr.el

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 75651936bb..3d32756418 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,12 @@
+2010-10-02  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* shr.el: New file.
+
+	* gnus-html.el (gnus-html-schedule-image-fetching): Be silent.
+
+	* gnus-topic.el (gnus-topic-move-group): Fix the syntax of the
+	completing read.
+
 2010-10-01  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* gnus-start.el (gnus-check-bogus-newsgroups): Say how many groups
diff --git a/lisp/gnus/gnus-html.el b/lisp/gnus/gnus-html.el
index fee9eee0f9..0b64a23742 100644
--- a/lisp/gnus/gnus-html.el
+++ b/lisp/gnus/gnus-html.el
@@ -37,6 +37,7 @@
 (require 'url-cache)
 (require 'xml)
 (require 'browse-url)
+(require 'help-fns)
 
 (defcustom gnus-html-image-cache-ttl (days-to-time 7)
   "Time used to determine if we should use images from the cache."
@@ -368,10 +369,12 @@ Use ALT-TEXT for the image string."
   "Retrieve IMAGE, and place it into BUFFER on arrival."
   (gnus-message 8 "gnus-html-schedule-image-fetching: buffer %s, image %s"
                 buffer image)
-  (ignore-errors
-    (url-retrieve (car image)
-                  'gnus-html-image-fetched
-                  (list buffer image))))
+  (let ((args (list (car image)
+		    'gnus-html-image-fetched
+		    (list buffer image))))
+    (when (> (length (help-function-arglist 'url-retrieve)) 4)
+      (setq args (nconc args (list t))))
+    (apply #'url-retrieve args)))
 
 (defun gnus-html-image-fetched (status buffer image)
   "Callback function called when image has been fetched."
diff --git a/lisp/gnus/gnus-topic.el b/lisp/gnus/gnus-topic.el
index b600fac353..efa543f68d 100644
--- a/lisp/gnus/gnus-topic.el
+++ b/lisp/gnus/gnus-topic.el
@@ -1302,7 +1302,7 @@ If COPYP, copy the groups instead."
   (interactive
    (list current-prefix-arg
 	 (gnus-completing-read "Move to topic" (mapcar 'car gnus-topic-alist) t
-			       'gnus-topic-history)))
+			       nil 'gnus-topic-history)))
   (let ((use-marked (and (not n) (not (gnus-region-active-p))
 			 gnus-group-marked t))
 	(groups (gnus-group-process-prefix n))
@@ -1348,7 +1348,8 @@ If COPYP, copy the groups instead."
   "Copy the current group to a topic."
   (interactive
    (list current-prefix-arg
-	 (gnus-completing-read "Copy to topic" (mapcar 'car gnus-topic-alist) t)))
+	 (gnus-completing-read
+	  "Copy to topic" (mapcar 'car gnus-topic-alist) t)))
   (gnus-topic-move-group n topic t))
 
 (defun gnus-topic-kill-group (&optional n discard)
diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el
new file mode 100644
index 0000000000..407c253efa
--- /dev/null
+++ b/lisp/gnus/shr.el
@@ -0,0 +1,35 @@
+;;; shr.el --- Simple HTML Renderer
+
+;; Copyright (C) 2010 Free Software Foundation, Inc.
+
+;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
+;; Keywords: html
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; This package takes a HTML parse tree (as provided by
+;; libxml-parse-html-region) and renders it in the current buffer.  It
+;; does not do CSS, JavaScript or anything advanced: It's geared
+;; towards rendering typical short snippets of HTML, like what you'd
+;; find in HTML email and the like.
+
+;;; Code:
+
+(provice 'shr)
+
+;;; shr.el ends here
-- 
2.20.1