diff options
| author | Gnus developers <ding@gnus.org> | 2010-12-17 22:45:16 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2010-12-17 22:45:16 +0000 |
| commit | 70041e9ae7072eac5eeff2b5e1a50d9eab6b39f7 (patch) | |
| tree | 44e4cfef0c6fd744f917684171cf57574690d37f /lisp/gnus/nnir.el | |
| parent | 2e306b392b3d517bcbee818e2be1335fce012d48 (diff) | |
Merge changes made in Gnus trunk.
nnir.el (nnir-get-active): Ignore nnir-ignored-newsgroups if null.
gnus-sum.el (gnus-summary-refer-thread): Simplify code. Restore gnus-use-agent.
(gnus-get-newsgroup-headers): Avoid unwanted spaces at eol.
gravatar.el (gravatar-retrieve-synchronously): New function.
(gravatar-get-data): Make more robust.
gnus-util.el (gnus-rescale-image): Allow to resize images even if they are from file. Can also scale up.
nnimap.el (nnimap-retrieve-headers): Remove CRLF from the headers.
nnir.el (nnir-mode): Make sure 'gnus-registry-install is bound.
gnus-sum.el (gnus-get-newsgroup-headers): Revert the last change here, since it's up to the backends to do CRLF removal if their protocol has it.
gnus-group.el (gnus-group-delete-articles): New command.
Diffstat (limited to 'lisp/gnus/nnir.el')
| -rw-r--r-- | lisp/gnus/nnir.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/gnus/nnir.el b/lisp/gnus/nnir.el index f2348bf40a..87377e6c6a 100644 --- a/lisp/gnus/nnir.el +++ b/lisp/gnus/nnir.el @@ -1543,7 +1543,8 @@ server is of form 'backend:name'." (let ((cur (current-buffer)) name) (goto-char (point-min)) - (unless (string= nnir-ignored-newsgroups "") + (unless (or (null nnir-ignored-newsgroups) + (string= nnir-ignored-newsgroups "")) (delete-matching-lines nnir-ignored-newsgroups)) (if (eq (car method) 'nntp) (while (not (eobp)) @@ -1589,7 +1590,8 @@ server is of form 'backend:name'." (when (eq (car (gnus-find-method-for-group gnus-newsgroup-name)) 'nnir) (setq gnus-summary-line-format (or nnir-summary-line-format gnus-summary-line-format)) - (when (eq gnus-registry-install t) + (when (and (boundp 'gnus-registry-install) + (eq gnus-registry-install t)) (remove-hook 'gnus-summary-article-delete-hook 'gnus-registry-action t) (remove-hook 'gnus-summary-article-move-hook 'gnus-registry-action t) (remove-hook 'gnus-summary-article-expire-hook 'gnus-registry-action t) |