From 0af657dc08330d83ff62fa31d88e782286469f95 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Fri, 21 Mar 2003 09:38:37 +0000 Subject: [PATCH] Synch to Oort Gnus 200303210730. --- lisp/ChangeLog | 16 ++++++++++++++++ lisp/gnus-int.el | 3 ++- lisp/gnus-sum.el | 11 ++++++++++- lisp/gnus-uu.el | 15 ++++++++++----- 4 files changed, 38 insertions(+), 7 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2df0773..3fa5e44 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,19 @@ +2003-03-21 Kevin Greiner + + * gnus-int.el (gnus-open-server): Catch errors in backend's + open-server method. Returns nil rather than crashing startup. + + * gnus-sum.el (eval-when-compile): Modified to resolve + compile-time warnings. + + * gnus-uu.el (gnus-uu-mark-series): Added informative msg. + Reports length of series so that the user can compare N with a + subject that should, if the entire series is present, contain + '(.../N)'. + (gnus-uu-delete-work-dir): Avoid hanging when O/S forbids deletion + of temp file (Win-XP may leave the temp file locked when the + uudecode process fails). + 2003-03-20 ShengHuo ZHU * message.el (message-split-line): Ignore error. diff --git a/lisp/gnus-int.el b/lisp/gnus-int.el index b9afda8..3d6c735 100644 --- a/lisp/gnus-int.el +++ b/lisp/gnus-int.el @@ -50,7 +50,7 @@ server denied." :group 'gnus-start :type '(choice (const :tag "Ask" nil) (const :tag "Deny server" denied) - (const :tag "Unplugg Agent" offline))) + (const :tag "Unplug Agent" offline))) (defvar gnus-internal-registry-spool-current-method nil "The current method, for the registry.") @@ -207,6 +207,7 @@ If it is down, start it up (again)." (funcall (gnus-get-function gnus-command-method 'open-server) (nth 1 gnus-command-method) (nthcdr 2 gnus-command-method)) + (error nil) (quit (message "Quit trying to open server") nil)))) diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el index 5cc2b95..cb6553f 100644 --- a/lisp/gnus-sum.el +++ b/lisp/gnus-sum.el @@ -1438,9 +1438,18 @@ buffers. For example: ") ;; Byte-compiler warning. -;(eval-when-compile (defvar gnus-article-mode-map)) (eval-when-compile + ;; Bind features so that require will believe that gnus-sum has + ;; already been loaded (avoids infinite recursion) (let ((features (cons 'gnus-sum features))) + ;; Several of the declarations in gnus-sum are needed to load the + ;; following files. Right now, these definitions have been + ;; compiled but not defined (evaluated). We could either do a + ;; eval-and-compile about all of the declarations or evaluate the + ;; source file. + (if (boundp 'gnus-newsgroup-variables) + nil + (load "gnus-sum.el" t t t t)) (require 'gnus) (require 'gnus-agent) (require 'gnus-art))) diff --git a/lisp/gnus-uu.el b/lisp/gnus-uu.el index 3436670..500610e 100644 --- a/lisp/gnus-uu.el +++ b/lisp/gnus-uu.el @@ -571,11 +571,12 @@ When called interactively, prompt for REGEXP." (defun gnus-uu-mark-series () "Mark the current series with the process mark." (interactive) - (let ((articles (gnus-uu-find-articles-matching))) + (let* ((articles (gnus-uu-find-articles-matching)) + (l (length articles))) (while articles (gnus-summary-set-process-mark (car articles)) (setq articles (cdr articles))) - (message "")) + (message "Marked %d articles" l)) (gnus-summary-position-point)) (defun gnus-uu-mark-region (beg end &optional unmark) @@ -1786,9 +1787,13 @@ Gnus might fail to display all of it.") (if (file-directory-p file) (gnus-uu-delete-work-dir file) (gnus-message 9 "Deleting file %s..." file) - (delete-file file)))) - (delete-directory dir))) - (gnus-message 7 "")) + (condition-case err + (delete-file file) + (error (gnus-message 3 "Deleting file %s failed... %s" file err)))))) + (condition-case err + (delete-directory dir) + (error (gnus-message 3 "Deleting directory %s failed... %s" file err)))) + (gnus-message 7 ""))) ;; Initializing -- 1.7.10.4