Merged from miles@gnu.org--gnu-2005 (patch 74-79, 332-349)

Patches applied:

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

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

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

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-336
   Merge from gnus--rel--5.10

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-338
   etc/emacs-buffer.gdb: Remove RCS keywords

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-339
   Merge from gnus--rel--5.10

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

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

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

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

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-345
   Merge from gnus--rel--5.10

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

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-348
   Merge from gnus--rel--5.10

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

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-74
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-75
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-76
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-77
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-78
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-79
   Update from CVS

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

7 files changed, 386 insertions, 221 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 8c64defd5db..dbcac952b51 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,63 @@
+2005-06-02  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (MODE_LINE_NOPROP_LEN): New macro.
+        (x_consider_frame_title, Fformat_mode_line): Save offset into
+        mode_line_noprop_buf rather than pointer, in case buffer is relocated.
+
+2005-06-01  Kim F. Storm  <storm@cua.dk>
+
+        * fns.c (mapcar1): Maybe exit loop if original sequence was modified.
+
+2005-06-01  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macterm.c (mac_to_x_fontname, mac_do_list_fonts): Set XLFD
+        resolution fields for scalable fonts to 0.
+
+        * xfaces.c (build_scalable_font_name): Round pixel size to the
+        nearest integer.
+
+2005-06-01  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (display_mode_line): Support nested calls to redisplay
+        and format-mode-line.  Set mode_line_target to MODE_LINE_DISPLAY.
+
+2005-05-31  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * fileio.c (Finsert_file_contents):
+        * xdisp.c (note_mode_line_or_margin_highlight): Lisp_Object/int mixup.
+
+2005-05-31  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (mode_line_noprop_buf, mode_line_noprop_buf_end)
+        (mode_line_noprop_ptr): Rename from frame_title_*.
+        (store_mode_line_noprop_char): Rename from store_frame_title_char.
+        (store_mode_line_noprop): Rename from store_frame_title.
+        (mode_line_target): New enum to specify current output target
+        for mode line formatting.
+        (display_mode_element): Test it rather than frame_title_ptr and
+        mode_line_string_list to determine where output should go.
+        (mode_line_proptrans_alist, mode_line_string_alist): Make static.
+        (Vmode_line_unwind_vector): New variable.
+        (format_mode_line_unwind_data, unwind_format_mode_line):
+        New functions for unwind protection in mode line formatting.
+        (x_consider_frame_title): Use them and new local var 'title_start'
+        to support nested calls to format-mode-line and redisplay.  Set
+        mode_line_target to MODE_LINE_TITLE.
+        (Fformat_mode_line): Use them and new local var 'string_start' to
+        support nested calls to format-mode-line and redisplay.  Set
+        mode_line_target to MODE_LINE_NOPROP or MODE_LINE_STRING.
+        Don't trim trailing dashes.
+        (decode_mode_spec): Don't make infinite number of trailing dashes
+        for MODE_LINE_NOPROP and MODE_LINE_STRING targets.
+        (syms_of_xdisp): Initialize and staticpro mode_line_string_face,
+        mode_line_string_face_prop, and Vmode_line_unwind_vector.
+        (init_xdisp): Initialize mode_line_noprop_ptr to start of _buf.
+        Initialize mode_line_target to MODE_LINE_DISPLAY.
+
+2005-05-29  Richard M. Stallman  <rms@gnu.org>
+
+        * buffer.c (Fbuffer_local_value): Call indirect_variable.
+
 2005-05-28  Masatake YAMATO  <jet@gyve.org>
 
         * xdisp.c (note_mode_line_or_margin_highlight): Change the
@@ -9,10 +69,9 @@
 
         * ccl.c: Now an element of Vccl_program_table is a vector of
         length 4, not 3.
-        (ccl_get_compiled_code): New arg idx.  Caller changed.  Adjusted
-        for the change of Vccl_program_table.
-        (setup_ccl_program): Adjusted for the change of
-        Vccl_program_table.
+        (ccl_get_compiled_code): New arg idx.  Caller changed.
+        Adjust for the change of Vccl_program_table.
+        (setup_ccl_program): Adjust for the change of Vccl_program_table.
         (check_ccl_update): New function.
         (Fregister_ccl_program): Use ASET to set an element of a vector.
         Adjusted for the change of Vccl_program_table.
@@ -22,7 +81,7 @@
 
 2005-05-27  Juanma Barranquero  <lekktu@gmail.com>
 
-        * image.c (Vimage_library_alist): Moved from image.el.
+        * image.c (Vimage_library_alist): Move from image.el.
         (syms_of_image): Defvar it.
         (lookup_image_type): Use it.
 
@@ -119,8 +178,7 @@
 
 2005-05-16  Andreas Schwab  <schwab@suse.de>
 
-        * unexmacosx.c (unexec_realloc): Move declarations before
-        statements.
+        * unexmacosx.c (unexec_realloc): Move declarations before statements.
 
 2005-05-14  Richard M. Stallman  <rms@gnu.org>
 
@@ -148,8 +206,8 @@
 
         * emacs.c (main) [MAC_OS8]: Call init_atimer before mac_term_init.
 
-        * keyboard.c (readable_events) [USE_TOOLKIT_SCROLL_BARS]: Regard
-        toolkit scroll bar thumb drag events as squeezable and prevent
+        * keyboard.c (readable_events) [USE_TOOLKIT_SCROLL_BARS]:
+        Regard toolkit scroll bar thumb drag events as squeezable and prevent
         redisplay from being paused by them.
 
         * mac.c [!MAC_OSX]: Include keyboard.h and syssignal.h.
@@ -157,12 +215,11 @@
         [!MAC_OSX] (check_alarm, pause, index): Remove functions.
         [!MAC_OSX && __MRC__] (sys_strftime): Likewise.
         [!MAC_OSX] (select): If fd 0 is not set in rfds and some input
-        event occurs before timeout, behave as if the function were
-        interrupted.
+        event occurs before timeout, behave as if the function were interrupted.
         [!MAC_OSX] (sigblock, sigsetmask, alarm): Simulate SIGALRM
         handling using Time Manager routines.
