Index: lang/perl/Encode/trunk/ucm/cp860.ucm
===================================================================
--- lang/perl/Encode/trunk/ucm/cp860.ucm (revision 11260)
+++ lang/perl/Encode/trunk/ucm/cp860.ucm (revision 15030)
@@ -1,4 +1,4 @@
 #
-# $Id: cp860.ucm,v 1.1 2008/05/07 20:56:05 dankogai Exp dankogai $
+# $Id: cp860.ucm,v 1.1 2008/05/07 20:56:05 dankogai Exp $
 #
 # Original table can be obtained at
Index: lang/perl/Encode/trunk/ucm/cp861.ucm
===================================================================
--- lang/perl/Encode/trunk/ucm/cp861.ucm (revision 11260)
+++ lang/perl/Encode/trunk/ucm/cp861.ucm (revision 15030)
@@ -1,4 +1,4 @@
 #
-# $Id: cp861.ucm,v 1.1 2008/05/07 20:56:05 dankogai Exp dankogai $
+# $Id: cp861.ucm,v 1.1 2008/05/07 20:56:05 dankogai Exp $
 #
 # Original table can be obtained at
Index: lang/perl/Encode/trunk/ucm/cp862.ucm
===================================================================
--- lang/perl/Encode/trunk/ucm/cp862.ucm (revision 11260)
+++ lang/perl/Encode/trunk/ucm/cp862.ucm (revision 15030)
@@ -1,4 +1,4 @@
 #
-# $Id: cp862.ucm,v 1.1 2008/05/07 20:56:05 dankogai Exp dankogai $
+# $Id: cp862.ucm,v 1.1 2008/05/07 20:56:05 dankogai Exp $
 #
 # Original table can be obtained at
Index: lang/perl/Encode/trunk/ucm/cp863.ucm
===================================================================
--- lang/perl/Encode/trunk/ucm/cp863.ucm (revision 11260)
+++ lang/perl/Encode/trunk/ucm/cp863.ucm (revision 15030)
@@ -1,4 +1,4 @@
 #
-# $Id: cp863.ucm,v 1.1 2008/05/07 20:56:05 dankogai Exp dankogai $
+# $Id: cp863.ucm,v 1.1 2008/05/07 20:56:05 dankogai Exp $
 #
 # Original table can be obtained at
Index: lang/perl/Encode/trunk/ucm/cp864.ucm
===================================================================
--- lang/perl/Encode/trunk/ucm/cp864.ucm (revision 11260)
+++ lang/perl/Encode/trunk/ucm/cp864.ucm (revision 15030)
@@ -1,4 +1,4 @@
 #
-# $Id: cp864.ucm,v 1.1 2008/05/07 20:56:05 dankogai Exp dankogai $
+# $Id: cp864.ucm,v 1.1 2008/05/07 20:56:05 dankogai Exp $
 #
 # Original table can be obtained at
Index: lang/perl/Encode/trunk/ucm/cp865.ucm
===================================================================
--- lang/perl/Encode/trunk/ucm/cp865.ucm (revision 11260)
+++ lang/perl/Encode/trunk/ucm/cp865.ucm (revision 15030)
@@ -1,4 +1,4 @@
 #
-# $Id: cp865.ucm,v 1.1 2008/05/07 20:56:05 dankogai Exp dankogai $
+# $Id: cp865.ucm,v 1.1 2008/05/07 20:56:05 dankogai Exp $
 #
 # Original table can be obtained at
Index: lang/perl/Encode/trunk/ucm/cp866.ucm
===================================================================
--- lang/perl/Encode/trunk/ucm/cp866.ucm (revision 11260)
+++ lang/perl/Encode/trunk/ucm/cp866.ucm (revision 15030)
@@ -1,4 +1,4 @@
 #
-# $Id: cp866.ucm,v 1.1 2008/05/07 20:56:05 dankogai Exp dankogai $
+# $Id: cp866.ucm,v 1.1 2008/05/07 20:56:05 dankogai Exp $
 #
 # Original table can be obtained at
Index: lang/perl/Encode/trunk/ucm/cp869.ucm
===================================================================
--- lang/perl/Encode/trunk/ucm/cp869.ucm (revision 11260)
+++ lang/perl/Encode/trunk/ucm/cp869.ucm (revision 15030)
@@ -1,4 +1,4 @@
 #
