(riece-menu-items): Bind riece-command-configure-windows.

[riece] / lisp / riece-mcat.el

diff --git a/lisp/riece-mcat.el b/lisp/riece-mcat.el
index 3155b5c..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)
@@ -46,7 +47,7 @@
 
 (defun riece-mcat-extract (files)
   (save-excursion
-    (let (message-list)
+    (let (message-list pointer)
       (while files
        (with-temp-buffer
          (insert-file-contents (car files))
@@ -87,7 +88,8 @@
            (delete-region (point) (progn (forward-sexp) (point))))
        (set mcat-alist-symbol nil))
       (setq alist (mapcar (lambda (message)
-                           (or (assoc message (symbol-name mcat-alist-symbol))
+                           (or (assoc message
+                                      (symbol-value mcat-alist-symbol))
                                (list message)))
                          (riece-mcat-extract files)))
       (insert "(defconst " (symbol-name mcat-alist-symbol) "\n  '(")