-        [!MAC_OSX] (mac_atimer_task, mac_atimer_qlink, signal_mask): New
-        variables.
+        [!MAC_OSX] (mac_atimer_task, mac_atimer_qlink, signal_mask):
+        New variables.
         [!MAC_OSX] (mac_atimer_handler, set_mac_atimer, remove_mac_atimer)
         (setitimer): New functions.
 
@@ -176,8 +233,8 @@
         (x_scroll_bar_handle_click): Change type of second argument from
         int to ControlPartCode.
         (check_alarm): Remove declaration.
-        (XTread_Socket) [!TARGET_API_MAC_CARBON]: Don't call it.
-        (XTread_Socket): Use ControlPartCode instead of SInt16.
+        (XTread_socket) [!TARGET_API_MAC_CARBON]: Don't call it.
+        (XTread_socket): Use ControlPartCode instead of SInt16.
 
 2005-05-13  Nozomu Ando  <nand@mac.com>
 
@@ -1981,7 +2038,7 @@
 2005-01-13  Kim F. Storm  <storm@cua.dk>
 
         * xdisp.c (Fformat_mode_line): Fix last change.  Remove NO_PROPS arg
-        (specify 0 for FACE instead). Reorder arg list.  Doc fix.
+        (specify 0 for FACE instead).  Reorder arg list.  Doc fix.
 
 2005-01-12  Richard M. Stallman  <rms@gnu.org>
 
@@ -2132,7 +2189,7 @@
         fontp->space_width to FONT_WIDTH so they are valid.
 
         * w32fns.c (w32_load_system_font): Set FONT_WIDTH to maximum, not
-        average width. Set fontp->average_width and fontp->space_width to
+        average width.  Set fontp->average_width and fontp->space_width to
         their appropriate values.
 
         * w32term.c (x_new_font): Set FRAME_COLUMN_WIDTH to
@@ -2159,7 +2216,7 @@
         * xdisp.c (setup_for_ellipsis, get_next_display_element):
         Set it->ellipsis_p to 1 or 0.
         (display_line): Record whether row ends in mid-ellipsis.
-        (set_cursor_from_row): If ends in ellipsis. find start of it.
+        (set_cursor_from_row): If ends in ellipsis, find start of it.
         (cursor_row_p): If PT's at the end of the ellipsis the row
         ends within, don't display cursor on this row.
 
@@ -2862,7 +2919,7 @@
         * fringe.c (update_window_fringes): Prefer truncation bitmaps over
         angle bitmaps at top/bottom line.
 
-        * xdisp.c: Undo recent changes for restoring saved_face_id. Instead,
+        * xdisp.c: Undo recent changes for restoring saved_face_id.  Instead,
         set it when it->method is set to next_element_from_display_vector.
         (setup_for_ellipsis): Add LEN argument.  Callers changed.
         Set it->saved_face_id.
@@ -3058,7 +3115,7 @@
         * xfns.c (Fx_file_dialog): Call popup_activated instead of
         x_menu_in_use.  Call x_menu_set_in_use in Motif version also.
 
-        * xterm.h: (x_menu_in_use): Remove.
+        * xterm.h (x_menu_in_use): Remove.
 
 2004-11-16  Richard M. Stallman  <rms@gnu.org>
 
@@ -3192,7 +3249,7 @@
         (MR_PARTIALLY_VISIBLE_AT_BOTTOM): New helper macros.
         (MATRIX_ROW_PARTIALLY_VISIBLE_P): Fix to return false if invisible
         part of last line is only extra line spacing (so the text on the
-        line is fully visible). Use helper macros.
+        line is fully visible).  Use helper macros.
         Add W arg (to use them).  All callers changed.
         (MATRIX_ROW_PARTIALLY_VISIBLE_AT_TOP_P)
         (MATRIX_ROW_PARTIALLY_VISIBLE_AT_BOTTOM_P): Use helper macros.
@@ -3878,7 +3935,7 @@
 
         * keyboard.c (timer_resume_idle): New function to resume idle
         timer without resetting timers on the idle list.
-        (read_char): Use timer_resume_idle. Remove local var last_idle_start.
+        (read_char): Use timer_resume_idle.  Remove local var last_idle_start.
         (timer_start_idle, timer_stop_idle): Declare static.
         (read_key_sequence): Use timer_resume_idle instead of timer_start_idle.
 
@@ -5952,7 +6009,7 @@
         elt_prefix combined with Fsingle_key_description.
         (describe_vector): Declare static.  Replace arg `elt_prefix' with
         `prefix'.  Add KEYMAP_P arg.  Add local var `elt_prefix'; use it
-        if !KEYMAP_P. Use Fkey_description with prefix instead of
+        if !KEYMAP_P.  Use Fkey_description with prefix instead of
         Fsingle_key_description.
 
         * keymap.h (Fkey_description): Fix prototype.
@@ -6167,7 +6224,7 @@
         (display_mode_line): Set mode_line_p before displaying line.
         (calc_pixel_width_or_height): Declare extern.  Add separate :align-to
         handling.  Remove complex cases for fringes and scroll-bars.
-        Add left, right, and center alignment positions. Add text (area)
+        Add left, right, and center alignment positions.  Add text (area)
         width/height.  Return width or height for image specs.
         (produce_stretch_glyph): Improve handling of :align-to.  Is now
         relative to left of text area by default, but other base offsets
@@ -10475,7 +10532,7 @@
         * intervals.h (CHECK_TOTAL_LENGTH): New macro.
         * intervals.c: Add many calls to CHECK_TOTAL_LENGTH.
 
-        * alloc.c: (VALIDATE_LISP_STORAGE): Macro deleted.
+        * alloc.c (VALIDATE_LISP_STORAGE): Macro deleted.
         All calls deleted.
         (lisp_malloc): Do the work here directly.
 
@@ -10634,7 +10691,7 @@
         (syms_of_w32fns): Don't intern/staticpro removed vars.
 
         * w32term.c: Remove unnecessary extern declarations.