-# $Id: cp869.ucm,v 1.1 2008/05/07 20:56:05 dankogai Exp dankogai $
+# $Id: cp869.ucm,v 1.1 2008/05/07 20:56:05 dankogai Exp $
 #
 # Original table can be obtained at
Index: lang/perl/Encode/trunk/ucm/cp874.ucm
===================================================================
--- lang/perl/Encode/trunk/ucm/cp874.ucm (revision 11260)
+++ lang/perl/Encode/trunk/ucm/cp874.ucm (revision 15030)
@@ -1,4 +1,4 @@
 #
-# $Id: cp874.ucm,v 1.1 2008/05/07 20:56:05 dankogai Exp dankogai $
+# $Id: cp874.ucm,v 1.1 2008/05/07 20:56:05 dankogai Exp $
 #
 # Original table can be obtained at
Index: lang/perl/Encode/trunk/ucm/cp875.ucm
===================================================================
--- lang/perl/Encode/trunk/ucm/cp875.ucm (revision 11260)
+++ lang/perl/Encode/trunk/ucm/cp875.ucm (revision 15030)
@@ -1,4 +1,4 @@
 #
-# $Id: cp875.ucm,v 1.1 2008/05/07 20:56:05 dankogai Exp dankogai $
+# $Id: cp875.ucm,v 1.1 2008/05/07 20:56:05 dankogai Exp $
 #
 # Original table can be obtained at
Index: lang/perl/Encode/trunk/ucm/cp850.ucm
===================================================================
--- lang/perl/Encode/trunk/ucm/cp850.ucm (revision 11260)
+++ lang/perl/Encode/trunk/ucm/cp850.ucm (revision 15030)
@@ -1,4 +1,4 @@
 #
-# $Id: cp850.ucm,v 1.1 2008/05/07 20:56:05 dankogai Exp dankogai $
+# $Id: cp850.ucm,v 1.1 2008/05/07 20:56:05 dankogai Exp $
 #
 # Original table can be obtained at
Index: lang/perl/Encode/trunk/ucm/cp852.ucm
===================================================================
--- lang/perl/Encode/trunk/ucm/cp852.ucm (revision 11260)
+++ lang/perl/Encode/trunk/ucm/cp852.ucm (revision 15030)
@@ -1,4 +1,4 @@
 #
-# $Id: cp852.ucm,v 1.1 2008/05/07 20:56:05 dankogai Exp dankogai $
+# $Id: cp852.ucm,v 1.1 2008/05/07 20:56:05 dankogai Exp $
 #
 # Original table can be obtained at
Index: lang/perl/Encode/trunk/ucm/cp855.ucm
===================================================================
--- lang/perl/Encode/trunk/ucm/cp855.ucm (revision 11260)
+++ lang/perl/Encode/trunk/ucm/cp855.ucm (revision 15030)
@@ -1,4 +1,4 @@
 #
-# $Id: cp855.ucm,v 1.1 2008/05/07 20:56:05 dankogai Exp dankogai $
+# $Id: cp855.ucm,v 1.1 2008/05/07 20:56:05 dankogai Exp $
 #
 # Original table can be obtained at
Index: lang/perl/Encode/trunk/ucm/cp856.ucm
===================================================================
--- lang/perl/Encode/trunk/ucm/cp856.ucm (revision 11260)
+++ lang/perl/Encode/trunk/ucm/cp856.ucm (revision 15030)
@@ -1,4 +1,4 @@
 #
-# $Id: cp856.ucm,v 1.1 2008/05/07 20:56:05 dankogai Exp dankogai $
+# $Id: cp856.ucm,v 1.1 2008/05/07 20:56:05 dankogai Exp $
 #
 # Original table can be obtained at
Index: lang/perl/Encode/trunk/ucm/cp857.ucm
===================================================================
--- lang/perl/Encode/trunk/ucm/cp857.ucm (revision 11260)
+++ lang/perl/Encode/trunk/ucm/cp857.ucm (revision 15030)
@@ -1,4 +1,4 @@
 #
-# $Id: cp857.ucm,v 1.1 2008/05/07 20:56:05 dankogai Exp dankogai $
+# $Id: cp857.ucm,v 1.1 2008/05/07 20:56:05 dankogai Exp $
 #
 # Original table can be obtained at
Index: lang/perl/Encode/trunk/ucm/cp858.ucm
===================================================================
--- lang/perl/Encode/trunk/ucm/cp858.ucm (revision 11260)
+++ lang/perl/Encode/trunk/ucm/cp858.ucm (revision 15030)
@@ -1,4 +1,4 @@
 #
-# $Id: cp858.ucm,v 1.1 2008/05/07 20:56:05 dankogai Exp dankogai $
+# $Id: cp858.ucm,v 1.1 2008/05/07 20:56:05 dankogai Exp $
 #
 # cf. http://en.wikipedia.org/wiki/Code_page_858
Index: lang/perl/Encode/trunk/Makefile.PL
===================================================================
--- lang/perl/Encode/trunk/Makefile.PL (revision 11260)
+++ lang/perl/Encode/trunk/Makefile.PL (revision 15030)
@@ -1,4 +1,4 @@
 #
-# $Id: Makefile.PL,v 2.6 2008/05/07 20:56:05 dankogai Exp dankogai $
+# $Id: Makefile.PL,v 2.7 2008/07/01 20:56:17 dankogai Exp dankogai $
 #
 use 5.007003;
@@ -6,4 +6,5 @@
 use warnings;
 use ExtUtils::MakeMaker;
+use File::Spec;
 
 # Just for sure :)
@@ -35,18 +36,18 @@
 
 WriteMakefile(
-          NAME		=> "Encode",
-          EXE_FILES         => \@exe_files,
-          VERSION_FROM	=> 'Encode.pm',
-          OBJECT		=> '$(O_FILES)',
-          'dist'		=> {
-          COMPRESS	=> 'gzip -9f',
-          SUFFIX	=> 'gz',
-          DIST_DEFAULT => 'all tardist',
-          },
-	  @man,
-          INC       => "-I./Encode",
-          PMLIBDIRS => \@pmlibdirs,
-          INSTALLDIRS => 'perl',
-          );
+    NAME         => "Encode",
+    EXE_FILES    => \@exe_files,
+    VERSION_FROM => 'Encode.pm',
+    OBJECT       => '$(O_FILES)',
+    'dist'       => {
+        COMPRESS     => 'gzip -9f',
+        SUFFIX       => 'gz',
+        DIST_DEFAULT => 'all tardist',
+    },
+    @man,
+    INC         => '-I' . File::Spec->catfile( '.', 'Encode' ),
+    PMLIBDIRS   => \@pmlibdirs,
+    INSTALLDIRS => 'perl',
+);
 
 package MY;
Index: lang/perl/Encode/trunk/t/Aliases.t
===================================================================
--- lang/perl/Encode/trunk/t/Aliases.t (revision 1747)
+++ lang/perl/Encode/trunk/t/Aliases.t (revision 15030)
@@ -53,4 +53,5 @@
         'WinBaltic'     => 'cp1257',
         'WinVietnamese' => 'cp1258',
+	'Macintosh'     => 'MacRoman',
         'koi8r'         => 'koi8-r',
         'koi8u'         => 'koi8-u',
Index: lang/perl/Encode/trunk/lib/Encode/GSM0338.pm
===================================================================
--- lang/perl/Encode/trunk/lib/Encode/GSM0338.pm (revision 11260)
+++ lang/perl/Encode/trunk/lib/Encode/GSM0338.pm (revision 15030)
@@ -1,4 +1,4 @@
 #
-# $Id: GSM0338.pm,v 2.1 2008/05/07 20:56:05 dankogai Exp dankogai $
+# $Id: GSM0338.pm,v 2.1 2008/05/07 20:56:05 dankogai Exp $
 #
 package Encode::GSM0338;
Index: lang/perl/Encode/trunk/lib/Encode/Alias.pm
===================================================================
--- lang/perl/Encode/trunk/lib/Encode/Alias.pm (revision 11260)
+++ lang/perl/Encode/trunk/lib/Encode/Alias.pm (revision 15030)
@@ -3,5 +3,5 @@
 use warnings;
 no warnings 'redefine';
