diff options
| author | Gnus developers <ding@gnus.org> | 2010-12-05 22:17:34 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2010-12-05 22:17:34 +0000 |
| commit | 04db63bc416d65a76fe6eb057039eed9e731397d (patch) | |
| tree | 5911475669cfff079084dd335e1e45943de8d3b5 /lisp/gnus/nnir.el | |
| parent | d23d86081b976717a19d93ff92e37f72619b9545 (diff) | |
Merge changes made in Gnus trunk.
nnir.el (nnir-categorize): Replace mapcar with mapc.
shr.el (shr-urlify): Display the title in <a> tags.
shr.el (shr-urlify): Show the URL before the title to avoid misleading URLs.
gnus-sum.el (gnus-summary-show-article): Reverse the meanings of `C-u
C-u g' and `C-u g' so that `C-u g' does what it traditionally did.
gnus.texi (Paging the Article): Note the reverse meanings of `C-u C-u g'.
gnus-html.el (gnus-html-put-image): Use widget instead of local maps
so that TAB works.
nnir.el (nnir-run-gmane): Use more careful test for gmane nntp server.
nnimap.el (nnimap-process-expiry-targets): Avoid downloading articles
unless necessary.
gnus-util.el (gnus-output-to-mail): Require nnmail before using nnmail
variables.
shr.el (shr-stylesheet): New dynamic variable for cascading the styles.
(shr-colorize-region): New function.
(shr-insert-background-overlay): Remove.
(shr-render-td): Background setting should be taken care of on a higher level.
(shr-tag-body): Use post-hoc colorizations.
(shr-descend): Only render color/background when they change.
(shr-tag-body): Set up a style sheet based on bgcolor/fgcolor.
(shr-put-color-1): Don't overwrite old colors.
(shr-colorize-region): When the background color isn't explicit, use a fixed background.
gnus.el (gnus-valid-select-methods): Allow nnimap to respool.
nntp.el (nntp-snarf-error-message): nnheader-report takes a format string as the parameter.
gnus-sum.el (gnus-summary-respool-article): The completion function expects a list instead of an alist.
Diffstat (limited to 'lisp/gnus/nnir.el')
| -rw-r--r-- | lisp/gnus/nnir.el | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lisp/gnus/nnir.el b/lisp/gnus/nnir.el index 7e1bd309c9..b706d150f7 100644 --- a/lisp/gnus/nnir.el +++ b/lisp/gnus/nnir.el @@ -269,7 +269,7 @@ as `(keyfunc member)' and the corresponding element is just is `(valuefunc member)'." `(unless (null ,sequence) (let (value) - (mapcar + (mapc (lambda (member) (let ((y (,keyfunc member)) (x ,(if valuefunc @@ -1381,7 +1381,10 @@ Tested with Namazu 2.0.6 on a GNU/Linux system." ;; gmane interface (defun nnir-run-gmane (query srv &optional groups) "Run a search against a gmane back-end server." - (if (gnus-string-match-p "gmane.org$" srv) + (if (gnus-string-match-p + "gmane.org$" + (or (cadr (assoc 'nntp-address (cddr (gnus-server-to-method srv)))) + "")) (let* ((case-fold-search t) (qstring (cdr (assq 'query query))) (server (cadr (gnus-server-to-method srv))) |