Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-82

Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 542-553)

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

 * gnus--rel--5.10  (patch 116-121)

   - Merge from emacs--cvs-trunk--0
   - Update from CVS

17 files changed, 228 insertions, 93 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 99c9d951370..31943170b94 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,115 @@
+2005-09-18  Andreas Schwab  <schwab@suse.de>
+
+        * window.h (struct window): Remove height_fixed_p, no longer set.
+
+        * window.c (make_window): Don't initialize height_fixed_p.
+        (window_fixed_size_p): Don't use it.
+
+2005-09-18  John Paul Wallington  <jpw@pobox.com>
+
+        * data.c (Fdefalias): Signal an error if SYMBOL is not a symbol.
+
+2005-09-18  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * Makefile.in (SOME_MACHINE_OBJECTS): Undo previous change.
+
+        * macfns.c (image_cache_refcount, dpyinfo_refcount) [GLYPH_DEBUG]:
+        New variables.
+        [TARGET_API_MAC_CARBON] (Fx_file_dialog): Don't allow multiple
+        file selection.
+
+        * sysdep.c [MAC_OS8]: Don't include stdlib.h.  Include sys/param.h.
+
+2005-09-17  Eli Zaretskii  <eliz@gnu.org>
+
+        * Makefile.in (XMENU_OBJ) [!HAVE_CARBON]: Reinstate variable.
+        (obj): Use XMENU_OBJ, not a literal xmenu.o.
+
+2005-09-16  Romain Francoise  <romain@orebokech.com>
+
+        * fileio.c (syms_of_fileio) <write-region-inhibit-fsync>: Doc fix.
+
+2005-09-15  Richard M. Stallman  <rms@gnu.org>
+
+        * xdisp.c (overlay_arrow_at_row): Add HAVE_WINDOW_SYSTEM conditional.
+        (display_mode_element): Instead of `lisp_string' and `this',
+        record `offset' and increment that.
+        `last_offset' replaces `last'.
+
+        * Makefile.in (XMENU_OBJ): Variable deleted.
+        (obj): Use xmenu.o unconditionally.
+        (SOME_MACHINE_OBJECTS): Delete xmenu.o.
+
+        * emacs.c (main): Don't conditionalize syms_of_xmenu on HAVE_XMENU.
+
+2005-09-15  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (move_it_vertically): Don't try to fetch byte BEGV-1.
+        (reseat_at_next_visible_line_start): Likewise (in xassert).
+
+2005-09-14  Romain Francoise  <romain@orebokech.com>
+
+        * fileio.c (write_region_inhibit_fsync): New variable.
+        (Fwrite_region): Use it to skip call to fsync.
+        (syms_of_fileio): Initialize it.
+
+2005-09-14  Kenichi Handa  <handa@m17n.org>
+
+        * coding.c (code_convert_region_unwind): Argument format changed.
+        (run_pre_post_conversion_on_str): If pre-write-conversion function
+        changed the current buffer, delete the new buffer.
+        (run_pre_write_conversin_on_c_str): Likewise.
+
+        * fileio.c (Fexpand_file_name): Check multibyteness of
+        default_directory.
+
+2005-09-13  Kenichi Handa  <handa@m17n.org>
+
+        * composite.c (compose_chars_in_text): Delete it.
+
+        * composite.h (compose_chars_in_text): Delete extern.
+
+2005-09-13  Kim F. Storm  <storm@cua.dk>
+
+        * print.c (print_error_message): Fix last change.
+
+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/Makefile.in b/src/Makefile.in
index dc757182d4b..6e8b8a0f0f1 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -305,16 +305,17 @@ ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(TOOLKIT_DEFINES) $(MYCPPFLAGS) -I. -I${srcd
 #define LIB_X11_LIB -lX11
 #endif
 
+/* xmenu.c should not be compiled on OSX.  */
+#ifndef HAVE_CARBON
+XMENU_OBJ = xmenu.o
+#endif
+
 #ifdef HAVE_X_WINDOWS
 
 XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o fringe.o image.o
 
 #ifdef HAVE_MENUS
 
-#ifndef HAVE_CARBON
-XMENU_OBJ = xmenu.o
-#endif
-
 #ifdef USE_GTK
 GTK_OBJ= gtkutil.o
 #endif
@@ -450,9 +451,6 @@ LIBX= $(LIBXMENU) $(X11_LDFLAGS) $(LIBXT) LIBTIFF LIBJPEG LIBPNG LIBGIF LIBXPM L
 LIBX= $(LIBXMENU) LD_SWITCH_X_SITE -lX10 LIBX10_MACHINE LIBX10_SYSTEM
 #endif /* not HAVE_X11 */
 #else /* not HAVE_X_WINDOWS */
-#if defined(HAVE_MENUS) && !defined(HAVE_CARBON)
-XMENU_OBJ = xmenu.o
-#endif
 #endif /* not HAVE_X_WINDOWS */
 
 LIBSOUND= @LIBSOUND@
diff --git a/src/composite.h b/src/composite.h
index fe931a579ae..37a75c8a80b 100644
--- a/src/composite.h
+++ b/src/composite.h
@@ -221,7 +221,6 @@ extern void compose_region P_ ((int, int, Lisp_Object, Lisp_Object,
 extern void syms_of_composite P_ ((void));
 extern void compose_text P_ ((int, int, Lisp_Object, Lisp_Object,
                               Lisp_Object));
-extern void compose_chars_in_text P_ ((int, int, Lisp_Object));
 
 #endif /* not EMACS_COMPOSITE_H */
 
diff --git a/src/data.c b/src/data.c
index c1545d0169f..5e83f018001 100644
--- a/src/data.c
+++ b/src/data.c
@@ -719,6 +719,7 @@ determined by DEFINITION.  */)
      (symbol, definition, docstring)
      register Lisp_Object symbol, definition, docstring;
 {
+  CHECK_SYMBOL (symbol);
   if (CONSP (XSYMBOL (symbol)->function)
       && EQ (XCAR (XSYMBOL (symbol)->function), Qautoload))
     LOADHIST_ATTACH (Fcons (Qt, symbol));
diff --git a/src/editfns.c b/src/editfns.c
index 8a61a7a1033..dfb6f865dfb 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -2943,6 +2943,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);
@@ -3250,8 +3252,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)
@@ -3280,8 +3283,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)
@@ -3342,8 +3345,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/emacs.c b/src/emacs.c
index 54e33f810ca..c74e729bf6a 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1630,14 +1630,12 @@ main (argc, argv
 #endif
 #endif /* HAVE_X_WINDOWS */
 
-#ifdef HAVE_MENUS
 #ifndef HAVE_NTGUI
 #ifndef MAC_OS
       /* Called before init_window_once for Mac OS Classic.  */
       syms_of_xmenu ();
 #endif
 #endif
-#endif
 
 #ifdef HAVE_NTGUI
       syms_of_w32term ();
diff --git a/src/fileio.c b/src/fileio.c
index ff600a03a31..16eb0475a2b 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -225,6 +225,11 @@ int vms_stmlf_recfm;
    expanding file names.  This can be bound to / or \. */
 Lisp_Object Vdirectory_sep_char;
 
+#ifdef HAVE_FSYNC
+/* Nonzero means skip the call to fsync in Fwrite-region.  */
+int write_region_inhibit_fsync;
+#endif
+
 extern Lisp_Object Vuser_login_name;
 
 #ifdef WINDOWSNT
@@ -1060,6 +1065,7 @@ See also the function `substitute-in-file-name'.  */)
 #endif /* DOS_NT */
   int length;
   Lisp_Object handler, result;
+  int multibyte;
 
   CHECK_STRING (name);
 
@@ -1137,6 +1143,7 @@ See also the function `substitute-in-file-name'.  */)
 
   name = FILE_SYSTEM_CASE (name);
   nm = SDATA (name);
+  multibyte = STRING_MULTIBYTE (name);
 
 #ifdef DOS_NT
   /* We will force directory separators to be either all \ or /, so make
@@ -1302,8 +1309,7 @@ See also the function `substitute-in-file-name'.  */)
           if (index (nm, '/'))
             {
               nm = sys_translate_unix (nm);
-              return make_specified_string (nm, -1, strlen (nm),
-                                            STRING_MULTIBYTE (name));
+              return make_specified_string (nm, -1, strlen (nm), multibyte);
             }
 #endif /* VMS */
 #ifdef DOS_NT
