From: yamaoka Date: Sat, 23 Oct 2004 12:24:35 +0000 (+0000) Subject: Synch to No Gnus 200410230745. X-Git-Tag: t-gnus-6_17_4-quimby-~700 X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=fd604b61a1b62db1d5cdbd3af2caddc46c033312;p=elisp%2Fgnus.git- Synch to No Gnus 200410230745. --- diff --git a/lisp/gnus-async.el b/lisp/gnus-async.el index 86086a2..d1d4a90 100644 --- a/lisp/gnus-async.el +++ b/lisp/gnus-async.el @@ -269,28 +269,29 @@ It should return non-nil if the article is to be prefetched." (nntp-server-buffer (current-buffer)) (nntp-have-messaged nil) (tries 0)) - (condition-case nil - ;; FIXME: we could stop waiting after some - ;; timeout, but this is the wrong place to do it. - ;; rather than checking time-spent-waiting, we - ;; should check time-since-last-output, which - ;; needs to be done in nntp.el. - (while (eq article gnus-async-current-prefetch-article) - (incf tries) - (when (nntp-accept-process-output proc) - (setq tries 0)) - (when (and (not nntp-have-messaged) - (= tries 3)) - (gnus-message 5 "Waiting for async article...") - (setq nntp-have-messaged t))) - (quit - ;; if the user interrupted on a slow/hung connection, - ;; do something friendly. - (when (> tries 3) - (setq gnus-async-current-prefetch-article nil)) - (signal 'quit nil))) - (when nntp-have-messaged - (gnus-message 5 ""))))) + (when proc + (condition-case nil + ;; FIXME: we could stop waiting after some + ;; timeout, but this is the wrong place to do it. + ;; rather than checking time-spent-waiting, we + ;; should check time-since-last-output, which + ;; needs to be done in nntp.el. + (while (eq article gnus-async-current-prefetch-article) + (incf tries) + (when (nntp-accept-process-output proc) + (setq tries 0)) + (when (and (not nntp-have-messaged) + (= tries 3)) + (gnus-message 5 "Waiting for async article...") + (setq nntp-have-messaged t))) + (quit + ;; if the user interrupted on a slow/hung connection, + ;; do something friendly. + (when (> tries 3) + (setq gnus-async-current-prefetch-article nil)) + (signal 'quit nil))) + (when nntp-have-messaged + (gnus-message 5 "")))))) (defun gnus-async-delete-prefetched-entry (entry) "Delete ENTRY from buffer and alist." diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el index 06b0f3d..229877f 100644 --- a/lisp/gnus-group.el +++ b/lisp/gnus-group.el @@ -3671,6 +3671,7 @@ re-scanning. If ARG is non-nil and not a number, this will force (gnus-get-unread-articles arg)) (let ((gnus-read-active-file (if arg nil gnus-read-active-file))) (gnus-get-unread-articles arg))) + (gnus-check-reasonable-setup) (gnus-run-hooks 'gnus-after-getting-new-news-hook) (gnus-group-list-groups (and (numberp arg) (max (car gnus-group-list-mode) arg)))) diff --git a/lisp/gnus-start.el b/lisp/gnus-start.el index 8388842..e940a43 100644 --- a/lisp/gnus-start.el +++ b/lisp/gnus-start.el @@ -3285,6 +3285,23 @@ Would otherwise be an alias for `display-time-event-handler'." nil)))) (symbol-value 'nnimap-mailbox-info) (make-vector 1 0))))) +(defun gnus-check-reasonable-setup () + ;; Check whether nnml and nnfolder share a directory. + (let ((actives nil)) + (dolist (server gnus-server-alist) + (let* ((method (gnus-server-to-method server)) + (active (intern (format "%s-active-file" (car method)))) + match) + (when (and (member (car method) '(nnml nnfolder)) + (gnus-server-opened method) + (boundp active)) + (when (setq match (assoc (symbol-value active) actives)) + (display-warning + :warning (format "%s and %s share the same active file %s" + (car method) + (cadr match) + (car match)))) + (push (list (symbol-value active) method) actives)))))) (provide 'gnus-start) diff --git a/lisp/gnus.el b/lisp/gnus.el index 027229f..311227c 100644 --- a/lisp/gnus.el +++ b/lisp/gnus.el @@ -2837,7 +2837,8 @@ gnus-registry.el will populate this if it's loaded.") gnus-start-date-timer gnus-stop-date-timer) ("gnus-int" gnus-request-type) ("gnus-start" gnus-newsrc-parse-options gnus-1 gnus-no-server-1 - gnus-dribble-enter gnus-read-init-file gnus-dribble-touch) + gnus-dribble-enter gnus-read-init-file gnus-dribble-touch + gnus-check-reasonable-setup) ("gnus-dup" gnus-dup-suppress-articles gnus-dup-unsuppress-article gnus-dup-enter-articles) ("gnus-range" gnus-copy-sequence)