2007-06-21 Nikita Danilov <nikita@clusterfs.com>

[elisp/riece.git] / lisp / riece-mcat.el

diff --git a/lisp/riece-mcat.el b/lisp/riece-mcat.el
index 78affd8..a2573cd 100644 (file)
--- a/lisp/riece-mcat.el
+++ b/lisp/riece-mcat.el
@@ -26,8 +26,9 @@
 
 (defun riece-mcat (string)
   "Translate STRING in the current language environment."
-  (let ((feature (get-language-info current-language-environment
-                                   'riece-mcat-feature)))
+  (let ((feature (if (featurep 'mule)
+                    (get-language-info current-language-environment
+                                       'riece-mcat-feature))))
     (if feature
        (progn
          (require feature)
@@ -44,9 +45,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 pointer)
       (while files
        (with-temp-buffer
          (insert-file-contents (car files))
@@ -61,12 +62,13 @@
                         (riece-mcat-extract-from-form
                          (read (current-buffer)))))))
        (setq files (cdr files)))
-      (setq message-list (sort message-list #'string-lessp))
-      (while message-list
-       (unless (assoc (car message-list) alist)
-         (setq alist (cons (list (car message-list)) alist)))
-       (setq message-list (cdr message-list)))
-      alist)))
+      (setq message-list (sort message-list #'string-lessp)
+           pointer message-list)
+      (while pointer
+       (if (member (car pointer) (cdr pointer))
+           (setcar pointer nil))
+       (setq pointer (cdr pointer)))
+      (delq nil message-list))))
 
 (defun riece-mcat-update (files mcat-file mcat-alist-symbol)
   "Update MCAT-FILE."
@@ -85,7 +87,11 @@
              (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 (mapcar (lambda (message)
+                           (or (assoc message
+                                      (symbol-value mcat-alist-symbol))
+                               (list message)))
+                         (riece-mcat-extract files)))
       (insert "(defconst " (symbol-name mcat-alist-symbol) "\n  '(")
       (while alist
        (insert "(" (pp-to-string (car (car alist))) " . "