+ (save-excursion
+ (let (message-list)
+ (while files
+ (with-temp-buffer
+ (insert-file-contents (car files))
+ (goto-char (point-min))
+ (while (progn
+ (while (progn (skip-chars-forward " \t\n\f")
+ (looking-at ";"))
+ (forward-line 1))
+ (not (eobp)))
+ (setq message-list
+ (nconc message-list
+ (riece-mcat-extract-from-form
+ (read (current-buffer)))))))
+ (setq files (cdr files)))
+ (setq message-list (sort message-list #'string-lessp))
+ (while message-list
+ (if (equal (car message-list)
+ (nth 1 message-list))
+ (setq message-list (nthcdr 2 message-list))
+ (unless (assoc (car message-list) alist)
+ (setq alist (cons (list (car message-list)) alist)))
+ (setq message-list (cdr message-list))))
+ alist)))
+
+(defun riece-mcat-update (files mcat-file mcat-alist)
+ (let (alist)
+ (save-excursion
+ (set-buffer (find-file-noselect mcat-file))
+ (goto-char (point-min))
+ (re-search-forward (concat "^\\s-*(\\(defvar\\|defconst\\)\\s-+"
+ (regexp-quote (symbol-name mcat-alist))))
+ (goto-char (match-beginning 0))