@@ -1315,8 +1321,7 @@ See also the function `substitute-in-file-name'.  */)
           if (IS_DIRECTORY_SEP (nm[1]))
             {
               if (strcmp (nm, SDATA (name)) != 0)
-                name = make_specified_string (nm, -1, strlen (nm),
-                                              STRING_MULTIBYTE (name));
+                name = make_specified_string (nm, -1, strlen (nm), multibyte);
             }
           else
 #endif
@@ -1325,8 +1330,7 @@ See also the function `substitute-in-file-name'.  */)
             {
               char temp[] = " :";
 
-              name = make_specified_string (nm, -1, p - nm,
-                                            STRING_MULTIBYTE (name));
+              name = make_specified_string (nm, -1, p - nm, multibyte);
               temp[0] = DRIVE_LETTER (drive);
               name = concat2 (build_string (temp), name);
             }
@@ -1334,8 +1338,7 @@ See also the function `substitute-in-file-name'.  */)
 #else /* not DOS_NT */
           if (nm == SDATA (name))
             return name;
-          return make_specified_string (nm, -1, strlen (nm),
-                                        STRING_MULTIBYTE (name));
+          return make_specified_string (nm, -1, strlen (nm), multibyte);
 #endif /* not DOS_NT */
         }
     }
@@ -1447,6 +1450,7 @@ See also the function `substitute-in-file-name'.  */)
       && !newdir)
     {
       newdir = SDATA (default_directory);
+      multibyte |= STRING_MULTIBYTE (default_directory);
 #ifdef DOS_NT
       /* Note if special escape prefix is present, but remove for now.  */
       if (newdir[0] == '/' && newdir[1] == ':')
@@ -1712,8 +1716,7 @@ See also the function `substitute-in-file-name'.  */)
   CORRECT_DIR_SEPS (target);
 #endif /* DOS_NT */
 
-  result = make_specified_string (target, -1, o - target,
-                                  STRING_MULTIBYTE (name));
+  result = make_specified_string (target, -1, o - target, multibyte);
 
   /* Again look to see if the file name has special constructs in it
      and perhaps call the corresponding file handler.  This is needed
@@ -5242,7 +5245,7 @@ This does code conversion according to the value of
      Disk full in NFS may be reported here.  */
   /* mib says that closing the file will try to write as fast as NFS can do
      it, and that means the fsync here is not crucial for autosave files.  */
-  if (!auto_saving && fsync (desc) < 0)
+  if (!auto_saving && !write_region_inhibit_fsync && fsync (desc) < 0)
     {
       /* If fsync fails with EINTR, don't treat that as serious.  */
       if (errno != EINTR)
@@ -5685,6 +5688,8 @@ auto_save_error (error)
   Lisp_Object args[3], msg;
   int i, nbytes;
   struct gcpro gcpro1;
+  char *msgbuf;
+  USE_SAFE_ALLOCA;
 
   ring_bell ();
 
@@ -5694,13 +5699,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);
     }
 
@@ -6656,6 +6663,14 @@ shortly after Emacs reads your `.emacs' file, if you have not yet given it
 a non-nil value.  */);
   Vauto_save_list_file_name = Qnil;
 
