3 files changed, 10 insertions, 6 deletions

diff --git a/etc/NEWS b/etc/NEWS
index c993b0551ed..4177c11cab9 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1664,7 +1664,7 @@ It also contains a plain-text table editor with spreadsheet-like
 capabilities.
 
 The Org mode table editor can be integrated into any major mode by
-activating the minor Orgtbl-mode.
+activating the minor mode, Orgtbl mode.
 
 The documentation for org-mode is in a separate manual; within Emacs,
 type "C-h i m org RET" to read that manual.  A reference card is
diff --git a/src/ChangeLog b/src/ChangeLog
index 7dabc396407..db46c3e039f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2007-09-21  Richard Stallman  <rms@gnu.org>
+
+        * image.c (our_memory_buffer): Renamed from omfib_buffer.
+
 2007-09-21  Juanma Barranquero  <lekktu@gmail.com>
 
         * w32term.c (x_draw_glyph_string): Use strike_through_color, not
diff --git a/src/fringe.c b/src/fringe.c
index d9159ae3de5..62767b39118 100644
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -1328,11 +1328,11 @@ If BITMAP overrides a standard fringe bitmap, the original bitmap is restored.
 */
 
 #if defined (HAVE_X_WINDOWS)
-static unsigned char swap_nibble[16] = {
-  0x0, 0x8, 0x4, 0xc,           /* 0000 1000 0100 1100 */
-  0x2, 0xa, 0x6, 0xe,           /* 0010 1010 0110 1110 */
-  0x1, 0x9, 0x5, 0xd,           /* 0001 1001 0101 1101 */
-  0x3, 0xb, 0x7, 0xf};          /* 0011 1011 0111 1111 */
+static unsigned char swap_nibble[16]
+  = { 0x0, 0x8, 0x4, 0xc,    /* 0000 1000 0100 1100 */
+      0x2, 0xa, 0x6, 0xe,    /* 0010 1010 0110 1110 */
+      0x1, 0x9, 0x5, 0xd,    /* 0001 1001 0101 1101 */
+      0x3, 0xb, 0x7, 0xf };  /* 0011 1011 0111 1111 */
 #endif                          /* HAVE_X_WINDOWS */
 
 void