Synch with Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c9ef545..0ad7478 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2000-07-16 Dmitry Bely <dbely@mail.ru>
+
+       * nnheader.el (nnheader-translate-file-chars): Path splitting on NT.
+
+2000-09-20 18:33:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * gnus-score.el (gnus-score-find-bnews): Use directory-sep-char.
+
 2000-09-20 17:37:46  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * message.el (message-default-charset): Set default value in

diff --git a/lisp/gnus-score.el b/lisp/gnus-score.el
index 2f44019..e0927e2 100644 (file)
--- a/lisp/gnus-score.el
+++ b/lisp/gnus-score.el
@@ -2585,7 +2585,7 @@ GROUP using BNews sys file syntax."
              ;; too much.
              (delete-char (min (1- (point-max)) klen))
            (goto-char (point-max))
-           (search-backward "/")
+           (search-backward (char-to-string directory-sep-char))
            (delete-region (1+ (point)) (point-min)))
          ;; If short file names were used, we have to translate slashes.
          (goto-char (point-min))

diff --git a/lisp/nnheader.el b/lisp/nnheader.el
index 6239929..f70171b 100644 (file)
--- a/lisp/nnheader.el
+++ b/lisp/nnheader.el
@@ -836,10 +836,24 @@ If FULL, translate everything."
                      2 0))
        ;; We translate -- but only the file name.  We leave the directory
        ;; alone.
-       (if (string-match "/[^/]+\\'" file)
-           ;; This is needed on NT's and stuff.
-           (setq leaf (substring file (1+ (match-beginning 0)))
-                 path (substring file 0 (1+ (match-beginning 0))))
+       (if (memq system-type '(win32 w32 mswindows windows-nt))
+           ;; This is needed on NT and stuff, because
+           ;; file-name-nondirectory is not enough to split
+           ;; file names, containing ':', e.g.
+           ;; "d:\\Work\\News\\nntp+news.fido7.ru:fido7.ru.gnu.SCORE"
+           ;; 
+           ;; we are trying to correctly split such names:
+           ;; "d:file.name" -> "a:" "file.name"
+           ;; "aaa:bbb.ccc" -> "" "aaa:bbb.ccc"
+           ;; "d:aaa\\bbb:ccc"   -> "d:aaa\\" "bbb:ccc"
+           ;; etc.
+           ;; to translate then only the file name part.
+           (progn
+             (setq leaf file
+                   path "")
+             (if (string-match "\\(^\\w:\\|[/\\]\\)\\([^/\\]+\\)$" file)
+                 (setq leaf (substring file (match-beginning 2))
+                       path (substring file 0 (match-beginning 2)))))
          ;; Fall back on this.
          (setq leaf (file-name-nondirectory file)
                path (file-name-directory file))))

diff --git a/texi/ChangeLog b/texi/ChangeLog
index a187a34..5c20a34 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,8 @@
+2000-09-20 John H. Palmieri  <palmieri@math.washington.edu>
+
+       * gnus.texi (Mail Source Customization): Document of
+       mail-source-incoming-file-prefix.
+
 2000-09-20  Simon Josefsson  <simon@josefsson.org>
 
        * gnus.texi (IMAP): Add examples.

diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index 98548d9..bf18114 100644 (file)
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -10901,6 +10901,13 @@ www.my-deja.com \e$B$J$I$N%&%'%V%a!<%k%5!<%P!<$+$i%a!<%k$r<hF@$7$^$9!#\e(B
 \e$B$O\e(B @file{~/Mail/} \e$B$G$9!#8=;~E@$G$O!"$3$l$,;H$o$l$kM#0l$N$b$N$OA0$NJQ?t\e(B
 \e$B$,\e(B @code{nil} \e$B$G$"$C$?>l9g!"F~$C$F$-$?%U%!%$%k$,J]B8$5$l$k>l=j$N;XDj$G$9!#\e(B
 
+@item mail-source-incoming-file-prefix
+@vindex mail-source-incoming-file-prefix
+\e$BF~$C$F$-$?%a!<%k$rJ]B8$9$k%U%!%$%k$N%W%l%U%#%C%/%9$G$9!#=i4|CM\e(B
+\e$B$O\e(B @file{Incoming} \e$B$G!"$3$N>l9g%U%!%$%k\e(B
+\e$B$O\e(B @file{Incoming30630D_} \e$B$d\e(B @file{Incoming298602ZD} \e$B$N$h$&$K$J$j$^$9!#\e(B
+@code{mail-source-delete-incoming} \e$B$,\e(B @code{nil} \e$B$N>l9g$@$1$G$9$,!#\e(B
+
 @item mail-source-default-file-modes
 @vindex mail-source-default-file-modes
 \e$BA4$F$N?7$7$$%a!<%k%U%!%$%k$O$3$N%U%!%$%k%b!<%I$K$J$j$^$9!#=i4|CM\e(B

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 9909aa6..038e3e5 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -11433,6 +11433,13 @@ Directory where files (if any) will be stored.  The default is
 where the incoming files will be stored if the previous variable is
 @code{nil}.
 
+@item mail-source-incoming-file-prefix
+@vindex mail-source-incoming-file-prefix
+Prefix for file name for storing incoming mail.  The default is
+@file{Incoming}, in which case files will end up with names like
+@file{Incoming30630D_} or @file{Incoming298602ZD}.  This is really only
+relevant if @code{mail-source-delete-incoming} is @code{nil}.
+
 @item mail-source-default-file-modes
 @vindex mail-source-default-file-modes
 All new mail files will get this file mode.  The default is 384.