Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 726-750)

   - Update from CVS
   - Merge from emacs--rel--22
   - Merge from gnus--rel--5.10

 * emacs--rel--22  (patch 6-17)

   - Update from CVS
   - Update from CVS: src/xterm.c (XTread_socket): Revert last change.

 * gnus--rel--5.10  (patch 218-221)

   - Merge from emacs--devo--0, emacs--rel--22
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-205

4 files changed, 49 insertions, 8 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 742bfc38249..d8d0894e2ca 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,30 @@
+2007-05-14  Chong Yidong  <cyd@stupidchicken.com>
+
+        * image.c (pbm_load): Check image size for monochrome pbm.
+
+2007-05-13  Chong Yidong  <cyd@stupidchicken.com>
+
+        * xterm.c (XTread_socket): Revert last change.
+
+2007-05-12  Chong Yidong  <cyd@stupidchicken.com>
+
+        * image.c (pbm_load): Correctly check image size for greyscale pbm.
+
+        * xterm.c (XTread_socket): Yet Another Uncaught X Error Crash (YAUXEC).
+
+2007-05-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * editfns.c (Ftranspose_regions): Yet another int/Lisp_Object mixup (YAILOM)
+
+2007-05-07  Andreas Schwab  <schwab@suse.de>
+
+        * keymap.c (Flookup_key): Fix typo in last change. 
+
+2007-05-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * keymap.c (Fdefine_key, Flookup_key): Only do the 0x80->meta_modifier
+        mapping for unibyte strings.
+
 2007-05-01  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
         * macmenu.c (mac_dialog_show): Apply 2007-04-27 change for xmenu.c.
@@ -62,8 +89,8 @@
 
 2007-04-16  Chong Yidong  <cyd@stupidchicken.com>
 
-        * dispnew.c (adjust_frame_glyphs_for_frame_redisplay): Set
-        garbaged flag in presence of window margins.
+        * dispnew.c (adjust_frame_glyphs_for_frame_redisplay):
+        Set garbaged flag in presence of window margins.
         (showing_window_margins_p): New function.
 
         * xdisp.c (cursor_row_p): Only end row on newline if it's a
diff --git a/src/editfns.c b/src/editfns.c
index 2e7e4ca235b..6cdd63f2fd1 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -4537,8 +4537,7 @@ Transposing beyond buffer boundaries is an error.  */)
       fix_start_end_in_overlays (start1, end2);
     }
 
-  signal_after_change (XINT (start1), XINT (end2 - start1),
-                       XINT (end2 - start1));
+  signal_after_change (start1, end2 - start1, end2 - start1);
   return Qnil;
 }
 
diff --git a/src/image.c b/src/image.c
index b8317b1e982..12b27fe359f 100644
--- a/src/image.c
+++ b/src/image.c
@@ -5730,7 +5730,17 @@ pbm_load (f, img)
             if (raw_p)
               {
                 if ((x & 7) == 0)
-                  c = *p++;
+                  {
+                    if (p >= end)
+                      {
+                        x_destroy_x_image (ximg);
+                        x_clear_image (f, img);
+                        image_error ("Invalid image size in image `%s'",
+                                     img->spec, Qnil);
+                        goto error;
+                      }
+                    c = *p++;
+                  }
                 g = c & 0x80;
                 c <<= 1;
               }
@@ -5742,9 +5752,13 @@ pbm_load (f, img)
     }
   else
     {
-      if (raw_p && (p + 3 * height * width > end))
+      if (raw_p
+          && ((type == PBM_GRAY)
+              ? (p + height * width > end)
+              : (p + 3 * height * width > end)))
         {
           x_destroy_x_image (ximg);
+          x_clear_image (f, img);
           image_error ("Invalid image size in image `%s'",
                        img->spec, Qnil);
           goto error;
diff --git a/src/keymap.c b/src/keymap.c
index 4a5c53ca626..95534f9efa6 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -1179,7 +1179,8 @@ binding KEY to DEF is added at the front of KEYMAP.  */)
   if (SYMBOLP (def) && !EQ (Vdefine_key_rebound_commands, Qt))
     Vdefine_key_rebound_commands = Fcons (def, Vdefine_key_rebound_commands);
 
-  meta_bit = VECTORP (key) ? meta_modifier : 0x80;
+  meta_bit = (VECTORP (key) || STRINGP (key) && STRING_MULTIBYTE (key)
+              ? meta_modifier : 0x80);
 
   if (VECTORP (def) && ASIZE (def) > 0 && CONSP (AREF (def, 0)))
     { /* DEF is apparently an XEmacs-style keyboard macro.  */
@@ -1345,7 +1346,7 @@ recognize the default bindings, just as `read-key-sequence' does.  */)
         c = Fevent_convert_list (c);
 
       /* Turn the 8th bit of string chars into a meta modifier.  */
-      if (INTEGERP (c) && XINT (c) & 0x80 && STRINGP (key))
+      if (STRINGP (key) && XINT (c) & 0x80 && !STRING_MULTIBYTE (key))
         XSETINT (c, (XINT (c) | meta_modifier) & ~0x80);
 
       /* Allow string since binding for `menu-bar-select-buffer'