+#ifdef HAVE_FSYNC
+  DEFVAR_BOOL ("write-region-inhibit-fsync", &write_region_inhibit_fsync,
+               doc: /* *Non-nil means don't call fsync in `write-region'.
+This variable affects calls to `write-region' as well as save commands.
+A non-nil value may result in data loss!  */);
+  write_region_inhibit_fsync = 0;
+#endif
+
   defsubr (&Sfind_file_name_handler);
   defsubr (&Sfile_name_directory);
   defsubr (&Sfile_name_nondirectory);
diff --git a/src/keymap.c b/src/keymap.c
index 813030fe728..271b0672b1e 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -725,7 +725,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;
 }
@@ -2863,6 +2863,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/macfns.c b/src/macfns.c
index 13cb563c156..9d07dc49049 100644
--- a/src/macfns.c
+++ b/src/macfns.c
@@ -94,6 +94,11 @@ Lisp_Object Qcancel_timer;
 
 extern Lisp_Object Vwindow_system_version;
 
+#if GLYPH_DEBUG
+int image_cache_refcount, dpyinfo_refcount;
+#endif
+
+
 #if 0 /* Use xstricmp instead.  */
 /* compare two strings ignoring case */
 
@@ -4145,6 +4150,7 @@ If ONLY-DIR-P is non-nil, the user can only select directories.  */)
     options.optionFlags = kNavDefaultNavDlogOptions;
     options.optionFlags |= kNavAllFilesInPopup;  /* All files allowed */
     options.optionFlags |= kNavSelectAllReadableItem;
