Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ac412e3..14a81b1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2001-03-06 13:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * gnus-score.el (gnus-score-find-bnews): Maybe there is no
+       directory part.
+       (gnus-score-search-global-directories): Use file-directory-p.
+
+       * gnus-score.el (gnus-score-score-files-1): Use
+       gnus-kill-files-directory.
+       From Adrian Aichner <adrian@xemacs.org>.
+
 2001-03-05 08:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * gnus.el (charset): Move here from gnus-sum.el.

diff --git a/lisp/gnus-score.el b/lisp/gnus-score.el
index 7f9771e..4ad0472 100644 (file)
--- a/lisp/gnus-score.el
+++ b/lisp/gnus-score.el
@@ -2557,7 +2557,8 @@ score in GNUS-NEWSGROUP-SCORED by SCORE."
        (push file out))))
     (or out
        ;; Return a dummy value.
-       (list "~/News/this.file.does.not.exist.SCORE"))))
+       (list (expand-file-name "this.file.does.not.exist.SCORE"
+                               gnus-kill-files-directory)))))
 
 (defun gnus-score-file-regexp ()
   "Return a regexp that match all score files."
@@ -2595,8 +2596,8 @@ GROUP using BNews sys file syntax."
              ;; too much.
              (delete-char (min (1- (point-max)) klen))
            (goto-char (point-max))
-           (search-backward (char-to-string directory-sep-char))
-           (delete-region (1+ (point)) (point-min)))
+           (if (search-backward (char-to-string directory-sep-char) nil t)
+               (delete-region (1+ (point)) (point-min))))
          ;; If short file names were used, we have to translate slashes.
          (goto-char (point-min))
          (let ((regexp (concat
@@ -2835,7 +2836,7 @@ The list is determined from the variable gnus-score-file-alist."
   (let (out)
     (while files
       ;; #### /$ Unix-specific?
-      (if (string-match "/$" (car files))
+      (if (file-directory-p (car files))
          (setq out (nconc (directory-files
                            (car files) t
                            (concat (gnus-score-file-regexp) "$"))))