-        (x_fullscreen_adjust): Remove. Use generic instead.
+        (x_fullscreen_adjust): Remove.  Use generic instead.
         (x_redisplay_interface): Add w32_frame_parm_handlers member.
 
         * w32reg.c (x_get_string_resource): Use XrmDatabase.
@@ -11860,9 +11917,9 @@
 2003-01-21  David Ponce  <david@dponce.com>
 
         * w32term.c (w32_encode_char): For DIM=1 charset, set
-        ccl->reg[2] to -1 before calling ccl_driver.  (Sync. with xterm.c
-        x_encode_char change by Kenichi Handa <handa@m17n.org> on
-        2002-09-30.)
+        ccl->reg[2] to -1 before calling ccl_driver.
+        (Sync. with xterm.c x_encode_char change by Kenichi Handa
+        <handa@m17n.org> on 2002-09-30.)
         (w32_draw_relief_rect): Declare all args.
         (w32_define_cursor): New.
 
@@ -14545,7 +14602,7 @@
 
 2002-06-27  Kim F. Storm  <storm@cua.dk>
 
-        * xdisp.c: (mode_line_string_list, mode_line_string_face)
+        * xdisp.c (mode_line_string_list, mode_line_string_face)
         (mode_line_string_face_prop): New variables.
         (store_mode_line_string): New function.
         (display_mode_element): Use store_mode_line_string to
@@ -14588,7 +14645,7 @@
 
 2002-06-24  Juanma Barranquero  <lektu@terra.es>
 
-        * w32select.c: Include composite.h
+        * w32select.c: Include composite.h.
 
         * w16select.c: Likewise.
 
@@ -15579,7 +15636,7 @@
 
         * config.in: Add HAVE_SHARED_GAME_DIR.
 
-        * callproc.c: (Vgame_score_directory): New variable.
+        * callproc.c (Vgame_score_directory): New variable.
         (syms_of_callproc) <Vgame_score_directory>: DEFVAR_LISP.
 
 2002-04-10  Richard M. Stallman  <rms@gnu.org>
@@ -16127,7 +16184,7 @@
 
         * xterm.h (x_session_check_input, x_session_initialize): Declare.
 
-        * xterm.c: (XTread_socket): Add call to x_session_check_input and
+        * xterm.c (XTread_socket): Add call to x_session_check_input and
         x_session_have_connection.
         (x_initialize): Add call to x_session_initialize.
 
@@ -16544,10 +16601,10 @@
 
 2002-02-17  Kim F. Storm  <storm@cua.dk>
 
-        * frame.c: (Vmouse_highlight): New variable.
+        * frame.c (Vmouse_highlight): New variable.
         (syms_of_frame): DEFVAR_LISP it.
 
-        * frame.h: (Vmouse_highlight): Declare extern.
+        * frame.h (Vmouse_highlight): Declare extern.
 
         * xterm.h (struct x_display_info): Add mouse_face_hidden.
 
@@ -18072,7 +18129,7 @@
 
 2001-11-16  Eli Zaretskii  <eliz@is.elta.co.il>
 
-        * syswait.h: (HAVE_SYS_WAIT_H): Undef for ISC 4.1.  Reported by
+        * syswait.h (HAVE_SYS_WAIT_H): Undef for ISC 4.1.  Reported by
         Andrew Wiseman <a.wiseman@btclick.com>.
 
 2001-11-16  Kim F. Storm  <storm@cua.dk>
@@ -18760,7 +18817,7 @@
 
         * xterm.c: Fix typo in a comment.
 
-        * lisp.h: (gdb_lisp_params): Remove code in #if 0 which is now in
+        * lisp.h (gdb_lisp_params): Remove code in #if 0 which is now in
         emacs.c.
 
 2001-10-27  Gerd Moellmann  <gerd@gnu.org>
@@ -18884,7 +18941,7 @@
 
 2001-10-24  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
-        * xterm.c: (x_insert_glyphs): Remove unused variables `real_end'
+        * xterm.c (x_insert_glyphs): Remove unused variables `real_end'
         and `real_start'.
         (x_draw_image_foreground): Remove unused variables `mask' and `xgcv'.
         (glyph_rect): Remove unused variable `area'.
@@ -18916,7 +18973,7 @@
         (HAVE_BOXES): Fix typo in comment.
         (push_menu_pane): Fix typo in comment.
 
-        * xdisp.c: (display_prop_string_p): Remove unused local declaration
+        * xdisp.c (display_prop_string_p): Remove unused local declaration
         of `Qwhen'.
         (single_display_prop_string_p): Remove unused local declarations
         of `Qwhen' and `Qmargin'.
diff --git a/src/buffer.c b/src/buffer.c
index dfcf4a9a0b9..a287e45df78 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -889,6 +889,9 @@ is the default binding of the variable. */)
   CHECK_BUFFER (buffer);
   buf = XBUFFER (buffer);
 
+  if (SYMBOLP (variable))
+    variable = indirect_variable (variable);
+
   /* Look in local_var_list */
   result = Fassoc (variable, buf->local_var_alist);
   if (NILP (result))
diff --git a/src/fileio.c b/src/fileio.c
index a31b434c1de..c38cb924c8b 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -3747,7 +3747,7 @@ actually used.  */)
   int set_coding_system = 0;
   int coding_system_decided = 0;
   int read_quit = 0;
-  int old_Vdeactivate_mark = Vdeactivate_mark;
+  Lisp_Object old_Vdeactivate_mark = Vdeactivate_mark;
   int we_locked_file = 0;
 
   if (current_buffer->base_buffer && ! NILP (visit))
