[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r101726: Merge changes made in Gnus t
From: |
Katsumi Yamaoka |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r101726: Merge changes made in Gnus trunk. |
Date: |
Sat, 02 Oct 2010 10:30:06 +0000 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 101726
author: Lars Magne Ingebrigtsen <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Sat 2010-10-02 10:30:06 +0000
message:
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.
added:
lisp/gnus/shr.el
modified:
lisp/gnus/ChangeLog
lisp/gnus/gnus-html.el
lisp/gnus/gnus-topic.el
=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog 2010-10-01 23:08:25 +0000
+++ b/lisp/gnus/ChangeLog 2010-10-02 10:30:06 +0000
@@ -1,3 +1,12 @@
+2010-10-02 Lars Magne Ingebrigtsen <address@hidden>
+
+ * 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 <address@hidden>
* gnus-start.el (gnus-check-bogus-newsgroups): Say how many groups
=== modified file 'lisp/gnus/gnus-html.el'
--- a/lisp/gnus/gnus-html.el 2010-10-01 13:33:03 +0000
+++ b/lisp/gnus/gnus-html.el 2010-10-02 10:30:06 +0000
@@ -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 @@
"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."
=== modified file 'lisp/gnus/gnus-topic.el'
--- a/lisp/gnus/gnus-topic.el 2010-09-30 08:39:23 +0000
+++ b/lisp/gnus/gnus-topic.el 2010-10-02 10:30:06 +0000
@@ -1302,7 +1302,7 @@
(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 @@
"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)
=== added file 'lisp/gnus/shr.el'
--- a/lisp/gnus/shr.el 1970-01-01 00:00:00 +0000
+++ b/lisp/gnus/shr.el 2010-10-02 10:30:06 +0000
@@ -0,0 +1,35 @@
+;;; shr.el --- Simple HTML Renderer
+
+;; Copyright (C) 2010 Free Software Foundation, Inc.
+
+;; Author: Lars Magne Ingebrigtsen <address@hidden>
+;; 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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r101726: Merge changes made in Gnus trunk.,
Katsumi Yamaoka <=