# HG changeset patch
# User Dave Love <fx@gnu.org>
# Date 973879771 0
# Node ID 33c4d154294b94825427804770263a333f7d6ab0
# Parent  ab964e52e0bae0b475ff8a593a303e03ebea93f1
(gnus-cache-active-file): Don't use
file-name-as-directory on directory.
(gnus-cache-file-name): Use expand-file-name, not concat.  Don't
use file-name-as-directory on directory.

diff -r ab964e52e0ba -r 33c4d154294b lisp/gnus/gnus-cache.el
--- a/lisp/gnus/gnus-cache.el	Fri Nov 10 18:02:56 2000 +0000
+++ b/lisp/gnus/gnus-cache.el	Fri Nov 10 18:09:31 2000 +0000
@@ -36,7 +36,7 @@
   (require 'gnus-sum))
 
 (defcustom gnus-cache-active-file
-  (concat (file-name-as-directory gnus-cache-directory) "active")
+  (expand-file-name "active" gnus-cache-directory)
   "*The cache active file."
   :group 'gnus-cache
   :type 'file)
@@ -410,20 +410,22 @@
       (and (not unread) (not ticked) (not dormant) (memq 'read class))))
 
 (defun gnus-cache-file-name (group article)
-  (concat (file-name-as-directory gnus-cache-directory)
-	  (file-name-as-directory
-	   (nnheader-translate-file-chars
-	    (if (gnus-use-long-file-name 'not-cache)
-		group
-	      (let ((group (nnheader-replace-duplicate-chars-in-string
-			    (nnheader-replace-chars-in-string group ?/ ?_)
-			    ?. ?_)))
-		;; Translate the first colon into a slash.
-		(when (string-match ":" group)
-		  (aset group (match-beginning 0) ?/))
-		(nnheader-replace-chars-in-string group ?. ?/)))
-	    t))
-	  (if (stringp article) article (int-to-string article))))
+  (expand-file-name
+   (if (stringp article) article (int-to-string article))
+   (file-name-as-directory
+    (expand-file-name
+     (nnheader-translate-file-chars
+      (if (gnus-use-long-file-name 'not-cache)
+	  group
+	(let ((group (nnheader-replace-duplicate-chars-in-string
+		      (nnheader-replace-chars-in-string group ?/ ?_)
+		      ?. ?_)))
+	  ;; Translate the first colon into a slash.
+	  (when (string-match ":" group)
+	    (aset group (match-beginning 0) ?/))
+	  (nnheader-replace-chars-in-string group ?. ?/)))
+      t)
+     gnus-cache-directory))))
 
 (defun gnus-cache-update-article (group article)
   "If ARTICLE is in the cache, remove it and re-enter it."