* riece-mcat.el (riece-mcat-extract): Abolished ALIST arg.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1022413..240cc84 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2007-01-22  Daiki Ueno  <ueno@unixuser.org>
+
+       * riece-mcat.el (riece-mcat-extract): Abolished ALIST arg.
+
 2007-01-19  Daiki Ueno  <ueno@unixuser.org>
 
        * riece-options.el (riece-addons): Insinuate riece-mcat by default.

diff --git a/lisp/riece-mcat.el b/lisp/riece-mcat.el
index 78affd8..a11bb2a 100644 (file)
--- a/lisp/riece-mcat.el
+++ b/lisp/riece-mcat.el
@@ -44,9 +44,9 @@
        (delq nil (apply #'nconc
                         (mapcar #'riece-mcat-extract-from-form form))))))
 
-(defun riece-mcat-extract (files alist)
+(defun riece-mcat-extract (files)
   (save-excursion
-    (let (message-list)
+    (let (message-list alist)
       (while files
        (with-temp-buffer
          (insert-file-contents (car files))
@@ -85,7 +85,7 @@
              (eval (read (current-buffer))))
            (delete-region (point) (progn (forward-sexp) (point))))
        (set mcat-alist-symbol nil))
-      (setq alist (riece-mcat-extract files (symbol-value mcat-alist-symbol)))
+      (setq alist (riece-mcat-extract files))
       (insert "(defconst " (symbol-name mcat-alist-symbol) "\n  '(")
       (while alist
        (insert "(" (pp-to-string (car (car alist))) " . "