diff --git a/src/fns.c b/src/fns.c
index bd3893f7538..e910c87375b 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -3132,9 +3132,9 @@ mapcar1 (leni, vals, fn, seq)
   else   /* Must be a list, since Flength did not get an error */
     {
       tail = seq;
-      for (i = 0; i < leni; i++)
+      for (i = 0; i < leni && CONSP (tail); i++)
         {
-          dummy = call1 (fn, Fcar (tail));
+          dummy = call1 (fn, XCAR (tail));
           if (vals)
             vals[i] = dummy;
           tail = XCDR (tail);
@@ -3172,7 +3172,7 @@ SEQUENCE may be a list, a vector, a bool-vector, or a string.  */)
   mapcar1 (leni, args, function, sequence);
   UNGCPRO;
 
-  for (i = leni - 1; i >= 0; i--)
+  for (i = leni - 1; i > 0; i--)
     args[i + i] = args[i];
 
   for (i = 1; i < nargs; i += 2)
diff --git a/src/macterm.c b/src/macterm.c
index 47c77e6dd56..890c1a1b9ba 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -6256,9 +6256,10 @@ mac_to_x_fontname (name, size, style, charset)
       strcpy(family, name);
     }
 
-  sprintf(xf, "-%s-%s-%s-%c-normal--%d-%d-75-75-m-%d-%s",
+  sprintf(xf, "-%s-%s-%s-%c-normal--%d-%d-%d-%d-m-%d-%s",
           foundry, family, style & bold ? "bold" : "medium",
-          style & italic ? 'i' : 'r', size, size * 10, size * 10, charset);
+          style & italic ? 'i' : 'r', size, size * 10,
+          size ? 75 : 0, size ? 75 : 0, size * 10, charset);
 
   result = (char *) xmalloc (strlen (xf) + 1);
   strcpy (result, xf);
@@ -6714,7 +6715,7 @@ mac_do_list_fonts (pattern, maxnames)
             break;
         }
       else if (scl_val[XLFD_SCL_PIXEL_SIZE] > 0
-               && (ptr = strstr (font_name_table[i], "-0-0-75-75-m-0-")))
+               && (ptr = strstr (font_name_table[i], "-0-0-0-0-m-0-")))
         {
           int former_len = ptr - font_name_table[i];
 
@@ -6724,7 +6725,7 @@ mac_do_list_fonts (pattern, maxnames)
                    scl_val[XLFD_SCL_PIXEL_SIZE],
                    scl_val[XLFD_SCL_POINT_SIZE],
                    scl_val[XLFD_SCL_AVGWIDTH],
-                   ptr + sizeof ("-0-0-75-75-m-0-") - 1);
+                   ptr + sizeof ("-0-0-0-0-m-0-") - 1);
           fontname = mac_c_string_match (pattern_regex, scaled,
                                          nonspecial, exact);
           if (!NILP (fontname))
diff --git a/src/xdisp.c b/src/xdisp.c
index fe2d2e7020a..31a82fefd78 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -830,8 +830,8 @@ static struct text_pos run_window_scroll_functions P_ ((Lisp_Object,
                                                         struct text_pos));
 static void reconsider_clip_changes P_ ((struct window *, struct buffer *));
 static int text_outside_line_unchanged_p P_ ((struct window *, int, int));
-static void store_frame_title_char P_ ((char));
-static int store_frame_title P_ ((const unsigned char *, int, int));
+static void store_mode_line_noprop_char P_ ((char));
+static int store_mode_line_noprop P_ ((const unsigned char *, int, int));
 static void x_consider_frame_title P_ ((Lisp_Object));
 static void handle_stop P_ ((struct it *));
 static int tool_bar_lines_needed P_ ((struct frame *));
@@ -8161,52 +8161,126 @@ echo_area_display (update_frame_p)
 
 
 /***********************************************************************
-                             Frame Titles
+                     Mode Lines and Frame Titles
  ***********************************************************************/
 
+/* A buffer for constructing non-propertized mode-line strings and
+   frame titles in it; allocated from the heap in init_xdisp and
+   resized as needed in store_mode_line_noprop_char.  */
 
-/* The frame title buffering code is also used by Fformat_mode_line.
-   So it is not conditioned by HAVE_WINDOW_SYSTEM.  */
+static char *mode_line_noprop_buf;
 
-/* A buffer for constructing frame titles in it; allocated from the
-   heap in init_xdisp and resized as needed in store_frame_title_char.  */
+/* The buffer's end, and a current output position in it.  */
 
-static char *frame_title_buf;
+static char *mode_line_noprop_buf_end;
+static char *mode_line_noprop_ptr;
 
-/* The buffer's end, and a current output position in it.  */
+#define MODE_LINE_NOPROP_LEN(start) \
+  ((mode_line_noprop_ptr - mode_line_noprop_buf) - start)
+
+static enum {
+  MODE_LINE_DISPLAY = 0,
+  MODE_LINE_TITLE,
+  MODE_LINE_NOPROP,
+  MODE_LINE_STRING
+} mode_line_target;
+
+/* Alist that caches the results of :propertize.
+   Each element is (PROPERTIZED-STRING . PROPERTY-LIST).  */
+static Lisp_Object mode_line_proptrans_alist;
+
+/* List of strings making up the mode-line.  */
+static Lisp_Object mode_line_string_list;
+
+/* Base face property when building propertized mode line string.  */
+static Lisp_Object mode_line_string_face;
+static Lisp_Object mode_line_string_face_prop;
+
+
+/* Unwind data for mode line strings */
+
+static Lisp_Object Vmode_line_unwind_vector;
+
+static Lisp_Object
+format_mode_line_unwind_data (obuf)
+     struct buffer *obuf;
+{
+  int i = 0;
+  Lisp_Object vector;
+
+  /* Reduce consing by keeping one vector in
+     Vwith_echo_area_save_vector.  */
+  vector = Vmode_line_unwind_vector;
+  Vmode_line_unwind_vector = Qnil;
+
+  if (NILP (vector))
+    vector = Fmake_vector (make_number (7), Qnil);
+
+  AREF (vector, 0) = make_number (mode_line_target);
+  AREF (vector, 1) = make_number (MODE_LINE_NOPROP_LEN (0));
+  AREF (vector, 2) = mode_line_string_list;
+  AREF (vector, 3) = mode_line_proptrans_alist;
+  AREF (vector, 4) = mode_line_string_face;
+  AREF (vector, 5) = mode_line_string_face_prop;
+
+  if (obuf)
+    XSETBUFFER (AREF (vector, 6), obuf);
+  else
+    AREF (vector, 6) = Qnil;
+
+  return vector;
+}
+
+static Lisp_Object
+unwind_format_mode_line (vector)
+     Lisp_Object vector;
+{
+  mode_line_target = XINT (AREF (vector, 0));
+  mode_line_noprop_ptr = mode_line_noprop_buf + XINT (AREF (vector, 1));
+  mode_line_string_list = AREF (vector, 2);
+  mode_line_proptrans_alist = AREF (vector, 3);
+  mode_line_string_face = AREF (vector, 4);
+  mode_line_string_face_prop = AREF (vector, 5);
 
-static char *frame_title_buf_end;
-static char *frame_title_ptr;
+  if (!NILP (AREF (vector, 6)))
+    {
+      set_buffer_internal_1 (XBUFFER (AREF (vector, 6)));
+      AREF (vector, 6) = Qnil;
+    }
 
+  Vmode_line_unwind_vector = vector;
+  return Qnil;
+}
 
