(current-language-environment): Set custom-type after

language files are loaded.

diff --git a/lisp/loadup.el b/lisp/loadup.el
index 4e3da844e51a4652cfe2faa4677f411ba334ce47..efd49e4573fcba842cf3d15f7806ba5c62f8c113 100644 (file)
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -107,6 +107,11 @@
 (load "language/tibetan")
 (load "language/vietnamese")
 (load "language/misc-lang")
+;; Set the Custom type now the language list is actually defined.
+(put 'current-language-environment 'custom-type
+     (cons 'choice (mapcar (lambda (lang)
+                            (list 'const (car lang)))
+                          language-info-alist)))
 
 (load "international/ucs-tables")