diff options
Diffstat (limited to 'lisp/gnus')
-rw-r--r-- | lisp/gnus/ChangeLog | 18 | ||||
-rw-r--r-- | lisp/gnus/gnus-group.el | 2 | ||||
-rw-r--r-- | lisp/gnus/gnus-sum.el | 6 | ||||
-rw-r--r-- | lisp/gnus/nntp.el | 3 | ||||
-rw-r--r-- | lisp/gnus/shr.el | 3 |
5 files changed, 29 insertions, 3 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 8dad14c44ae..068093159e3 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,21 @@ +2011-05-17 Glenn Morris <rgm@gnu.org> + + * gnus-group.el (gnus-import-other-newsrc-file): + Use insert-file-contents. + +2011-05-16 Teodor Zlatanov <tzz@lifelogs.com> + + * gnus-sum.el (gnus-summary-hide-all-threads): Add update message every + 1000 iterations. + +2011-05-16 Katsumi Yamaoka <yamaoka@jpl.org> + + * nntp.el (nntp-open-connection): Check if process-type is available. + +2011-05-16 Julien Danjou <julien@danjou.info> + + * shr.el (shr-tag-del): Add support for del tag. + 2011-05-13 Katsumi Yamaoka <yamaoka@jpl.org> * gnus-html.el (gnus-html-put-image): Register a displayer. diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el index c265538e19c..a21faa8c983 100644 --- a/lisp/gnus/gnus-group.el +++ b/lisp/gnus/gnus-group.el @@ -4407,7 +4407,7 @@ and the second element is the address." ;; file. Use with caution, if at all. (defun gnus-import-other-newsrc-file (file) (with-temp-buffer - (insert-file file) + (insert-file-contents file) (let (form) (while (ignore-errors (setq form (read (current-buffer)))) diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el index 3cbb479e068..53c2e5e596f 100644 --- a/lisp/gnus/gnus-sum.el +++ b/lisp/gnus/gnus-sum.el @@ -11533,8 +11533,12 @@ will not be hidden." (interactive) (save-excursion (goto-char (point-min)) - (let ((end nil)) + (let ((end nil) + (count 0)) (while (not end) + (incf count) + (when (zerop (mod count 1000)) + (message "Hiding all threads... %d" count)) (when (or (not predicate) (gnus-map-articles predicate (gnus-summary-article-children))) diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el index aa4b9184dbb..cdd12abbc06 100644 --- a/lisp/gnus/nntp.el +++ b/lisp/gnus/nntp.el @@ -1362,7 +1362,8 @@ password contained in '~/.nntp-authinfo'." (nntp-kill-buffer pbuffer)) (when (and (buffer-name pbuffer) process) - (when (and (fboundp 'set-network-process-option) + (when (and (fboundp 'set-network-process-option) ;; Unavailable in XEmacs. + (fboundp 'process-type) ;; Emacs 22 doesn't provide it. (eq (process-type process) 'network)) ;; Use TCP-keepalive so that connections that pass through a NAT router ;; don't hang when left idle. diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el index edd106618df..d23d9c7724b 100644 --- a/lisp/gnus/shr.el +++ b/lisp/gnus/shr.el @@ -780,6 +780,9 @@ ones, in case fg and bg are nil." (defun shr-tag-s (cont) (shr-fontize-cont cont 'shr-strike-through)) +(defun shr-tag-del (cont) + (shr-fontize-cont cont 'shr-strike-through)) + (defun shr-tag-b (cont) (shr-fontize-cont cont 'bold)) |