X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fnnkiboze.el;h=8fb0b6c50b56cabd29520d099c94b78975ee7df0;hb=0563df167689ba46e219f7915c6f5b321da614ce;hp=1ad6f8c9c89b5159473ed69fbb27e7162902c29f;hpb=a707b63af25b91cb730c12e65156ca364bf49a44;p=elisp%2Fgnus.git-

diff --git a/lisp/nnkiboze.el b/lisp/nnkiboze.el
index 1ad6f8c..8fb0b6c 100644
--- a/lisp/nnkiboze.el
+++ b/lisp/nnkiboze.el
@@ -31,13 +31,14 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'cl))
+(eval-when-compile (require 'gnus-clfns))
+
 (require 'nntp)
 (require 'nnheader)
 (require 'gnus)
 (require 'gnus-score)
 (require 'nnoo)
-(require 'mm-util)
-(eval-when-compile (require 'cl))
 
 (nnoo-declare nnkiboze)
 (defvoo nnkiboze-directory (nnheader-concat gnus-directory "kiboze/")
@@ -58,7 +59,7 @@
 (defvoo nnkiboze-regexp nil
   "Regexp for matching component groups.")
 
-(defvoo nnkiboze-file-coding-system mm-text-coding-system
+(defvoo nnkiboze-file-coding-system nnheader-text-coding-system
   "Coding system for nnkiboze files.")
 
 
@@ -147,7 +148,8 @@
   ;; Remove NOV lines of articles that are marked as read.
   (when (and (file-exists-p (nnkiboze-nov-file-name))
 	     nnkiboze-remove-read-articles)
-    (let ((coding-system-for-write nnkiboze-file-coding-system))
+    (let ((coding-system-for-write nnkiboze-file-coding-system)
+	  (output-coding-system nnkiboze-file-coding-system))
       (with-temp-file (nnkiboze-nov-file-name)
 	(let ((cur (current-buffer)) 
 	      (nnheader-file-coding-system nnkiboze-file-coding-system))
@@ -250,10 +252,11 @@ Finds out what articles are to be part of the nnkiboze groups."
     ;; Load the kiboze newsrc file for this group.
     (when (file-exists-p newsrc-file)
       (load newsrc-file))
-    (let ((coding-system-for-write nnkiboze-file-coding-system))
+    (let ((coding-system-for-write nnkiboze-file-coding-system)
+	  (output-coding-system nnkiboze-file-coding-system))
       (with-temp-file nov-file
 	(when (file-exists-p nov-file)
-	  (insert-file-contents nov-file))
+	  (nnheader-insert-file-contents nov-file))
 	(setq nov-buffer (current-buffer))
 	;; Go through the active hashtb and add new all groups that match the
 	;; kiboze regexp.