CVS update by scop packages/mule-packages/locale/start-files/ja ...

[xemacs-cvs at xemacs.org]

  User: scop    
  Date: 07/05/09 20:38:45

  Modified:    packages/mule-packages/locale/start-files/ja locale-start.el
Log:
Don't try to load un-define with XEmacs >= 21.5 <200705081924.07173.scop at xemacs.org>

Revision  Changes    Path
1.29      +5 -0      XEmacs/packages/mule-packages/locale/ChangeLog

Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/mule-packages/locale/ChangeLog,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- ChangeLog	2006/11/17 11:39:08	1.28
+++ ChangeLog	2007/05/09 18:38:41	1.29
@@ -1,3 +1,8 @@
+2007-05-08  Ville Skyttä  <scop at xemacs.org>
+
+	* start-files/ja/locale-start.el (command-line-do-help):
+	Don't try to load `un-define' with XEmacs >= 21.5.
+
 2006-11-17  Norbert Koch  <viteno at xemacs.org>
 
 	* Makefile (VERSION): XEmacs package 1.24 released.



1.5       +1 -1      XEmacs/packages/mule-packages/locale/start-files/ja/locale-start.el

Index: locale-start.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/mule-packages/locale/start-files/ja/locale-start.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- locale-start.el	2004/12/07 01:58:44	1.4
+++ locale-start.el	2007/05/09 18:38:45	1.5
@@ -160,7 +160,7 @@ Copyright (C) 1995-2004 Ben Wing.")
   "Print the XEmacs usage message and exit."
   (let ((charmap (shell-command-to-string "locale charmap")))
     (cond ((string-match "UTF-8" charmap)
-	   (require 'un-define)
+	   (or (emacs-version>= 21 5) (require 'un-define))
 	   (set-terminal-coding-system 'utf-8))
 	  ((string-match "EUC-JP" charmap)
 	   (set-terminal-coding-system 'euc-jp))