(require 'pp)
(defun riece-mcat (string)
+ "Translate STRING in the current language environment."
(let ((feature (get-language-info current-language-environment
'riece-mcat-feature)))
(if feature
(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)
(while files
(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)
+ (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."
(let ((pp-escape-newlines t)
alist)
(save-excursion
(set-buffer (find-file-noselect mcat-file))
(goto-char (point-min))
(if (re-search-forward (concat "^\\s-*(\\(defvar\\|defconst\\)\\s-+"
- (regexp-quote (symbol-name mcat-alist)))
+ (regexp-quote (symbol-name
+ mcat-alist-symbol)))
nil t)
(progn
(goto-char (match-beginning 0))
(save-excursion
(eval (read (current-buffer))))
(delete-region (point) (progn (forward-sexp) (point))))
- (set mcat-alist nil))
- (setq alist (riece-mcat-extract files (symbol-value mcat-alist)))
- (insert "(defconst " (symbol-name mcat-alist) "\n '(")
+ (set mcat-alist-symbol nil))
+ (setq alist (mapcar (lambda (message)
+ (or (assoc message (symbol-name 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))) " . "
(pp-to-string (cdr (car alist))) ")")