Changed version to 1.2.1.

[gnu-emacs] / lisp / gnus-edit.el

diff --git a/lisp/gnus-edit.el b/lisp/gnus-edit.el
index b25ef259026312c49ee1eeeb337ec42917d60a6e..4ac5e6777a1a5a42f55125e4995752987a20cc42 100644 (file)
--- a/lisp/gnus-edit.el
+++ b/lisp/gnus-edit.el
@@ -1,5 +1,5 @@
 ;;; gnus-edit.el --- Gnus SCORE file editing
-;; Copyright (C) 1995 Free Software Foundation, Inc.
+;; Copyright (C) 1995,96 Free Software Foundation, Inc.
 ;;
 ;; Author: Per Abrahamsen <abraham@iesd.auc.dk>
 ;; Keywords: news, help
@@ -13,6 +13,7 @@
 
 (require 'custom)
 (require 'gnus-score)
+(eval-when-compile (require 'cl))
 
 (defconst gnus-score-custom-data
   '((tag . "Score")
@@ -46,7 +47,7 @@ the score file and the value of the global variable
                  (query . gnus-score-custom-save))
                 ((name . file)
                  (tag . "File")
-                 (directory . "~/News/")
+                 (directory . gnus-kill-files-directory)
                  (default-file . "SCORE")
                  (type . file))))
          ((name . files)
@@ -61,7 +62,7 @@ delete a score file from the list.")
           (data ((type . repeat)
                  (header . nil)
                  (data (type . file)
-                       (directory . "~/News/")))))
+                       (directory . gnus-kill-files-directory)))))
          ((name . exclude-files)
           (tag . "Exclude Files")
           (doc . "\
@@ -76,7 +77,7 @@ delete a score file from the list.")
           (data ((type . repeat)
                  (header . nil)
                  (data (type . file)
-                       (directory . "~/News/")))))
+                       (directory . gnus-kill-files-directory)))))
          ((name . mark)
           (tag . "Mark")
           (doc . "\
@@ -536,7 +537,8 @@ groups matched by the current score file.")
                          'gnus-score-custom-get
                          'gnus-score-custom-save))
   (make-local-variable 'gnus-score-custom-file)
-  (setq gnus-score-custom-file (expand-file-name  "SCORE" "~/News"))
+  (setq gnus-score-custom-file
+       (expand-file-name "SCORE" gnus-kill-files-directory))
   (make-local-variable 'gnus-score-alist)
   (setq gnus-score-alist nil)
   (custom-reset-all))
@@ -548,9 +550,9 @@ groups matched by the current score file.")
       (if entry 
          (mapcar 'gnus-score-custom-sanify (cdr entry))
        (setq entry (assoc name gnus-score-alist))
-       (if (or (memq name '(files exclude-files local))
-               (and (eq name 'adapt)
-                    (not (symbolp (car (cdr entry))))))
+       (if  (or (memq name '(files exclude-files local))
+                (and (eq name 'adapt)
+                     (not (symbolp (car (cdr entry))))))
            (cdr entry)
          (car (cdr entry)))))))
 
@@ -600,11 +602,11 @@ groups matched by the current score file.")
   (let ((file (custom-name-value 'file)))
     (if (eq file custom-nil)
        (error "You must specify a file name"))
-    (setq file (expand-file-name file "~/News"))
+    (setq file (expand-file-name file gnus-kill-files-directory))
     (gnus-score-load file)
     (setq gnus-score-custom-file file)
     (custom-reset-all)
-    (message "Loaded")))
+    (gnus-message 4 "Loaded")))
 
 (defun gnus-score-custom-save ()
   (interactive)
@@ -621,7 +623,7 @@ groups matched by the current score file.")
       (gnus-make-directory (file-name-directory file))
       (write-region (point-min) (point-max) file nil 'silent)
       (kill-buffer (current-buffer))))
-  (message "Saved"))
+  (gnus-message 4 "Saved"))
 
 (provide 'gnus-edit)