APPROVE COMMIT
NOTE: This patch has been committed.
lisp/ChangeLog addition:
2007-11-28 Aidan Kehoe <kehoea(a)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.
XEmacs Trunk source patch:
Diff command: cvs -q diff -Nu
Files affected: lisp/mule/mule-cmds.el
===================================================================
RCS
Index: lisp/mule/mule-cmds.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/mule/mule-cmds.el,v
retrieving revision 1.35
diff -u -u -r1.35 mule-cmds.el
--- lisp/mule/mule-cmds.el 2007/08/26 20:00:42 1.35
+++ lisp/mule/mule-cmds.el 2007/11/28 21:16:36
@@ -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.
--
¿Dónde estará ahora mi sobrino Yoghurtu Nghé, que tuvo que huir
precipitadamente de la aldea por culpa de la escasez de rinocerontes?
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches