2 files changed, 10 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index c87aeb182ee..ccd678ff8bf 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-25  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * fringe.c (init_fringe_bitmap) [HAVE_X_WINDOWS && WORDS_BIG_ENDIAN]:
+        Swap bytes in short integer if fringe bitmap width > 8.
+
 2009-04-23  Kenichi Handa  <handa@m17n.org>
 
         * xfaces.c (Fx_list_fonts): If a font size is specified in
diff --git a/src/fringe.c b/src/fringe.c
index 9b592414532..41fc24d1150 100644
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -1369,7 +1369,11 @@ init_fringe_bitmap (which, fb, once_p)
                                    | (swap_nibble[(b>>4) & 0xf] << 8)
                                    | (swap_nibble[(b>>8) & 0xf] << 4)
                                    | (swap_nibble[(b>>12) & 0xf]));
-              *bits++ = (b >> (16 - fb->width));
+              b >>= (16 - fb->width);
+#ifdef WORDS_BIG_ENDIAN
+              b = ((b >> 8) | (b << 8));
+#endif
+              *bits++ = b;
             }
         }
 #endif /* HAVE_X_WINDOWS */