-/* Store a single character C for the frame title in frame_title_buf.
-   Re-allocate frame_title_buf if necessary.  */
+
+/* Store a single character C for the frame title in mode_line_noprop_buf.
+   Re-allocate mode_line_noprop_buf if necessary.  */
 
 static void
 #ifdef PROTOTYPES
-store_frame_title_char (char c)
+store_mode_line_noprop_char (char c)
 #else
-store_frame_title_char (c)
+store_mode_line_noprop_char (c)
     char c;
 #endif
 {
   /* If output position has reached the end of the allocated buffer,
      double the buffer's size.  */
-  if (frame_title_ptr == frame_title_buf_end)
+  if (mode_line_noprop_ptr == mode_line_noprop_buf_end)
     {
-      int len = frame_title_ptr - frame_title_buf;
-      int new_size = 2 * len * sizeof *frame_title_buf;
-      frame_title_buf = (char *) xrealloc (frame_title_buf, new_size);
-      frame_title_buf_end = frame_title_buf + new_size;
-      frame_title_ptr = frame_title_buf + len;
+      int len = MODE_LINE_NOPROP_LEN (0);
+      int new_size = 2 * len * sizeof *mode_line_noprop_buf;
+      mode_line_noprop_buf = (char *) xrealloc (mode_line_noprop_buf, new_size);
+      mode_line_noprop_buf_end = mode_line_noprop_buf + new_size;
+      mode_line_noprop_ptr = mode_line_noprop_buf + len;
     }
 
-  *frame_title_ptr++ = c;
+  *mode_line_noprop_ptr++ = c;
 }
 
 
-/* Store part of a frame title in frame_title_buf, beginning at
-   frame_title_ptr.  STR is the string to store.  Do not copy
+/* Store part of a frame title in mode_line_noprop_buf, beginning at
+   mode_line_noprop_ptr.  STR is the string to store.  Do not copy
    characters that yield more columns than PRECISION; PRECISION <= 0
    means copy the whole string.  Pad with spaces until FIELD_WIDTH
    number of characters have been copied; FIELD_WIDTH <= 0 means don't
@@ -8214,7 +8288,7 @@ store_frame_title_char (c)
    frame title.  */
 
 static int
-store_frame_title (str, field_width, precision)
+store_mode_line_noprop (str, field_width, precision)
      const unsigned char *str;
      int field_width, precision;
 {
@@ -8225,19 +8299,23 @@ store_frame_title (str, field_width, precision)
   nbytes = strlen (str);
   n += c_string_width (str, nbytes, precision, &dummy, &nbytes);
   while (nbytes--)
-    store_frame_title_char (*str++);
+    store_mode_line_noprop_char (*str++);
 
   /* Fill up with spaces until FIELD_WIDTH reached.  */
   while (field_width > 0
          && n < field_width)
     {
-      store_frame_title_char (' ');
+      store_mode_line_noprop_char (' ');
       ++n;
     }
 
   return n;
 }
 
+/***********************************************************************
+                             Frame Titles
+ ***********************************************************************/
+
 #ifdef HAVE_WINDOW_SYSTEM
 
 /* Set the title of FRAME, if it has changed.  The title format is
@@ -8257,9 +8335,11 @@ x_consider_frame_title (frame)
       /* Do we have more than one visible frame on this X display?  */
       Lisp_Object tail;
       Lisp_Object fmt;
-      struct buffer *obuf;
+      int title_start;
+      char *title;
       int len;
       struct it it;
+      int count = SPECPDL_INDEX ();
 
       for (tail = Vframe_list; CONSP (tail); tail = XCDR (tail))
         {
@@ -8278,18 +8358,22 @@ x_consider_frame_title (frame)
       multiple_frames = CONSP (tail);
 
       /* Switch to the buffer of selected window of the frame.  Set up
-         frame_title_ptr so that display_mode_element will output into it;
-         then display the title.  */
-      obuf = current_buffer;
+         mode_line_target so that display_mode_element will output into
+         mode_line_noprop_buf; then display the title.  */
+      record_unwind_protect (unwind_format_mode_line,
+                             format_mode_line_unwind_data (current_buffer));
+
       set_buffer_internal_1 (XBUFFER (XWINDOW (f->selected_window)->buffer));
       fmt = FRAME_ICONIFIED_P (f) ? Vicon_title_format : Vframe_title_format;
-      frame_title_ptr = frame_title_buf;
+
+      mode_line_target = MODE_LINE_TITLE;
+      title_start = MODE_LINE_NOPROP_LEN (0);
       init_iterator (&it, XWINDOW (f->selected_window), -1, -1,
                      NULL, DEFAULT_FACE_ID);
       display_mode_element (&it, 0, -1, -1, fmt, Qnil, 0);
-      len = frame_title_ptr - frame_title_buf;
-      frame_title_ptr = NULL;
-      set_buffer_internal_1 (obuf);
+      len = MODE_LINE_NOPROP_LEN (title_start);
+      title = mode_line_noprop_buf + title_start;
+      unbind_to (count, Qnil);
 
       /* Set the title only if it's changed.  This avoids consing in
          the common case where it hasn't.  (If it turns out that we've
@@ -8298,8 +8382,8 @@ x_consider_frame_title (frame)
          higher level than this.)  */
       if (! STRINGP (f->name)
           || SBYTES (f->name) != len
-          || bcmp (frame_title_buf, SDATA (f->name), len) != 0)
-        x_implicitly_set_name (f, make_string (frame_title_buf, len), Qnil);
+          || bcmp (title, SDATA (f->name), len) != 0)
+        x_implicitly_set_name (f, make_string (title, len), Qnil);
     }
 }
 