+    options.optionFlags &= ~kNavAllowMultipleFiles;
     if (!NILP(prompt))
       {
         message = cfstring_create_with_string (prompt);
diff --git a/src/print.c b/src/print.c
index b18bf19002f..7818565ce62 100644
--- a/src/print.c
+++ b/src/print.c
@@ -1025,8 +1025,10 @@ print_error_message (data, stream, context, caller)
    *Messages*.  */
   if (!NILP (caller) && SYMBOLP (caller))
     {
-      const char *name = SDATA (SYMBOL_NAME (caller));
-      message_dolog (name, strlen (name), 0, 0);
+      Lisp_Object cname = SYMBOL_NAME (caller);
+      char *name = alloca (SBYTES (cname));
+      bcopy (SDATA (cname), name, SBYTES (cname));
+      message_dolog (name, SBYTES (cname), 0, 0);
       message_dolog (": ", 2, 0, 0);
     }
 
diff --git a/src/sysdep.c b/src/sysdep.c
index c0ff47e3072..eae493ba453 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -49,10 +49,7 @@ extern void srandom P_ ((unsigned int));
 #include "blockinput.h"
 
 #ifdef MAC_OS8
-/* It is essential to include stdlib.h so that this file picks up
-   the correct definitions of rand, srand, and RAND_MAX.
-   Otherwise random numbers will not work correctly.  */
-#include <stdlib.h>
+#include <sys/param.h>
 
 #ifndef subprocesses
 /* Nonzero means delete a process right away if it exits (process.c).  */
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/window.c b/src/window.c
index 4089217825f..198edd3d6d8 100644
--- a/src/window.c
+++ b/src/window.c
@@ -273,7 +273,6 @@ make_window ()
   XSETWINDOW (val, p);
   XSETFASTINT (p->last_point, 0);
   p->frozen_window_start_p = 0;
-  p->height_fixed_p = 0;
   p->last_cursor_off_p = p->cursor_off_p = 0;
   p->left_margin_cols = Qnil;
   p->right_margin_cols = Qnil;
@@ -2438,27 +2437,22 @@ window_fixed_size_p (w, width_p, check_siblings_p)
     }
   else if (BUFFERP (w->buffer))
     {
-      if (w->height_fixed_p && !width_p)
-        fixed_p = 1;
-      else
-        {
-          struct buffer *old = current_buffer;
-          Lisp_Object val;
+      struct buffer *old = current_buffer;
+      Lisp_Object val;
 
-          current_buffer = XBUFFER (w->buffer);
-          val = find_symbol_value (Qwindow_size_fixed);
-          current_buffer = old;
+      current_buffer = XBUFFER (w->buffer);
+      val = find_symbol_value (Qwindow_size_fixed);
+      current_buffer = old;
 
-          fixed_p = 0;
-          if (!EQ (val, Qunbound))
-            {
-              fixed_p = !NILP (val);
+      fixed_p = 0;
+      if (!EQ (val, Qunbound))
+        {
+          fixed_p = !NILP (val);
 
-              if (fixed_p
-                  && ((EQ (val, Qheight) && width_p)
-                      || (EQ (val, Qwidth) && !width_p)))
-                fixed_p = 0;
-            }
+          if (fixed_p
+              && ((EQ (val, Qheight) && width_p)
+                  || (EQ (val, Qwidth) && !width_p)))
+            fixed_p = 0;
         }
 
       /* Can't tell if this one is resizable without looking at
diff --git a/src/window.h b/src/window.h
index df359f37db2..46d75de384f 100644
--- a/src/window.h
+++ b/src/window.h
@@ -290,11 +290,6 @@ struct window
        be changed during redisplay.  If point is not in the window,
        accept that.  */
     unsigned frozen_window_start_p : 1;
-
-    /* 1 means that this window's height is temporarily fixed.  Used
-       in resize_mini_window to precent resizing selected_window, if
-       possible.  */
-    unsigned height_fixed_p : 1;
 };
 
 /* 1 if W is a minibuffer window.  */
diff --git a/src/xdisp.c b/src/xdisp.c
index e4adb43d624..3ae8543144d 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -4903,7 +4903,8 @@ reseat_at_next_visible_line_start (it, on_newline_p)
            && indented_beyond_p (IT_CHARPOS (*it), IT_BYTEPOS (*it),
                                  (double) it->selective)) /* iftc */
       {
-        xassert (FETCH_BYTE (IT_BYTEPOS (*it) - 1) == '\n');
+        xassert (IT_BYTEPOS (*it) == BEGV
+                 || FETCH_BYTE (IT_BYTEPOS (*it) - 1) == '\n');
         newline_found_p = forward_to_next_line_start (it, &skipped_p);
       }
 
