Re: major problem with recent cvs

[Simon Josefsson <jas@pdc.kth.se>]

Kai.Grossjohann@CS.Uni-Dortmund.DE (Kai Großjohann) writes:

> > +	 (expand-file-name (concat group "/") dir)
> 
> Do you think it would be good to use the following instead?
> 
> (file-name-as-directory (expand-file-name group dir))
> 
> Just a thought.

Good idea, here's a new patch.

Index: lisp/nnmail.el
===================================================================
RCS file: /usr/local/cvsroot/gnus/lisp/nnmail.el,v
retrieving revision 5.48
diff -w -u -r5.48 nnmail.el
--- lisp/nnmail.el	2000/03/13 19:43:14	5.48
+++ lisp/nnmail.el	2000/03/14 11:43:56
@@ -470,13 +470,14 @@
      ;; If this directory exists, we use it directly.
      (if (or nnmail-use-long-file-names
 	     (file-directory-p (concat dir group)))
-	 (expand-file-name group dir)
+	 (file-name-as-directory (expand-file-name group dir))
        ;; If not, we translate dots into slashes.
+       (file-name-as-directory
        (expand-file-name
 	(mm-encode-coding-string
 	 (nnheader-replace-chars-in-string group ?. ?/)
 	 nnmail-pathname-coding-system)
-	dir)))
+	 dir))))
    (or file "")))
 
 (defun nnmail-get-active ()
Index: lisp/nnheader.el
===================================================================
RCS file: /usr/local/cvsroot/gnus/lisp/nnheader.el,v
retrieving revision 5.35
diff -w -u -r5.35 nnheader.el
--- lisp/nnheader.el	2000/03/13 13:50:38	5.35
+++ lisp/nnheader.el	2000/03/14 11:43:56
@@ -730,12 +730,13 @@
    (let ((dir (file-name-as-directory (expand-file-name dir))))
      ;; If this directory exists, we use it directly.
      (if (file-directory-p (concat dir group))
-	 (expand-file-name group dir)
+	 (file-name-as-directory (expand-file-name group dir))
        ;; If not, we translate dots into slashes.
+       (file-name-as-directory
        (expand-file-name (mm-encode-coding-string
 			  (nnheader-replace-chars-in-string group ?. ?/)
 			  nnheader-pathname-coding-system)
-			 dir)))
+			  dir))))
    (cond ((null file) "")
 	 ((numberp file) (int-to-string file))
 	 (t file))))