Merge changes from emacs-23 branch

8 files changed, 92 insertions, 26 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 8c98b52e6aa..b1d67c9c31f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,39 @@
+2010-11-27  Kenichi Handa  <handa@m17n.org>
+
+        * charset.c (emacs_mule_charset): Make it an array of charset ID;
+        i.e. integer.
+        (Fdefine_charset_internal): Adjusted for the above change.
+        (init_charset_once): Likewise.
+
+        * charset.h (emacs_mule_charset): Adjust the prototype.  Delete
+        duplicated extern.
+
+        * coding.c (emacs_mule_char): Adjust for the change of
+        emacs_mule_charset.
+
+        * lread.c (read_emacs_mule_char): Adjust for the change of
+        emacs_mule_charset.
+
+2010-11-27  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32.c (_PROCESS_MEMORY_COUNTERS_EX): Don't define with versions
+        of w32api >= 3.15.  (Bug#6989)  (Bug#7452)
+
+2010-11-27  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * alloc.c (mark_terminals): Ensure that the image cache is marked
+        even if the terminal object was marked earlier (Bug#6301).
+
+2010-11-21  Chong Yidong  <cyd@stupidchicken.com>
+
+        * editfns.c (Fbyte_to_string): Signal an error arg is not a byte.
+
+2010-11-27  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * gtkutil.c (menubar_map_cb): New function (Bug#7425).
+        (xg_update_frame_menubar): Connect signal map to menubar_map_cb.
+        Use 23 as menubar height if 0. (Bug#7425).
+
 2010-11-26  Eli Zaretskii  <eliz@gnu.org>
 
         * xdisp.c (set_message_1): Force paragraph direction in echo area
diff --git a/src/alloc.c b/src/alloc.c
index 28636ec776c..a1c78a408d9 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -5643,13 +5643,14 @@ mark_terminals (void)
   for (t = terminal_list; t; t = t->next_terminal)
     {
       eassert (t->name != NULL);
-      if (!VECTOR_MARKED_P (t))
-        {
 #ifdef HAVE_WINDOW_SYSTEM
-          mark_image_cache (t->image_cache);
+      /* If a terminal object is reachable from a stacpro'ed object,
+         it might have been marked already.  Make sure the image cache
+         gets marked.  */
+      mark_image_cache (t->image_cache);
 #endif /* HAVE_WINDOW_SYSTEM */
-          mark_vectorlike ((struct Lisp_Vector *)t);
-        }
+      if (!VECTOR_MARKED_P (t))
+        mark_vectorlike ((struct Lisp_Vector *)t);
     }
 }
 
diff --git a/src/charset.c b/src/charset.c
index 0ab776b6914..39a376a947f 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -114,7 +114,7 @@ Lisp_Object Viso_2022_charset_list;
 /* List of emacs-mule charsets.  */
 Lisp_Object Vemacs_mule_charset_list;
 
-struct charset *emacs_mule_charset[256];
+int emacs_mule_charset[256];
 
 /* Mapping table from ISO2022's charset (specified by DIMENSION,
    CHARS, and FINAL-CHAR) to Emacs' charset.  */
@@ -1210,7 +1210,7 @@ usage: (define-charset-internal ...)  */)
 
   if (charset.emacs_mule_id >= 0)
     {
-      emacs_mule_charset[charset.emacs_mule_id] = CHARSET_FROM_ID (id);
+      emacs_mule_charset[charset.emacs_mule_id] = id;
       if (charset.emacs_mule_id < 0xA0)
         emacs_mule_bytes[charset.emacs_mule_id] = charset.dimension + 1;
       else
@@ -2330,7 +2330,7 @@ init_charset_once (void)
         iso_charset_table[i][j][k] = -1;
 
   for (i = 0; i < 256; i++)
-    emacs_mule_charset[i] = NULL;
+    emacs_mule_charset[i] = -1;
 
   charset_jisx0201_roman = -1;
   charset_jisx0208_1978 = -1;
diff --git a/src/charset.h b/src/charset.h
index dbe9c776a0d..6e6422f3c73 100644
--- a/src/charset.h
+++ b/src/charset.h
@@ -255,7 +255,7 @@ extern Lisp_Object Vcharset_list;
 extern Lisp_Object Viso_2022_charset_list;
 extern Lisp_Object Vemacs_mule_charset_list;
 
-extern struct charset *emacs_mule_charset[256];
+extern int emacs_mule_charset[256];
 
 extern Lisp_Object Vcurrent_iso639_language;
 
diff --git a/src/coding.c b/src/coding.c
index c834f76a65e..a7b7c7d6b23 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -2053,7 +2053,7 @@ emacs_mule_char (struct coding_system *coding, const unsigned char *src,
   const unsigned char *src_end = coding->source + coding->src_bytes;
   const unsigned char *src_base = src;
   int multibytep = coding->src_multibyte;
-  struct charset *charset;
+  int charset_id;
   unsigned code;
   int c;
   int consumed_chars = 0;
@@ -2063,7 +2063,7 @@ emacs_mule_char (struct coding_system *coding, const unsigned char *src,
   if (c < 0)
     {
       c = -c;
-      charset = emacs_mule_charset[0];
+      charset_id = emacs_mule_charset[0];
     }
   else
     {
@@ -2099,7 +2099,7 @@ emacs_mule_char (struct coding_system *coding, const unsigned char *src,
       switch (emacs_mule_bytes[c])
         {
         case 2:
-          if (! (charset = emacs_mule_charset[c]))
+          if ((charset_id = emacs_mule_charset[c]) < 0)
             goto invalid_code;
           ONE_MORE_BYTE (c);
           if (c < 0xA0)
@@ -2112,7 +2112,7 @@ emacs_mule_char (struct coding_system *coding, const unsigned char *src,
               || c == EMACS_MULE_LEADING_CODE_PRIVATE_12)
             {
               ONE_MORE_BYTE (c);
-              if (c < 0xA0 || ! (charset = emacs_mule_charset[c]))
+              if (c < 0xA0 || (charset_id = emacs_mule_charset[c]) < 0)
                 goto invalid_code;
               ONE_MORE_BYTE (c);
               if (c < 0xA0)
@@ -2121,7 +2121,7 @@ emacs_mule_char (struct coding_system *coding, const unsigned char *src,
             }
           else
             {
-              if (! (charset = emacs_mule_charset[c]))
+              if ((charset_id = emacs_mule_charset[c]) < 0)
                 goto invalid_code;
               ONE_MORE_BYTE (c);
               if (c < 0xA0)
@@ -2136,7 +2136,7 @@ emacs_mule_char (struct coding_system *coding, const unsigned char *src,
 
         case 4:
           ONE_MORE_BYTE (c);
-          if (c < 0 || ! (charset = emacs_mule_charset[c]))
+          if (c < 0 || (charset_id = emacs_mule_charset[c]) < 0)
             goto invalid_code;
           ONE_MORE_BYTE (c);
           if (c < 0xA0)
@@ -2150,21 +2150,21 @@ emacs_mule_char (struct coding_system *coding, const unsigned char *src,
 
         case 1:
           code = c;
-          charset = CHARSET_FROM_ID (ASCII_BYTE_P (code)
-                                     ? charset_ascii : charset_eight_bit);
+          charset_id = ASCII_BYTE_P (code) ? charset_ascii : charset_eight_bit;
           break;
 
         default:
           abort ();
         }
-      CODING_DECODE_CHAR (coding, src, src_base, src_end, charset, code, c);
+      CODING_DECODE_CHAR (coding, src, src_base, src_end,
+                          CHARSET_FROM_ID (charset_id), code, c);
       if (c < 0)
         goto invalid_code;
     }
   *nbytes = src - src_base;
   *nchars = consumed_chars;
   if (id)
-    *id = charset->id;
+    *id = charset_id;
   return (mseq_found ? -c : c);
 
  no_more_source:
diff --git a/src/editfns.c b/src/editfns.c
index f76beb5e678..4a9e2314a84 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -218,11 +218,13 @@ usage: (char-to-string CHAR)  */)
 }
 
 DEFUN ("byte-to-string", Fbyte_to_string, Sbyte_to_string, 1, 1, 0,
-       doc: /* Convert arg BYTE to a string containing that byte.  */)
+       doc: /* Convert arg BYTE to a unibyte string containing that byte.  */)
   (Lisp_Object byte)
 {
   unsigned char b;
   CHECK_NUMBER (byte);
+  if (XINT (byte) < 0 || XINT (byte) > 255)
+    error ("Invalid byte");
   b = XINT (byte);
   return make_string_from_bytes (&b, 1, 1);
 }
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 89b16a10fbc..b091df19905 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -3074,6 +3074,23 @@ xg_modify_menubar_widgets (GtkWidget *menubar, FRAME_PTR f, widget_value *val,
   gtk_widget_show_all (menubar);
 }
 
+/* Callback called when the menu bar W is mapped.
+   Used to find the height of the menu bar if we didn't get it
+   after showing the widget.  */
+
+static void
+menubar_map_cb (GtkWidget *w, gpointer user_data)
+{
+  GtkRequisition req;
+  FRAME_PTR f = (FRAME_PTR) user_data;
+  gtk_widget_size_request (w, &req);
+  if (FRAME_MENUBAR_HEIGHT (f) != req.height) 
+    {
+      FRAME_MENUBAR_HEIGHT (f) = req.height;
+      xg_height_changed (f);
+    }
+}
+
 /* Recompute all the widgets of frame F, when the menu bar has been
    changed.  Value is non-zero if widgets were updated.  */
 
@@ -3095,10 +3112,20 @@ xg_update_frame_menubar (FRAME_PTR f)
                       FALSE, FALSE, 0);
   gtk_box_reorder_child (GTK_BOX (x->vbox_widget), x->menubar_widget, 0);
 
+  g_signal_connect (x->menubar_widget, "map", G_CALLBACK (menubar_map_cb), f);
   gtk_widget_show_all (x->menubar_widget);
   gtk_widget_size_request (x->menubar_widget, &req);
-  FRAME_MENUBAR_HEIGHT (f) = req.height;
-  xg_height_or_width_changed (f);
+
+  /* If menu bar doesn't know its height yet, cheat a little so the frame
+     doesn't jump so much when resized later in menubar_map_cb.  */
+  if (req.height == 0)
+    req.height = 23;
+
+  if (FRAME_MENUBAR_HEIGHT (f) != req.height)
+    {
+      FRAME_MENUBAR_HEIGHT (f) = req.height;
+      xg_height_or_width_changed (f);
+    }
   UNBLOCK_INPUT;
 
   return 1;
diff --git a/src/lread.c b/src/lread.c
index 18d4ba8360e..bfe3755cc51 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -582,7 +582,7 @@ read_emacs_mule_char (int c, int (*readbyte) (int, Lisp_Object), Lisp_Object rea
 
   if (len == 2)
     {
-      charset = emacs_mule_charset[buf[0]];
+      charset = CHARSET_FROM_ID (emacs_mule_charset[buf[0]]);
       code = buf[1] & 0x7F;
     }
   else if (len == 3)
@@ -590,18 +590,18 @@ read_emacs_mule_char (int c, int (*readbyte) (int, Lisp_Object), Lisp_Object rea
       if (buf[0] == EMACS_MULE_LEADING_CODE_PRIVATE_11
           || buf[0] == EMACS_MULE_LEADING_CODE_PRIVATE_12)
         {
-          charset = emacs_mule_charset[buf[1]];
+          charset = CHARSET_FROM_ID (emacs_mule_charset[buf[1]]);
           code = buf[2] & 0x7F;
         }
       else
         {
-          charset = emacs_mule_charset[buf[0]];
+          charset = CHARSET_FROM_ID (emacs_mule_charset[buf[0]]);
           code = ((buf[1] << 8) | buf[2]) & 0x7F7F;
         }
     }
   else
     {
-      charset = emacs_mule_charset[buf[1]];
+      charset = CHARSET_FROM_ID (emacs_mule_charset[buf[1]]);
       code = ((buf[2] << 8) | buf[3]) & 0x7F7F;
     }
   c = DECODE_CHAR (charset, code);