@@ -6629,6 +6630,7 @@ move_it_vertically (it, dy)
       /* If buffer ends in ZV without a newline, move to the start of
          the line to satisfy the post-condition.  */
       if (IT_CHARPOS (*it) == ZV
+          && ZV > BEGV
           && FETCH_BYTE (IT_BYTEPOS (*it) - 1) != '\n')
         move_it_by_lines (it, 0, 0);
     }
@@ -7166,7 +7168,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;
@@ -10115,12 +10125,14 @@ overlay_arrow_at_row (it, row)
           if (FRAME_WINDOW_P (it->f)
               && WINDOW_LEFT_FRINGE_WIDTH (it->w) > 0)
             {
+#ifdef HAVE_WINDOW_SYSTEM
               if (val = Fget (var, Qoverlay_arrow_bitmap), SYMBOLP (val))
                 {
                   int fringe_bitmap;
                   if ((fringe_bitmap = lookup_fringe_bitmap (val)) != 0)
                     return make_number (fringe_bitmap);
                 }
+#endif
               return make_number (-1); /* Use default arrow bitmap */
             }
           return overlay_arrow_string_or_property (var);
@@ -16044,7 +16056,7 @@ display_mode_element (it, depth, field_width, precision, elt, props, risky)
       {
         /* A string: output it and check for %-constructs within it.  */
         unsigned char c;
-        const unsigned char *this, *lisp_string;
+        int offset = 0;
 
         if (!NILP (props) || risky)
           {
@@ -16102,8 +16114,7 @@ display_mode_element (it, depth, field_width, precision, elt, props, risky)
               }
           }
 
-        this = SDATA (elt);
-        lisp_string = this;
+        offset = 0;
 
         if (literal)
           {
@@ -16126,42 +16137,44 @@ display_mode_element (it, depth, field_width, precision, elt, props, risky)
             break;
           }
 
