CVS update by aidan xemacs/lisp/mule ...

[xemacs-cvs at xemacs.org]

  User: aidan   
  Date: 07/11/28 22:17:57

  Modified:    xemacs/lisp/mule mule-cmds.el
Log:
When creating variant language environments, specify
tutorial-coding-system.

Revision  Changes    Path
1.864     +6 -0      XEmacs/xemacs/lisp/ChangeLog

Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/ChangeLog,v
retrieving revision 1.863
retrieving revision 1.864
diff -u -p -r1.863 -r1.864
--- ChangeLog	2007/11/27 22:15:32	1.863
+++ ChangeLog	2007/11/28 21:17:45	1.864
@@ -1,3 +1,9 @@
+2007-11-28  Aidan Kehoe  <kehoea at 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 at parhasard.net>
 
 	* bytecomp.el (byte-compile-file-form-custom-declare-variable):



1.36      +12 -7     XEmacs/xemacs/lisp/mule/mule-cmds.el

Index: mule-cmds.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/mule/mule-cmds.el,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- mule-cmds.el	2007/08/26 20:00:42	1.35
+++ mule-cmds.el	2007/11/28 21:17:55	1.36
@@ -1099,13 +1099,18 @@ environment.  "
    (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.