@@ -15600,6 +15684,7 @@ display_mode_line (w, face_id, format)
 {
   struct it it;
   struct face *face;
+  int count = SPECPDL_INDEX ();
 
   init_iterator (&it, w, -1, -1, NULL, face_id);
   prepare_desired_row (it.glyph_row);
@@ -15610,6 +15695,11 @@ display_mode_line (w, face_id, format)
     /* Force the mode-line to be displayed in the default face.  */
     it.base_face_id = it.face_id = DEFAULT_FACE_ID;
 
+  record_unwind_protect (unwind_format_mode_line,
+                         format_mode_line_unwind_data (NULL));
+
+  mode_line_target = MODE_LINE_DISPLAY;
+
   /* Temporarily make frame's keyboard the current kboard so that
      kboard-local variables in the mode_line_format will get the right
      values.  */
@@ -15617,6 +15707,8 @@ display_mode_line (w, face_id, format)
   display_mode_element (&it, 0, 0, 0, format, Qnil, 0);
   pop_frame_kboard ();
 
+  unbind_to (count, Qnil);
+
   /* Fill up with spaces.  */
   display_string (" ", Qnil, Qnil, 0, 0, &it, 10000, -1, -1, 0);
 
@@ -15639,18 +15731,6 @@ display_mode_line (w, face_id, format)
   return it.glyph_row->height;
 }
 
-/* Alist that caches the results of :propertize.
-   Each element is (PROPERTIZED-STRING . PROPERTY-LIST).  */
-Lisp_Object mode_line_proptrans_alist;
-
-/* List of strings making up the mode-line.  */
-Lisp_Object mode_line_string_list;
-
-/* Base face property when building propertized mode line string.  */
-static Lisp_Object mode_line_string_face;
-static Lisp_Object mode_line_string_face_prop;
-
-
 /* Contribute ELT to the mode line for window IT->w.  How it
    translates into text depends on its data type.
 
@@ -15671,8 +15751,9 @@ static Lisp_Object mode_line_string_face_prop;
    If RISKY is nonzero, remove (disregard) any properties in any string
    we encounter, and ignore :eval and :propertize.
 
-   If the global variable `frame_title_ptr' is non-NULL, then the output
-   is passed to `store_frame_title' instead of `display_string'.  */
+   The global variable `mode_line_target' determines whether the
+   output is passed to `store_mode_line_noprop',
+   `store_mode_line_string', or `display_string'.  */
 
 static int
 display_mode_element (it, depth, field_width, precision, elt, props, risky)