+        /* Handle the non-literal case.  */
+
         while ((precision <= 0 || n < precision)
-               && *this
+               && SREF (elt, offset) != 0
                && (mode_line_target != MODE_LINE_DISPLAY
                    || it->current_x < it->last_visible_x))
           {
-            const unsigned char *last = this;
+            int last_offset = offset;
 
             /* Advance to end of string or next format specifier.  */
-            while ((c = *this++) != '\0' && c != '%')
+            while ((c = SREF (elt, offset++)) != '\0' && c != '%')
               ;
 
-            if (this - 1 != last)
+            if (offset - 1 != last_offset)
               {
                 int nchars, nbytes;
 
                 /* Output to end of string or up to '%'.  Field width
                    is length of string.  Don't output more than
                    PRECISION allows us.  */
-                --this;
+                offset--;
 
-                prec = c_string_width (last, this - last, precision - n,
+                prec = c_string_width (SDATA (elt) + last_offset,
+                                       offset - last_offset, precision - n,
                                        &nchars, &nbytes);
 
                 switch (mode_line_target)
                   {
                   case MODE_LINE_NOPROP:
                   case MODE_LINE_TITLE:
-                    n += store_mode_line_noprop (last, 0, prec);
+                    n += store_mode_line_noprop (SDATA (elt) + last_offset, 0, prec);
                     break;
                   case MODE_LINE_STRING:
                     {
-                      int bytepos = last - lisp_string;
+                      int bytepos = last_offset;
                       int charpos = string_byte_to_char (elt, bytepos);
                       int endpos = (precision <= 0
-                                    ? string_byte_to_char (elt,
-                                                           this - lisp_string)
+                                    ? string_byte_to_char (elt, offset)
                                     : charpos + nchars);
 
                       n += store_mode_line_string (NULL,
@@ -16172,7 +16185,7 @@ display_mode_element (it, depth, field_width, precision, elt, props, risky)
                     break;
                   case MODE_LINE_DISPLAY:
                     {
-                      int bytepos = last - lisp_string;
+                      int bytepos = last_offset;
                       int charpos = string_byte_to_char (elt, bytepos);
                       n += display_string (NULL, elt, Qnil, 0, charpos,
                                            it, 0, prec, 0,
@@ -16183,12 +16196,12 @@ display_mode_element (it, depth, field_width, precision, elt, props, risky)
               }
             else /* c == '%' */
               {
-                const unsigned char *percent_position = this;
+                int percent_position = offset;
 
                 /* Get the specified minimum width.  Zero means
                    don't pad.  */
                 field = 0;
-                while ((c = *this++) >= '0' && c <= '9')
+                while ((c = SREF (elt, offset++)) >= '0' && c <= '9')
                   field = field * 10 + c - '0';
 
                 /* Don't pad beyond the total padding allowed.  */
@@ -16208,7 +16221,7 @@ display_mode_element (it, depth, field_width, precision, elt, props, risky)
                     int bytepos, charpos;
                     unsigned char *spec;
 
-                    bytepos = percent_position - lisp_string;
+                    bytepos = percent_position;
                     charpos = (STRING_MULTIBYTE (elt)
                                ? string_byte_to_char (elt, bytepos)
                                : bytepos);
diff --git a/src/xfns.c b/src/xfns.c
index 9655951d8c1..027a1464503 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -1516,11 +1516,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;
 {
   int result = string_xstring_p (string);
   struct coding_system coding;
@@ -1530,6 +1531,7 @@ x_encode_text (string, coding_system, selectionp, text_bytes, stringp)
       /* No multibyte character in OBJ.  We need not encode it.  */
       *text_bytes = SBYTES (string);
       *stringp = 1;
+      *freep = 0;
       return SDATA (string);
     }
 
@@ -1543,6 +1545,7 @@ x_encode_text (string, coding_system, selectionp, text_bytes, stringp)
                         SCHARS (string), SBYTES (string), Qnil);
   *text_bytes = coding.produced;
   *stringp = (result == 1 || !EQ (coding_system, Qcompound_text));
+  *freep = 1;
   return coding.destination;
 }
 
@@ -1581,16 +1584,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;
@@ -1599,12 +1599,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
@@ -1967,7 +1966,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)
@@ -1991,7 +1990,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 6a2a9a99200..da474beef58 100644
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -1044,8 +1044,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 *));