# HG changeset patch
# User Dave Love <fx@gnu.org>
# Date 973897396 0
# Node ID bcba582cbfe56a8f0edcd750ea6632e3a582f88c
# Parent  42c1ba3caf9cbc8a9baa6df76142bd3ed9a45661
(gnus-agent-confirmation-function): Add :version.
(gnus-agent-lib-file, gnus-agent-load-alist)
(gnus-agent-save-alist, gnus-agent-article-name): Use
expand-file-name.

diff -r 42c1ba3caf9c -r bcba582cbfe5 lisp/gnus/gnus-agent.el
--- a/lisp/gnus/gnus-agent.el	Fri Nov 10 22:58:26 2000 +0000
+++ b/lisp/gnus/gnus-agent.el	Fri Nov 10 23:03:16 2000 +0000
@@ -2,7 +2,6 @@
 ;; Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
-;; Maintainer: bugs@gnus.org
 ;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
@@ -83,12 +82,14 @@
 
 (defcustom gnus-agent-confirmation-function 'y-or-n-p
   "Function to confirm when error happens."
+  :version "21.1"
   :group 'gnus-agent
   :type 'function)
 
 (defcustom gnus-agent-synchronize-flags 'ask
   "Indicate if flags are synchronized when you plug in.
 If this is `ask' the hook will query the user."
+  :version "21.1"
   :type '(choice (const :tag "Always" t)
 		 (const :tag "Never" nil)
 		 (const :tag "Ask" ask))
@@ -171,7 +172,9 @@
 
 (defun gnus-agent-lib-file (file)
   "The full path of the Gnus agent library FILE."
-  (concat (gnus-agent-directory) "agent.lib/" file))
+  (expand-file-name file
+		    (file-name-as-directory
+		     (expand-file-name "agent.lib" (gnus-agent-directory)))))
 
 ;;; Fetching setup functions.
 
@@ -1043,14 +1046,14 @@
   (setq gnus-agent-article-alist
 	(gnus-agent-read-file
 	 (if dir
-	     (concat dir ".agentview")
+	     (expand-file-name ".agentview" dir)
 	   (gnus-agent-article-name ".agentview" group)))))
 
 (defun gnus-agent-save-alist (group &optional articles state dir)
   "Save the article-state alist for GROUP."
   (let ((file-name-coding-system nnmail-pathname-coding-system))
       (with-temp-file (if dir
-			  (concat dir ".agentview")
+			  (expand-file-name ".agentview" dir)
 			(gnus-agent-article-name ".agentview" group))
 	(princ (setq gnus-agent-article-alist
 		     (nconc gnus-agent-article-alist
@@ -1060,8 +1063,10 @@
 	(insert "\n"))))
 
 (defun gnus-agent-article-name (article group)
-  (concat (gnus-agent-directory) (gnus-agent-group-path group) "/"
-	  (if (stringp article) article (string-to-number article))))
+  (expand-file-name (if (stringp article) article (string-to-number article))
+		    (file-name-as-directory
+		     (expand-file-name (gnus-agent-group-path group)
+				       (gnus-agent-directory)))))
 
 (defun gnus-agent-batch-confirmation (msg)
   "Show error message and return t."