X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fspam.el;h=17f487f2af00ab44e03b92f85cb3891e3e23557c;hb=9b741e050b400987d68ff761c6cc3276c932839c;hp=98a4151629aae530740a015840faa9c0c977b926;hpb=fa47c6dbdc1afcf6ec71ece10a540a3307718f32;p=elisp%2Fgnus.git-

diff --git a/lisp/spam.el b/lisp/spam.el
index 98a4151..17f487f 100644
--- a/lisp/spam.el
+++ b/lisp/spam.el
@@ -64,7 +64,7 @@
   "The location of the whitelist.
 The file format is one regular expression per line.
 The regular expression is matched against the address.")
-					 
+
 (defvar spam-blacklist (expand-file-name "blacklist" spam-directory)
   "The location of the blacklist.
 The file format is one regular expression per line.
@@ -94,6 +94,11 @@ Optional arg BLACKLIST, if non-nil, means to enter in the blacklist instead."
   (interactive "sAddress: ")
   (spam-enter-whitelist address t))
 
+(eval-and-compile
+  (defalias 'spam-point-at-eol (if (fboundp 'point-at-eol)
+				   'point-at-eol
+				 'line-end-position)))
+
 (defun spam-parse-whitelist (&optional blacklist)
   (let ((file (if blacklist spam-blacklist spam-whitelist))
 	contents address)
@@ -101,7 +106,7 @@ Optional arg BLACKLIST, if non-nil, means to enter in the blacklist instead."
       (with-temp-buffer
 	(insert-file-contents file)
 	(while (not (eobp))
-	  (setq address (buffer-substring (point) (point-at-eol)))
+	  (setq address (buffer-substring (point) (spam-point-at-eol)))
 	  (forward-line 1)
 	  (unless (zerop (length address))
 	    (setq address (regexp-quote address))