diff options
Diffstat (limited to 'lisp/gnus/nnmbox.el')
| -rw-r--r-- | lisp/gnus/nnmbox.el | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/lisp/gnus/nnmbox.el b/lisp/gnus/nnmbox.el index bba41336dd9..110f39a867f 100644 --- a/lisp/gnus/nnmbox.el +++ b/lisp/gnus/nnmbox.el @@ -131,18 +131,15 @@ t))) (deffoo nnmbox-close-server (&optional server) - (when (and nnmbox-mbox-buffer - (buffer-name nnmbox-mbox-buffer)) + (when (buffer-live-p nnmbox-mbox-buffer) (kill-buffer nnmbox-mbox-buffer)) (nnoo-close-server 'nnmbox server) t) (deffoo nnmbox-server-opened (&optional server) (and (nnoo-current-server-p 'nnmbox server) - nnmbox-mbox-buffer - (buffer-name nnmbox-mbox-buffer) - nntp-server-buffer - (buffer-name nntp-server-buffer))) + (buffer-live-p nnmbox-mbox-buffer) + (buffer-live-p nntp-server-buffer))) (deffoo nnmbox-request-article (article &optional newsgroup server buffer) (nnmbox-possibly-change-newsgroup newsgroup server) @@ -463,8 +460,7 @@ (when (and server (not (nnmbox-server-opened server))) (nnmbox-open-server server)) - (when (or (not nnmbox-mbox-buffer) - (not (buffer-name nnmbox-mbox-buffer))) + (unless (buffer-live-p nnmbox-mbox-buffer) (nnmbox-read-mbox)) (when (not nnmbox-group-alist) (nnmail-activate 'nnmbox)) @@ -622,8 +618,7 @@ (defun nnmbox-read-mbox () (nnmail-activate 'nnmbox) (nnmbox-create-mbox) - (if (and nnmbox-mbox-buffer - (buffer-name nnmbox-mbox-buffer) + (if (and (buffer-live-p nnmbox-mbox-buffer) (with-current-buffer nnmbox-mbox-buffer (= (buffer-size) (nnheader-file-size nnmbox-mbox-file)))) () |