(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.

2 files changed, 47 insertions, 6 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 3fca4023056..aabe1de012b 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,5 +1,37 @@
 2000-11-10  Dave Love  <fx@gnu.org>
 
+        * gnus-agent.el (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.
+
+        * gnus-group.el (gnus-group-name-charset-method-alist): Add
+        :version.
+        (nnkiboze-score-file): Defvar when compiling.
+
+        * gnus-start.el (gnus-read-newsrc-file): Add :version.
+
+        * gnus-art.el (gnus-article-banner-alist) 
+        (gnus-emphasize-whitespace-regexp, gnus-ignored-mime-types) 
+        (gnus-article-date-lapsed-new-header) 
+        (gnus-article-mime-match-handle-function, gnus-mime-action-alist) 
+        (gnus-treat-strip-list-identifiers, gnus-treat-date-iso8601) 
+        (gnus-treat-strip-headers-in-body) 
+        (gnus-treat-capitalize-sentences, gnus-treat-play-sounds) 
+        (gnus-treat-translate): Add :version.
+        (gnus-article-mime-part-function): Fix defcustom.
+
+        * nnmail.el (nnmail-expiry-target) 
+        (nnmail-scan-directory-mail-source-once, nnmail-extra-headers) 
+        (nnmail-split-header-length-limit): Add :version.
+
+        * gnus-sum.el (gnus-auto-expirable-marks) 
+        (gnus-inhibit-user-auto-expire, gnus-list-identifiers) 
+        (gnus-extra-headers, gnus-ignored-from-addresses) 
+        (gnus-newsgroup-ignored-charsets) 
+        (gnus-group-highlight-words-alist) 
+        (gnus-summary-show-article-charset-alist): Add :version.
+
         * catchup.pbm, describe-group.pbm, exit-gnus.pbm, get-news.pbm:
         gnntg.pbm, kill-group.pbm, subscribe.pbm, unsubscribe.pbm: New
         files, converted from the XPMs.
@@ -15,6 +47,10 @@
         * message.el (message-mode) <adaptive-fill-regexp>:
         <adaptive-fill-first-line-regexp>: Use [:alnum:] in regexp range.
         (message-newline-and-reformat): Likewise.
+        (message-forward-as-mime, message-forward-ignored-headers) 
+        (message-buffer-naming-style, message-default-charset) 
+        (message-dont-reply-to-names, message-send-mail-partially-limit):
+        Add :version.
 
         * mm-util.el: Doc fixes.
         (mm-mime-charset): Don't use the raw result of
diff --git a/lisp/gnus/gnus-agent.el b/lisp/gnus/gnus-agent.el
index 39f1dde08c4..3f3a3cbb32d 100644
--- a/lisp/gnus/gnus-agent.el
+++ b/lisp/gnus/gnus-agent.el
@@ -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 @@ If nil, only read articles will be expired."
 
 (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 @@ If this is `ask' the hook will query the user."
 
 (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 @@ the actual number of articles toggled is returned."
   (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 @@ the actual number of articles toggled is returned."
         (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."