Commit 367f7f81 authored by Lars Magne Ingebrigtsen's avatar Lars Magne Ingebrigtsen Committed by Katsumi Yamaoka
Browse files

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.
parent 644d0594
2010-10-02 Lars Magne Ingebrigtsen <>
* 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 <>
* gnus-start.el (gnus-check-bogus-newsgroups): Say how many groups
......@@ -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)
(url-retrieve (car image)
(list buffer image))))
(let ((args (list (car image)
(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."
......@@ -1302,7 +1302,7 @@ If COPYP, copy the groups instead."
(list current-prefix-arg
(gnus-completing-read "Move to topic" (mapcar 'car gnus-topic-alist) t
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."
(list current-prefix-arg
(gnus-completing-read "Copy to topic" (mapcar 'car gnus-topic-alist) t)))
"Copy to topic" (mapcar 'car gnus-topic-alist) t)))
(gnus-topic-move-group n topic t))
(defun gnus-topic-kill-group (&optional n discard)
;;; shr.el --- Simple HTML Renderer
;; Copyright (C) 2010 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <>
;; 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
;; 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 <>.
;;; 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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment