Merged from miles@gnu.org--gnu-2005 (patch 543)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-543
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-420

11 files changed, 95 insertions, 29 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 13f8c409cde..29f3929ccd8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,40 @@
+2005-09-12  Kim F. Storm  <storm@cua.dk>
+
+        * composite.c (compose_chars_in_text): Fix setup of `pend'.
+        Unconditionally reload `ptr' and `pend' after eval.
+
+        * xdisp.c (message3): Pass copy of lisp string to message_dolog.
+
+        * print.c (print_error_message): Pass copy of caller name to
+        message_dolog.
+
+        * fileio.c (auto_save_error): Pass copy of lisp string to message2.
+
+2005-09-12  Kenichi Handa  <handa@m17n.org>
+
+        * xdisp.c (display_mode_element): Be sure to make variables THIS
+        and LISP_STRING point into a string data of ELT.
+
+2005-09-12  Kim F. Storm  <storm@cua.dk>
+
+        * editfns.c (Ftranslate_region_internal): Reload `tt' after
+        signal_after_change that may have GC'ed.
+        (Fmessage, Fmessage_box, Fmessage_or_box): Doc fix.
+
+        * keymap.c (Fdescribe_buffer_bindings): Reload `translate'
+        after insert while runs signal_after_change.
+
+        * minibuf.c (Fminibuffer_complete_word): Move `completion_string'
+        declaration to where it is used.
+
+        * w32.c (check_windows_init_file): Fix allocation of error buffer.
+
+        * xfns.c (x_encode_text): Declare static.  Add FREEP arg.
+        (x_set_name_internal): Call x_encode_text with new FREEP arg to
+        know if xfree is needed instead of guessing.
+
+        * xterm.h (x_encode_text): Remove prototype.
+
 2005-09-11  Chris Prince  <cprince@gmail.com>  (tiny change)
 
         * w32term.c (x_bitmap_icon): Load small icons too.
diff --git a/src/composite.c b/src/composite.c
index daa6dceb3c6..02abb66e1e5 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -616,7 +616,7 @@ compose_chars_in_text (start, end, string)
       GCPRO1 (string);
       stop = end;
       ptr = SDATA (string) + string_char_to_byte (string, start);
-      pend = ptr + SBYTES (string);
+      pend = SDATA (string) + SBYTES (string);
     }
   else
     {
@@ -680,10 +680,19 @@ compose_chars_in_text (start, end, string)
                     {
                       start += XINT (val);
                       if (STRINGP (string))
-                        ptr = SDATA (string) + string_char_to_byte (string, start);
+                        {
+                          ptr = SDATA (string) + string_char_to_byte (string, start);
+                          pend = SDATA (string) + SBYTES (string);
+                        }
                       else
                         ptr = CHAR_POS_ADDR (start);
                     }
+                  else if (STRINGP (string))
+                    {
+                      start++;
+                      ptr = SDATA (string) + string_char_to_byte (string, start);
+                      pend = SDATA (string) + SBYTES (string);
+                    }
                   else
                     {
                       start++;
diff --git a/src/editfns.c b/src/editfns.c
index a05d2396448..e67e56d2efa 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -2857,6 +2857,8 @@ It returns the number of characters changed.  */)
         {
           if (tt)
             {
+              /* Reload as signal_after_change in last iteration may GC.  */
+              tt = SDATA (table);
               if (string_multibyte)
                 {
                   str = tt + string_char_to_byte (table, oc);
@@ -3118,8 +3120,9 @@ The message also goes into the `*Messages*' buffer.
 The first argument is a format control string, and the rest are data
 to be formatted under control of the string.  See `format' for details.
 
-If the first argument is nil, the function clears any existing message;
-this lets the minibuffer contents show.  See also `current-message'.
+If the first argument is nil or the empty string, the function clears
+any existing message; this lets the minibuffer contents show.  See
+also `current-message'.
 
 usage: (message STRING &rest ARGS)  */)
      (nargs, args)
@@ -3148,8 +3151,8 @@ If a dialog box is not available, use the echo area.
 The first argument is a format control string, and the rest are data
 to be formatted under control of the string.  See `format' for details.
 
-If the first argument is nil, clear any existing message; let the
-minibuffer contents show.
+If the first argument is nil or the empty string, clear any existing
+message; let the minibuffer contents show.
 
 usage: (message-box STRING &rest ARGS)  */)
      (nargs, args)
@@ -3210,8 +3213,8 @@ Otherwise, use the echo area.
 The first argument is a format control string, and the rest are data
 to be formatted under control of the string.  See `format' for details.
 
-If the first argument is nil, clear any existing message; let the
-minibuffer contents show.
+If the first argument is nil or the empty string, clear any existing
+message; let the minibuffer contents show.
 
 usage: (message-or-box STRING &rest ARGS)  */)
      (nargs, args)
diff --git a/src/fileio.c b/src/fileio.c
index 53b989f52e2..56557da6a30 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -5771,6 +5771,8 @@ auto_save_error (error)
   Lisp_Object args[3], msg;
   int i, nbytes;
   struct gcpro gcpro1;
+  char *msgbuf;
+  USE_SAFE_ALLOCA;
 
   ring_bell (XFRAME (selected_frame));
 
@@ -5780,13 +5782,15 @@ auto_save_error (error)
   msg = Fformat (3, args);
   GCPRO1 (msg);
   nbytes = SBYTES (msg);
+  SAFE_ALLOCA (msgbuf, char *, nbytes);
+  bcopy (SDATA (msg), msgbuf, nbytes);
 
   for (i = 0; i < 3; ++i)
     {
       if (i == 0)
-        message2 (SDATA (msg), nbytes, STRING_MULTIBYTE (msg));
+        message2 (msgbuf, nbytes, STRING_MULTIBYTE (msg));
       else
-        message2_nolog (SDATA (msg), nbytes, STRING_MULTIBYTE (msg));
+        message2_nolog (msgbuf, nbytes, STRING_MULTIBYTE (msg));
       Fsleep_for (make_number (1), Qnil);
     }
 
diff --git a/src/keymap.c b/src/keymap.c
index 9d67f4400c0..8fa4d91a9c7 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -743,7 +743,7 @@ usage: (map-keymap FUNCTION KEYMAP)  */)
     Fsignal (Qinvalid_function, Fcons (function, Qnil));
   if (! NILP (sort_first))
     return call3 (intern ("map-keymap-internal"), function, keymap, Qt);
-      
+
   map_keymap (keymap, map_keymap_call, function, NULL, 1);
   return Qnil;
 }
@@ -2837,6 +2837,9 @@ You type        Translation\n\
             insert (buf, bufend - buf);
 
             insert ("\n", 1);
+
+            /* Insert calls signal_after_change which may GC. */
+            translate = SDATA (Vkeyboard_translate_table);
           }
 
       insert ("\n", 1);
diff --git a/src/minibuf.c b/src/minibuf.c
index a66d0f8f5c8..34cadfc3e24 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -2164,7 +2164,6 @@ Return nil if there is no valid completion, else t.  */)
 {
   Lisp_Object completion, tem, tem1;
   register int i, i_byte;
-  register const unsigned char *completion_string;
   struct gcpro gcpro1, gcpro2;
   int prompt_end_charpos = XINT (Fminibuffer_prompt_end ());
 
@@ -2295,7 +2294,7 @@ Return nil if there is no valid completion, else t.  */)
   {
     int len, c;
     int bytes = SBYTES (completion);
-    completion_string = SDATA (completion);
+    register const unsigned char *completion_string = SDATA (completion);
     for (; i_byte < SBYTES (completion); i_byte += len, i++)
       {
         c = STRING_CHAR_AND_LENGTH (completion_string + i_byte,
diff --git a/src/print.c b/src/print.c
index 65c48b6d82b..2ba749aff44 100644
--- a/src/print.c
+++ b/src/print.c
@@ -1025,7 +1025,9 @@ print_error_message (data, stream, context, caller)
    *Messages*.  */
   if (!NILP (caller) && SYMBOLP (caller))
     {
-      const char *name = SDATA (SYMBOL_NAME (caller));
+      Lisp_Object cname = SYMBOL_NAME (caller);
+      char *name = alloca (SBYTES (cname));
+      bcopy (SDATA (cname), name, SBYTES (cname));
       message_dolog (name, strlen (name), 0, 0);
       message_dolog (": ", 2, 0, 0);
     }
diff --git a/src/w32.c b/src/w32.c
index c7f6e3172f9..9a51233527d 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -3894,7 +3894,9 @@ check_windows_init_file ()
           Lisp_Object load_path_print = Fprin1_to_string (full_load_path, Qnil);
           char *init_file_name = SDATA (init_file);
           char *load_path = SDATA (load_path_print);
-          char *buffer = alloca (1024);
+          char *buffer = alloca (1024
+                                 + strlen (init_file_name)
+                                 + strlen (load_path));
 
           sprintf (buffer,
                    "The Emacs Windows initialization file \"%s.el\" "
diff --git a/src/xdisp.c b/src/xdisp.c
index c8ca187f3df..031260c48ad 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -7048,7 +7048,15 @@ message3 (m, nbytes, multibyte)
   /* First flush out any partial line written with print.  */
   message_log_maybe_newline ();
   if (STRINGP (m))
-    message_dolog (SDATA (m), nbytes, 1, multibyte);
+    {
+      char *buffer;
+      USE_SAFE_ALLOCA;
+
+      SAFE_ALLOCA (buffer, char *, nbytes);
+      bcopy (SDATA (m), buffer, nbytes);
+      message_dolog (buffer, nbytes, 1, multibyte);
+      SAFE_FREE ();
+    }
   message3_nolog (m, nbytes, multibyte);
 
   UNGCPRO;
@@ -16183,6 +16191,8 @@ display_mode_element (it, depth, field_width, precision, elt, props, risky)
                 else /* c == 0 */
                   break;
               }
+            this += SDATA (elt) - lisp_string;
+            lisp_string = SDATA (elt);
           }
       }
       break;
diff --git a/src/xfns.c b/src/xfns.c
index 11f4c2eadb1..84521939ec2 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -1524,11 +1524,12 @@ x_set_scroll_bar_background (f, value, oldval)
    Otherwise store 0 in *STRINGP, which means that the `encoding' of
    the result should be `COMPOUND_TEXT'.  */
 
-unsigned char *
-x_encode_text (string, coding_system, selectionp, text_bytes, stringp)
+static unsigned char *
+x_encode_text (string, coding_system, selectionp, text_bytes, stringp, freep)
      Lisp_Object string, coding_system;
      int *text_bytes, *stringp;
      int selectionp;
+     int *freep;
 {
   unsigned char *str = SDATA (string);
   int chars = SCHARS (string);
@@ -1545,6 +1546,7 @@ x_encode_text (string, coding_system, selectionp, text_bytes, stringp)
       /* No multibyte character in OBJ.  We need not encode it.  */
       *text_bytes = bytes;
       *stringp = 1;
+      *freep = 0;
       return str;
     }
 
@@ -1572,6 +1574,7 @@ x_encode_text (string, coding_system, selectionp, text_bytes, stringp)
   *stringp = (charset_info == 1
               || (!EQ (coding_system, Qcompound_text)
                   && !EQ (coding_system, Qcompound_text_with_extensions)));
+  *freep = 1;
   return buf;
 }
 
@@ -1610,16 +1613,13 @@ x_set_name_internal (f, name)
            in the future which can encode all Unicode characters.
            But, for the moment, there's no way to know that the
            current window manager supports it or not.  */
-        text.value = x_encode_text (name, coding_system, 0, &bytes, &stringp);
+        text.value = x_encode_text (name, coding_system, 0, &bytes, &stringp,
+                                    &do_free_text_value);
         text.encoding = (stringp ? XA_STRING
                          : FRAME_X_DISPLAY_INFO (f)->Xatom_COMPOUND_TEXT);
         text.format = 8;
         text.nitems = bytes;
 
-        /* Check early, because ENCODE_UTF_8 below may GC and name may be
-           relocated.  */
-        do_free_text_value = text.value != SDATA (name);
-
         if (NILP (f->icon_name))
           {
             icon = text;
@@ -1628,12 +1628,11 @@ x_set_name_internal (f, name)
           {
             /* See the above comment "Note: Encoding strategy".  */
             icon.value = x_encode_text (f->icon_name, coding_system, 0,
-                                        &bytes, &stringp);
+                                        &bytes, &stringp, &do_free_icon_value);
             icon.encoding = (stringp ? XA_STRING
                              : FRAME_X_DISPLAY_INFO (f)->Xatom_COMPOUND_TEXT);
             icon.format = 8;
             icon.nitems = bytes;
-            do_free_icon_value = icon.value != SDATA (f->icon_name);
           }
 
 #ifdef USE_GTK
@@ -1996,7 +1995,7 @@ xic_create_fontsetname (base_fontname, motif)
          - the same but with the family also replaced with -*-*-.  */
       char *p = base_fontname;
       int i;
-      
+
       for (i = 0; *p; p++)
         if (*p == '-') i++;
       if (i != 14)
@@ -2020,7 +2019,7 @@ xic_create_fontsetname (base_fontname, motif)
           char *allcs = "*-*-*-*-*-*-*";
           char *allfamilies = "-*-*-";
           char *all = "*-*-*-*-";
-          
+
           for (i = 0, p = base_fontname; i < 8; p++)
             {
               if (*p == '-')
diff --git a/src/xterm.h b/src/xterm.h
index aa615d06a17..e2db932a0be 100644
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -1041,8 +1041,6 @@ extern void x_real_positions P_ ((struct frame *, int *, int *));
 extern int defined_color P_ ((struct frame *, char *, XColor *, int));
 extern void x_set_border_pixel P_ ((struct frame *, int));
 extern void x_set_menu_bar_lines P_ ((struct frame *, Lisp_Object, Lisp_Object));
-extern unsigned char * x_encode_text P_ ((Lisp_Object, Lisp_Object, int,
-                                          int *, int *));
 extern void x_implicitly_set_name P_ ((struct frame *, Lisp_Object, Lisp_Object));
 extern void xic_free_xfontset P_ ((struct frame *));
 extern void create_frame_xic P_ ((struct frame *));