Commit 953d41c4 authored by Gnus developers's avatar Gnus developers Committed by Katsumi Yamaoka
Browse files

Merge changes made in Gnus trunk.

nnir.el: General clean-up, and reimplementation of various bits.
nnir.el (nnir-search-engine): Ressurect variable, since it's used later in the file.
shr.el (shr-generic): The text nodes should be text, not :text.
nnir.el: Move defvars around to silence compiler warnings.
shr.el (shr-tag-img): Output "*" instead of "[img]".
parent 8a500a91
2010-10-30 Lars Magne Ingebrigtsen <larsi@gnus.org>
* shr.el (shr-tag-img): Output "*" instead of "[img]".
2010-10-30 Andrew Cohen <cohen@andy.bu.edu>
* nnir.el move defvar, defcustom around to keep file organized and keep
byte-compiler quiet.
(nnir-read-parms): accept search-engine as arg.
(nnir-run-query): pass search-engine as arg.
(nnir-search-engine): remove.
2010-10-30 Lars Magne Ingebrigtsen <larsi@gnus.org>
* shr.el (shr-generic): The text nodes should be text, not :text.
* nnir.el (nnir-search-engine): Ressurect variable, since it's used
later in the file.
2010-10-30 Andrew Cohen <cohen@andy.bu.edu>
* nnir.el: general clean up. allow searching with multiple
engines. allow separate extra-parameters for each engine. batch queries
when possible.
(nnir-imap-default-search-key,nnir-method-default-engines): add
customize interface.
(nnir-run-gmane): new engine.
(nnir-engines): use it. qualify all prompts with engine name.
(nnir-search-engine): remove global variable.
(nnir-run-hyrex): restore for now.
(nnir-extra-parms,nnir-search-history): new variables.
(gnus-group-make-nnir-group): use them.
(nnir-group-server): remove in favor of gnus-group-server.
(nnir-request-group): avoid searching twice.
(nnir-sort-groups-by-server): new function.
2010-10-30 Julien Danjou <julien@danjou.info>
 
* gnus-group.el: Remove gnus-group-fetch-control.
......
This diff is collapsed.
......@@ -181,7 +181,7 @@ redirects somewhere else."
result))
(dolist (sub dom)
(if (stringp sub)
(push (cons :text sub) result)
(push (cons 'text sub) result)
(push (shr-transform-dom sub) result)))
(nreverse result)))
......@@ -194,7 +194,7 @@ redirects somewhere else."
(defun shr-generic (cont)
(dolist (sub cont)
(cond
((eq (car sub) :text)
((eq (car sub) 'text)
(shr-insert (cdr sub)))
((listp (cdr sub))
(shr-descend sub)))))
......@@ -524,7 +524,7 @@ Return a string with image data."
(url (or url (cdr (assq :src cont)))))
(let ((start (point-marker)))
(when (zerop (length alt))
(setq alt "[img]"))
(setq alt "*"))
(cond
((or (member (cdr (assq :height cont)) '("0" "1"))
(member (cdr (assq :width cont)) '("0" "1")))
......
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