Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d6e4560..d930374 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2003-01-10  Simon Josefsson  <jas@extundo.com>
+
+       * nndraft.el (nndraft-request-group): Avoid crash in
+       directory-files when draft directory doesn't exists.
+
+       * gnus-sum.el (gnus-select-article-hook): Add :option.
+
 2003-01-10  Teodor Zlatanov  <tzz@lifelogs.com>
 
        * spam.el (spam-use-stat): new variable

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index b1744d1..7312f0c 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -820,6 +820,7 @@ following hook:
 (defcustom gnus-select-article-hook nil
   "*A hook called when an article is selected."
   :group 'gnus-summary-choose
+  :options '(gnus-agent-fetch-selected-article)
   :type 'hook)
 
 (defcustom gnus-visual-mark-article-hook

diff --git a/lisp/nndraft.el b/lisp/nndraft.el
index 0a0ff24..b0ffdbb 100644 (file)
--- a/lisp/nndraft.el
+++ b/lisp/nndraft.el
@@ -186,7 +186,8 @@
           dir file)
       (nnheader-re-read-dir pathname)
       (setq dir (mapcar (lambda (name) (string-to-int (substring name 1)))
-                       (directory-files pathname nil "^#[0-9]+#$" t)))
+                       (ignore-errors (directory-files
+                                       pathname nil "^#[0-9]+#$" t))))
       (dolist (n dir)
        (unless (file-exists-p
                 (setq file (expand-file-name (int-to-string n) pathname)))