X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fgnus-kill.el;h=02ee66e9c7e3b79a84f36374456b676d8c4b4cce;hb=7c959c5bcfe0901db7fa780a7cc016adc3320a0e;hp=faddfdd7431f4ac8a2c11254c2e6bf8c894d1f84;hpb=a629ef97108075cbae0b8b69b2dd1a4723a520c8;p=gnus

diff --git a/lisp/gnus-kill.el b/lisp/gnus-kill.el
index faddfdd74..02ee66e9c 100644
--- a/lisp/gnus-kill.el
+++ b/lisp/gnus-kill.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1995,96,97,98 Free Software Foundation, Inc.
 
 ;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
-;;	Lars Magne Ingebrigtsen <larsi@ifi.uio.no>
+;;	Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
 
 ;; This file is part of GNU Emacs.
@@ -33,7 +33,7 @@
 (require 'gnus-range)
 
 (defcustom gnus-kill-file-mode-hook nil
-  "*Hook for Gnus kill file mode."
+  "Hook for Gnus kill file mode."
   :group 'gnus-score-kill
   :type 'hook)
 
@@ -49,7 +49,7 @@
   :type 'boolean)
 
 (defcustom gnus-winconf-kill-file nil
-  "*What does this do, Lars?"
+  "What does this do, Lars?"
   :group 'gnus-score-kill
   :type 'sexp)
 
@@ -406,7 +406,6 @@ Returns the number of articles marked as read."
 		()
 	      (gnus-message 6 "Processing kill file %s..." (car kill-files))
 	      (find-file (car kill-files))
-	      (gnus-add-current-to-buffer-list)
 	      (goto-char (point-min))
 
 	      (if (consp (ignore-errors (read (current-buffer))))
@@ -469,9 +468,9 @@ Returns the number of articles marked as read."
 	   (?h . "")
 	   (?f . "from")
 	   (?: . "subject")))
-	(com-to-com
-	 '((?m . " ")
-	   (?j . "X")))
+	;;(com-to-com
+	;; '((?m . " ")
+	;;   (?j . "X")))
 	pattern modifier commands)
     (while (not (eobp))
       (if (not (looking-at "[ \t]*/\\([^/]*\\)/\\([ahfcH]\\)?:\\([a-z=:]*\\)"))
@@ -525,7 +524,7 @@ COMMAND must be a lisp expression or a string representing a key sequence."
 		  ;; It's on the form (regexp . date).
 		  (if (zerop (gnus-execute field (car kill-list)
 					   command nil (not all)))
-		      (when (> (gnus-days-between date (cdr kill-list))
+		      (when (> (days-between date (cdr kill-list))
 			       gnus-kill-expiry-days)
 			(setq regexp nil))
 		    (setcdr kill-list date))
@@ -536,7 +535,7 @@ COMMAND must be a lisp expression or a string representing a key sequence."
 			(setq kdate (cdr kill))
 			(if (zerop (gnus-execute
 				    field (car kill) command nil (not all)))
-			    (when (> (gnus-days-between date kdate)
+			    (when (> (days-between date kdate)
 				     gnus-kill-expiry-days)
 			      ;; Time limit has been exceeded, so we
 			      ;; remove the match.
@@ -566,7 +565,7 @@ COMMAND must be a lisp expression or a string representing a key sequence."
 	       (not (consp (cdadr (nth 2 object))))))
       (concat "\n" (gnus-prin1-to-string object))
     (save-excursion
-      (set-buffer (get-buffer-create "*Gnus PP*"))
+      (set-buffer (gnus-get-buffer-create "*Gnus PP*"))
       (buffer-disable-undo (current-buffer))
       (erase-buffer)
       (insert (format "\n(%S %S\n  '(" (nth 0 object) (nth 1 object)))