From 406bfc4d4c030a08024bdbc9e0351d6096ddb15b Mon Sep 17 00:00:00 2001 From: Ken Raeburn Date: Sun, 5 Feb 2017 06:23:21 -0500 Subject: [PATCH] Call unify-charset on appropriate charsets. * lisp/loadup.el: Build a list of charsets with the :unify-map property, and generate calls to unify-charset on them at startup. --- lisp/loadup.el | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lisp/loadup.el b/lisp/loadup.el index fe644ce3b76..3c8686d356a 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -492,6 +492,7 @@ lost after dumping"))) (let ((faces '()) (coding-systems '()) (coding-system-aliases '()) (charsets '()) (charset-aliases '()) + (unified-charsets '()) (cmds '())) (setcdr global-buffers-menu-map nil) ;; Get rid of buffer objects! (push `(internal--set-standard-syntax-table @@ -565,7 +566,11 @@ lost after dumping"))) (push (cons s (car (coding-system-aliases s))) coding-system-aliases)) (if (get s 'internal--charset-args) - (push s charsets) + (progn + (push s charsets) + (if (member :unify-map + (nth 15 (get s 'internal--charset-args))) + (push s unified-charsets))) (when (and (charsetp s) (not (eq s (get-charset-property s :name)))) (push (cons s (get-charset-property s :name)) @@ -620,6 +625,7 @@ lost after dumping"))) ;; (message "Defining coding-system %S...postponed" ;; cs) (push cs css))))))) + (print `(mapcar 'unify-charset ',unified-charsets)) (print `(dolist (f ',faces) (face-spec-set f (get f 'face-defface-spec) 'face-defface-spec))) -- 2.39.5