@@ -15761,21 +15842,27 @@ display_mode_element (it, depth, field_width, precision, elt, props, risky)
         if (literal)
           {
             prec = precision - n;
-            if (frame_title_ptr)
-              n += store_frame_title (SDATA (elt), -1, prec);
-            else if (!NILP (mode_line_string_list))
-              n += store_mode_line_string (NULL, elt, 1, 0, prec, Qnil);
-            else
-              n += display_string (NULL, elt, Qnil, 0, 0, it,
-                                   0, prec, 0, STRING_MULTIBYTE (elt));
+            switch (mode_line_target)
+              {
+              case MODE_LINE_NOPROP:
+              case MODE_LINE_TITLE:
+                n += store_mode_line_noprop (SDATA (elt), -1, prec);
+                break;
+              case MODE_LINE_STRING:
+                n += store_mode_line_string (NULL, elt, 1, 0, prec, Qnil);
+                break;
+              case MODE_LINE_DISPLAY:
+                n += display_string (NULL, elt, Qnil, 0, 0, it,
+                                     0, prec, 0, STRING_MULTIBYTE (elt));
+                break;
+              }
 
             break;
           }
 
         while ((precision <= 0 || n < precision)
                && *this
-               && (frame_title_ptr
-                   || !NILP (mode_line_string_list)
+               && (mode_line_target != MODE_LINE_DISPLAY
                    || it->current_x < it->last_visible_x))
           {
             const unsigned char *last = this;
@@ -15796,29 +15883,36 @@ display_mode_element (it, depth, field_width, precision, elt, props, risky)
                 prec = c_string_width (last, this - last, precision - n,
                                        &nchars, &nbytes);
 
-                if (frame_title_ptr)
-                  n += store_frame_title (last, 0, prec);
-                else if (!NILP (mode_line_string_list))
+                switch (mode_line_target)
                   {
-                    int bytepos = last - lisp_string;
-                    int charpos = string_byte_to_char (elt, bytepos);
-                    int endpos = (precision <= 0
-                                  ? string_byte_to_char (elt,
-                                                         this - lisp_string)
-                                  : charpos + nchars);
-
-                    n += store_mode_line_string (NULL,
-                                                 Fsubstring (elt, make_number (charpos),
-                                                             make_number (endpos)),
-                                                 0, 0, 0, Qnil);
-                  }
-                else
-                  {
-                    int bytepos = last - lisp_string;
-                    int charpos = string_byte_to_char (elt, bytepos);
-                    n += display_string (NULL, elt, Qnil, 0, charpos,
-                                         it, 0, prec, 0,
-                                         STRING_MULTIBYTE (elt));
+                  case MODE_LINE_NOPROP:
+                  case MODE_LINE_TITLE:
+                    n += store_mode_line_noprop (last, 0, prec);
+                    break;
+                  case MODE_LINE_STRING:
+                    {
+                      int bytepos = last - lisp_string;
+                      int charpos = string_byte_to_char (elt, bytepos);
+                      int endpos = (precision <= 0
+                                    ? string_byte_to_char (elt,
+                                                           this - lisp_string)
+                                    : charpos + nchars);
+
+                      n += store_mode_line_string (NULL,
+                                                   Fsubstring (elt, make_number (charpos),
+                                                               make_number (endpos)),
+                                                   0, 0, 0, Qnil);
+                    }
+                    break;
+                  case MODE_LINE_DISPLAY:
+                    {
+                      int bytepos = last - lisp_string;
+                      int charpos = string_byte_to_char (elt, bytepos);
+                      n += display_string (NULL, elt, Qnil, 0, charpos,
+                                           it, 0, prec, 0,
+                                           STRING_MULTIBYTE (elt));
+                    }
+                    break;
                   }
               }
             else /* c == '%' */
@@ -15856,44 +15950,51 @@ display_mode_element (it, depth, field_width, precision, elt, props, risky)
                     spec
                       = decode_mode_spec (it->w, c, field, prec, &multibyte);
 
-                    if (frame_title_ptr)
-                      n += store_frame_title (spec, field, prec);
-                    else if (!NILP (mode_line_string_list))
-                      {
-                        int len = strlen (spec);
-                        Lisp_Object tem = make_string (spec, len);
-                        props = Ftext_properties_at (make_number (charpos), elt);
-                        /* Should only keep face property in props */
-                        n += store_mode_line_string (NULL, tem, 0, field, prec, props);
-                      }
-                    else
+                    switch (mode_line_target)
                       {
-                        int nglyphs_before, nwritten;
-
-                        nglyphs_before = it->glyph_row->used[TEXT_AREA];
-                        nwritten = display_string (spec, Qnil, elt,
-                                                   charpos, 0, it,
-                                                   field, prec, 0,
-                                                   multibyte);
-
-                        /* Assign to the glyphs written above the
-                           string where the `%x' came from, position
-                           of the `%'.  */
-                        if (nwritten > 0)
-                          {
-                            struct glyph *glyph
-                              = (it->glyph_row->glyphs[TEXT_AREA]
-                                 + nglyphs_before);
-                            int i;
-
-                            for (i = 0; i < nwritten; ++i)
-                              {
-                                glyph[i].object = elt;
-                                glyph[i].charpos = charpos;
-                              }
-
-                            n += nwritten;
-                          }
+                      case MODE_LINE_NOPROP:
+                      case MODE_LINE_TITLE:
+                        n += store_mode_line_noprop (spec, field, prec);
+                        break;
+                      case MODE_LINE_STRING:
+                        {
+                          int len = strlen (spec);
+                          Lisp_Object tem = make_string (spec, len);
+                          props = Ftext_properties_at (make_number (charpos), elt);
+                          /* Should only keep face property in props */
+                          n += store_mode_line_string (NULL, tem, 0, field, prec, props);
+                        }
+                        break;
+                      case MODE_LINE_DISPLAY:
+                        {
+                          int nglyphs_before, nwritten;
+
+                          nglyphs_before = it->glyph_row->used[TEXT_AREA];
+                          nwritten = display_string (spec, Qnil, elt,
+                                                     charpos, 0, it,
+                                                     field, prec, 0,
+                                                     multibyte);
+
+                          /* Assign to the glyphs written above the
+                             string where the `%x' came from, position
+                             of the `%'.  */
+                          if (nwritten > 0)
+                            {
+                              struct glyph *glyph
+                                = (it->glyph_row->glyphs[TEXT_AREA]
+                                   + nglyphs_before);
+                              int i;
+
+                              for (i = 0; i < nwritten; ++i)
+                                {
+                                  glyph[i].object = elt;
+                                  glyph[i].charpos = charpos;
+                                }
+
+                              n += nwritten;
+                            }
+                        }
+                        break;
                       }
                   }
                 else /* c == 0 */
@@ -16064,13 +16165,20 @@ display_mode_element (it, depth, field_width, precision, elt, props, risky)
   /* Pad to FIELD_WIDTH.  */
   if (field_width > 0 && n < field_width)
     {
-      if (frame_title_ptr)
-        n += store_frame_title ("", field_width - n, 0);
-      else if (!NILP (mode_line_string_list))
-        n += store_mode_line_string ("", Qnil, 0, field_width - n, 0, Qnil);
-      else
-        n += display_string ("", Qnil, Qnil, 0, 0, it, field_width - n,
-                             0, 0, 0);
+      switch (mode_line_target)
+        {
+        case MODE_LINE_NOPROP:
+        case MODE_LINE_TITLE:
+          n += store_mode_line_noprop ("", field_width - n, 0);
+          break;
+        case MODE_LINE_STRING:
+          n += store_mode_line_string ("", Qnil, 0, field_width - n, 0, Qnil);
+          break;
+        case MODE_LINE_DISPLAY:
+          n += display_string ("", Qnil, Qnil, 0, 0, it, field_width - n,
+                               0, 0, 0);
+          break;
+        }
     }
 
   return n;
@@ -16202,6 +16310,9 @@ are the selected window and the window's buffer).  */)
   struct buffer *old_buffer = NULL;
   int face_id = -1;
   int no_props = INTEGERP (face);
+  int count = SPECPDL_INDEX ();
+  Lisp_Object str;
+  int string_start = 0;
 
   if (NILP (window))
     window = selected_window;
@@ -16229,64 +16340,50 @@ are the selected window and the window's buffer).  */)
     face_id = DEFAULT_FACE_ID;
 
   if (XBUFFER (buffer) != current_buffer)
-    {
-      old_buffer = current_buffer;
-      set_buffer_internal_1 (XBUFFER (buffer));
-    }
+    old_buffer = current_buffer;
+
+  record_unwind_protect (unwind_format_mode_line,
+                         format_mode_line_unwind_data (old_buffer));
+
+  if (old_buffer)
+    set_buffer_internal_1 (XBUFFER (buffer));
 
   init_iterator (&it, w, -1, -1, NULL, face_id);
 
