# HG changeset patch
# User aidan
# Date 1196284675 0
# Node ID 0194a744d2d37d70f57516e81d732924163271d0
# Parent  fcc999c434bc3d5b9e01faeaedc8f47184c78c81
[xemacs-hg @ 2007-11-28 21:17:45 by aidan]
When creating variant language environments, specify
tutorial-coding-system.

diff -r fcc999c434bc -r 0194a744d2d3 lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Nov 27 23:18:25 2007 +0000
+++ b/lisp/ChangeLog	Wed Nov 28 21:17:55 2007 +0000
@@ -1,3 +1,9 @@
+2007-11-28  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* mule/mule-cmds.el (create-variant-language-environment):
+	Set tutorial-coding-system to correspond to the original coding
+	system when creating the variant language environment. 
+
 2007-11-27  Aidan Kehoe  <kehoea@parhasard.net>
 
 	* bytecomp.el (byte-compile-file-form-custom-declare-variable):
diff -r fcc999c434bc -r 0194a744d2d3 lisp/mule/mule-cmds.el
--- a/lisp/mule/mule-cmds.el	Tue Nov 27 23:18:25 2007 +0000
+++ b/lisp/mule/mule-cmds.el	Wed Nov 28 21:17:55 2007 +0000
@@ -1099,13 +1099,18 @@
    (destructive-plist-to-alist 
     (plist-put
      (plist-put
-      (plist-put (alist-to-plist (cdr langenv))
-                 'native-coding-system
-                 coding-system)
-      'coding-system (cons coding-system
-                           (cdr (assoc 'coding-system (cdr langenv)))))
-     'coding-priority (cons coding-system
-                           (cdr (assq 'coding-priority (cdr langenv))))))))
+      (plist-put
+       (plist-put (alist-to-plist (cdr langenv)) 'native-coding-system
+                  coding-system)
+       'coding-system (cons coding-system
+                            (cdr (assoc 'coding-system (cdr langenv)))))
+      'coding-priority (cons coding-system
+                             (cdr (assq 'coding-priority (cdr langenv)))))
+     ;; The tutorial coding system is important; otherwise the tutorial file
+     ;; gets loaded in the variant coding system.
+     'tutorial-coding-system
+     (or (car-safe (cdr-safe (assoc 'tutorial-coding-system (cdr langenv))))
+         (car-safe (cdr-safe (assoc 'coding-system (cdr langenv)))))))))
 
 (defun get-language-environment-from-locale (locale)
   "Convert LOCALE into a language environment.