-our $VERSION = do { my @r = ( q$Revision: 2.9 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r };
+our $VERSION = do { my @r = ( q$Revision: 2.10 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r };
 sub DEBUG () { 0 }
 
@@ -208,4 +208,6 @@
     # define_alias( qr/\bmacIcelandic$/i => '"macIceland"');
     define_alias( qr/^mac_(.*)$/i => '"mac$1"' );
+    # http://rt.cpan.org/Ticket/Display.html?id=36326
+    define_alias( qr/^macintosh$/i => '"MacRoman"' );
 
     # Ououououou. gone.  They are differente!
Index: lang/perl/Encode/trunk/lib/Encode/JP/JIS7.pm
===================================================================
--- lang/perl/Encode/trunk/lib/Encode/JP/JIS7.pm (revision 1747)
+++ lang/perl/Encode/trunk/lib/Encode/JP/JIS7.pm (revision 15030)
@@ -2,5 +2,5 @@
 use strict;
 use warnings;
-our $VERSION = do { my @r = ( q$Revision: 2.3 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r };
+our $VERSION = do { my @r = ( q$Revision: 2.4 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r };
 
 use Encode qw(:fallbacks);
@@ -131,4 +131,5 @@
 sub euc_jis {
     no warnings qw(uninitialized);
+    local ${^ENCODING};
     my $r_str   = shift;
     my $jis0212 = shift;
Index: lang/perl/Encode/trunk/Encode.pm
===================================================================
--- lang/perl/Encode/trunk/Encode.pm (revision 11260)
+++ lang/perl/Encode/trunk/Encode.pm (revision 15030)
@@ -1,9 +1,9 @@
 #
-# $Id: Encode.pm,v 2.25 2008/05/07 20:56:05 dankogai Exp dankogai $
+# $Id: Encode.pm,v 2.26 2008/07/01 20:56:17 dankogai Exp dankogai $
 #
 package Encode;
 use strict;
 use warnings;
-our $VERSION = sprintf "%d.%02d", q$Revision: 2.25 $ =~ /(\d+)/g;
+our $VERSION = sprintf "%d.%02d", q$Revision: 2.26 $ =~ /(\d+)/g;
 sub DEBUG () { 0 }
 use XSLoader ();
@@ -52,5 +52,12 @@
 our %ExtModule;
 require Encode::Config;
-eval { require Encode::ConfigLocal };
+#  See
+#  https://bugzilla.redhat.com/show_bug.cgi?id=435505#c2
+#  to find why sig handers inside eval{} are disabled.
+eval {
+    local $SIG{__DIE__};
+    local $SIG{__WARN__};
+    require Encode::ConfigLocal;
+};
 
 sub encodings {
Index: lang/perl/Encode/trunk/Changes
===================================================================
--- lang/perl/Encode/trunk/Changes (revision 11377)
+++ lang/perl/Encode/trunk/Changes (revision 15030)
@@ -1,7 +1,26 @@
 # Revision history for Perl extension Encode.
 #
-# $Id: Changes,v 2.25 2008/05/07 20:56:05 dankogai Exp dankogai $
+# $Id: Changes,v 2.26 2008/07/01 20:56:17 dankogai Exp dankogai $
 #
-$Revision: 2.25 $ $Date: 2008/05/07 20:56:05 $
+$Revision: 2.26 $ $Date: 2008/07/01 20:56:17 $
+! Encode.pm
+  Absense of Encode::ConfigLocal no longer carps no matter what.
+  https://bugzilla.redhat.com/show_bug.cgi?id=435505#c2
+  https://rt.cpan.org/Ticket/Display.html?id=28638
+  https://rt.cpan.org/Ticket/Display.html?id=11511
+! lib/Encode/JIS7.pm
+  use encoding 'utf8' and 'iso-2022-jp' glitches on perl 5.10
+  Thanks, MIYAGAWA
+  Message-Id: <693254b90807011224h3ab50d76v50c6fea87baf223c@mail.gmail.com>
+! lib/Encode/Alias.pm t/Aliases.t
+  macintosh' not recognize as MacRoman
+  http://rt.cpan.org/Ticket/Display.html?id=36326
+! Makefile.PL
+  s{INC => "-I./Encode"}
+   {INC         => '-I' . File::Spec->catfile( '.', 'Encode' )}
+  To prevent some platforms from forgetting to include Encode/encode.h.  
+  http://rt.cpan.org/Ticket/Display.html?id=36348
+
+2.25 2008/05/07 20:56:05
 ! Encode.pm
   added ':default' to Exporter option.