-  if (!no_props)
+  if (no_props)
     {
-      mode_line_string_face = face;
-      mode_line_string_face_prop
-        = (NILP (face) ? Qnil : Fcons (Qface, Fcons (face, Qnil)));
-
-      /* We need a dummy last element in mode_line_string_list to
-         indicate we are building the propertized mode-line string.
-         Using mode_line_string_face_prop here GC protects it.  */
-      mode_line_string_list
-        = Fcons (mode_line_string_face_prop, Qnil);
-      frame_title_ptr = NULL;
+      mode_line_target = MODE_LINE_NOPROP;
+      mode_line_string_face_prop = Qnil;
+      mode_line_string_list = Qnil;
+      string_start = MODE_LINE_NOPROP_LEN (0);
     }
   else
     {
-      mode_line_string_face_prop = Qnil;
+      mode_line_target = MODE_LINE_STRING;
       mode_line_string_list = Qnil;
-      frame_title_ptr = frame_title_buf;
+      mode_line_string_face = face;
+      mode_line_string_face_prop
+        = (NILP (face) ? Qnil : Fcons (Qface, Fcons (face, Qnil)));
     }
 
   push_frame_kboard (it.f);
   display_mode_element (&it, 0, 0, 0, format, Qnil, 0);
   pop_frame_kboard ();
 
-  if (old_buffer)
-    set_buffer_internal_1 (old_buffer);
-
-  if (!no_props)
+  if (no_props)
     {
-      Lisp_Object str;
-      mode_line_string_list = Fnreverse (mode_line_string_list);
-      str = Fmapconcat (intern ("identity"), XCDR (mode_line_string_list),
-                        make_string ("", 0));
-      mode_line_string_face_prop = Qnil;
-      mode_line_string_list = Qnil;
-      return str;
+      len = MODE_LINE_NOPROP_LEN (string_start);
+      str = make_string (mode_line_noprop_buf + string_start, len);
     }
-
-  len = frame_title_ptr - frame_title_buf;
-  if (len > 0 && frame_title_ptr[-1] == '-')
+  else
     {
-      /* Mode lines typically ends with numerous dashes; reduce to two dashes.  */
-      while (frame_title_ptr > frame_title_buf && *--frame_title_ptr == '-')
-        ;
-      frame_title_ptr += 3;  /* restore last non-dash + two dashes */
-      if (len > frame_title_ptr - frame_title_buf)
-        len = frame_title_ptr - frame_title_buf;
+      mode_line_string_list = Fnreverse (mode_line_string_list);
+      str = Fmapconcat (intern ("identity"), mode_line_string_list,
+                        make_string ("", 0));
     }
 
-  frame_title_ptr = NULL;
-  return make_string (frame_title_buf, len);
+  unbind_to (count, Qnil);
+  return str;
 }
 
 /* Write a null-terminated, right justified decimal representation of
@@ -16604,7 +16701,8 @@ decode_mode_spec (w, c, field_width, precision, multibyte)
         register int i;
 
         /* Let lots_of_dashes be a string of infinite length.  */
-        if (!NILP (mode_line_string_list))
+        if (mode_line_target == MODE_LINE_NOPROP ||
+            mode_line_target == MODE_LINE_STRING)
           return "--";
         if (field_width <= 0
             || field_width > sizeof (lots_of_dashes))
@@ -21407,7 +21505,7 @@ note_mode_line_or_margin_highlight (window, x, y, area)
                tmp_glyph->charpos >= XINT (b);
                tmp_glyph--, gpos++)
             {
-              if (tmp_glyph->object != glyph->object)
+              if (!EQ (tmp_glyph->object, glyph->object))
                 break;
             }
 
@@ -21420,7 +21518,7 @@ note_mode_line_or_margin_highlight (window, x, y, area)
                tmp_glyph->charpos < XINT (e);
                tmp_glyph++, gseq_length++)
               {
-                if (tmp_glyph->object != glyph->object)
+                if (!EQ (tmp_glyph->object, glyph->object))
                   break;
               }
 
@@ -22698,9 +22796,14 @@ syms_of_xdisp ()
 
   mode_line_proptrans_alist = Qnil;
   staticpro (&mode_line_proptrans_alist);
-
   mode_line_string_list = Qnil;
   staticpro (&mode_line_string_list);
+  mode_line_string_face = Qnil;
+  staticpro (&mode_line_string_face);
+  mode_line_string_face_prop = Qnil;
+  staticpro (&mode_line_string_face_prop);
+  Vmode_line_unwind_vector = Qnil;
+  staticpro (&Vmode_line_unwind_vector);
 
   help_echo_string = Qnil;
   staticpro (&help_echo_string);
@@ -23050,9 +23153,10 @@ init_xdisp ()
     /* Allocate the buffer for frame titles.
        Also used for `format-mode-line'.  */
     int size = 100;
-    frame_title_buf = (char *) xmalloc (size);
-    frame_title_buf_end = frame_title_buf + size;
-    frame_title_ptr = NULL;
+    mode_line_noprop_buf = (char *) xmalloc (size);
+    mode_line_noprop_buf_end = mode_line_noprop_buf + size;
+    mode_line_noprop_ptr = mode_line_noprop_buf;
+    mode_line_target = MODE_LINE_DISPLAY;
   }
 
   help_echo_showing_p = 0;
diff --git a/src/xfaces.c b/src/xfaces.c
index 2884bccb3b9..953276aef83 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -6452,12 +6452,12 @@ build_scalable_font_name (f, font, specified_pt)
   if (font->numeric[XLFD_RESY] != 0)
     {
       pt = resy / font->numeric[XLFD_RESY] * specified_pt + 0.5;
-      pixel_value = font->numeric[XLFD_RESY] / (PT_PER_INCH * 10.0) * pt;
+      pixel_value = font->numeric[XLFD_RESY] / (PT_PER_INCH * 10.0) * pt + 0.5;
     }
   else
     {
       pt = specified_pt;
-      pixel_value = resy / (PT_PER_INCH * 10.0) * pt;
+      pixel_value = resy / (PT_PER_INCH * 10.0) * pt + 0.5;
     }
   /* We may need a font of the different size.  */
   pixel_value *= font->rescale_ratio;