19 files changed, 108 insertions, 93 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 4e56e3c8499..533f5cf4327 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,4 @@
-2011-11-10  Paul Eggert  <eggert@cs.ucla.edu>
+2011-11-14  Paul Eggert  <eggert@cs.ucla.edu>
 
         Standardize on VIRT_ADDR_VARIES behavior; otherwise, valgrind
         does not work on some platforms.  Problem reported by Andreas Schwab in
@@ -17,6 +17,51 @@
         * m/ibms390.h, m/intel386.h, m/template.h, s/cygwin.h, s/hpux10-20.h:
         Remove VIRT_ADDR_VARIES no longer needed.
 
+2011-11-12  Eli Zaretskii  <eliz@gnu.org>
+
+        * makefile.w32-in (HEAPSIZE): New variable, allows to build temacs
+        with user-defined heap size.  Bump the default size of the temacs
+        heap to 27MB, to avoid memory warning when running temacs.
+        ($(TEMACS)): Use HEAPSIZE instead of a hardcoded value.
+
+        * dispnew.c (scrolling_window): Fix incorrect indices in accessing
+        current_matrix and desired_matrix.  (Bug#9990)
+        (verify_row_hash) [XASSERTS]: New function.
+        (adjust_glyph_matrix, row_equal_p): Use it in xassert to verify
+        that the hash value of glyph rows is correct.
+
+2011-11-12  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.h (window): Remove splits slot.
+        * window.c (Fwindow_splits, Fset_window_splits): Remove.
+        (Fdelete_other_windows_internal, make_parent_window)
+        (make_window, Fsplit_window_internal, Fdelete_window_internal)
+        (Fset_window_configuration, save_window_save): Don't deal with
+        split status of windows.
+        (saved_window): Remove splits slot.
+        (Vwindow_splits): Rewrite doc-string.
+
+2011-11-11  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xfns.c (unwind_create_frame):
+        * nsfns.m (unwind_create_frame):
+        * w32fns.c (unwind_create_frame): Use Fmemq to check if frame is in
+        Vframe_list (Bug#9999).
+
+2011-11-11  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * xdisp.c (syms_of_xdisp): Remove duplicated definition of Qtext.
+
+2011-11-11  Kenichi Handa  <handa@m17n.org>
+
+        * callproc.c (Fcall_process): Set the member dst_multibyte of
+        process_coding.
+
+2011-11-11  Johan Bockgård  <bojohan@gnu.org>
+
+        * xdisp.c (fill_composite_glyph_string): Always set s->face, to
+        avoid a crash (bug#9496).
+
 2011-11-09  Chong Yidong  <cyd@gnu.org>
 
         * window.c (Fwindow_inside_edges, Fwindow_inside_pixel_edges)
diff --git a/src/ChangeLog.11 b/src/ChangeLog.11
index 0a9df7d1aee..bd1a6ec5918 100644
--- a/src/ChangeLog.11
+++ b/src/ChangeLog.11
@@ -7949,7 +7949,7 @@
 2010-05-11  Karel Klíč  <kklic@redhat.com>
 
         * ftfont.c: Fix incorrect parentheses of #if condition for
-        definining M17N_FLT_USE_NEW_FEATURE.
+        defining M17N_FLT_USE_NEW_FEATURE.
 
 2010-05-11  Glenn Morris  <rgm@gnu.org>
 
@@ -25474,7 +25474,7 @@
 
         * term.c (terminal_encode_buffer): Make externally visible.
 
-        * makefile.w32-in: Add character.h dependancies.
+        * makefile.w32-in: Add character.h dependencies.
         (character.o, chartab.o): New targets.
 
 2008-02-01  Kenichi Handa  <handa@m17n.org>
@@ -29718,7 +29718,7 @@
         * keyboard.c (restore_kboard_configuration): Only define when
         MULTI_KBOARD defined.
 
-        * makefile.w32-in: Update dependancies from Makefile.in.
+        * makefile.w32-in: Update dependencies from Makefile.in.
         (OBJ1): Add terminal.$(O)
 
         * term.c (dissociate_if_controlling_tty) [WINDOWSNT]:
diff --git a/src/ChangeLog.3 b/src/ChangeLog.3
index beb7a0a2ae1..79a580938d7 100644
--- a/src/ChangeLog.3
+++ b/src/ChangeLog.3
@@ -13393,7 +13393,7 @@
 
         * macros.c (Fstart_kbd_macro): Local cleanup.
 
-        * minibuf.c (read_minibuf): No more delcaration of
+        * minibuf.c (read_minibuf): No more declaration of
         Frestore_screen_configuration.
 
         * search.c (Fregexp_quote): Simplified.
diff --git a/src/ChangeLog.7 b/src/ChangeLog.7
index d5bebec660f..fa55d6974ad 100644
--- a/src/ChangeLog.7
+++ b/src/ChangeLog.7
@@ -592,7 +592,7 @@
 
         * coding.h (Qemacs_mule): Extern it.
 
-        * process.c (init_process): Initilize Vdefault_process_coding_system.
+        * process.c (init_process): Initialize Vdefault_process_coding_system.
 
 1998-06-26  Kenichi Handa  <handa@etl.go.jp>
 
@@ -972,7 +972,7 @@
 
 1998-06-01  Ken'ichi Handa  <handa@melange.gnu.org>
 
-        * coding.c (detect_coding_mask): Initilize local variable C.
+        * coding.c (detect_coding_mask): Initialize local variable C.
 
 1998-06-01  Richard Stallman  <rms@gnu.org>
 
@@ -6317,7 +6317,7 @@
         (ENCODE_ISO_CHARACTER_DIMENSION2): Likewise.
         (safe_terminal_coding): New variable.
         (Fset_safe_terminal_coding_system_internal): New function.
-        (init_coding_once): Initilize safe_terminal_coding.
+        (init_coding_once): Initialize safe_terminal_coding.
         (syms_of_coding): Declare set-safe-terminal-coding-system as a
         Lisp function.
 
@@ -7399,7 +7399,7 @@
 
 1997-06-18  Kenichi Handa  <handa@etl.go.jp>
 
-        * coding.c (detect_coding_iso2022): Initilize mask correctly.
+        * coding.c (detect_coding_iso2022): Initialize mask correctly.
 
         * fns.c (concat): Pay attention to multibyte characters when
         TARGET_TYPE is Lisp_String.
diff --git a/src/ChangeLog.8 b/src/ChangeLog.8
index 833119c9fcf..6fd4d5dea27 100644
--- a/src/ChangeLog.8
+++ b/src/ChangeLog.8
@@ -13404,7 +13404,7 @@
 
 1998-10-20  Jason Rumney  <jasonr@altavista.net>
 
-        * makefile.nt (w32fns.c): Add x-list-font.c to dependancies.
+        * makefile.nt (w32fns.c): Add x-list-font.c to dependencies.
 
         * w32faces.c: Update comments referring to obsolete structs.
         (allocate_face, copy_face, face_eql, load_font)
diff --git a/src/ChangeLog.9 b/src/ChangeLog.9
index ceec5da3296..1a4abfab61b 100644
--- a/src/ChangeLog.9
+++ b/src/ChangeLog.9
@@ -4617,7 +4617,7 @@
         * lisp.h (detect_coding_system): Prototype adjusted.
 
         * coding.c (ONE_MORE_BYTE_CHECK_MULTIBYTE): New macro.
-        (detect_coding_emacs_mule, detect_coding_iso2022,)
+        (detect_coding_emacs_mule, detect_coding_iso2022)
         (detect_coding_sjis, detect_coding_big5, detect_coding_utf_8)
         (detect_coding_utf_16, detect_coding_ccl): Make them static.
         New argument MULTIBYTEP.  Callers changed.
diff --git a/src/callproc.c b/src/callproc.c
index 0859aaef2e6..01772efce30 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -712,6 +712,7 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
       /* If BUFFER is nil, we must read process output once and then
          discard it, so setup coding system but with nil.  */
       setup_coding_system (Qnil, &process_coding);
+      process_coding.dst_multibyte = 0;
     }
   else
     {
@@ -747,6 +748,8 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
           && !NILP (val))
         val = raw_text_coding_system (val);
       setup_coding_system (val, &process_coding);
+      process_coding.dst_multibyte
+        = ! NILP (BVAR (current_buffer, enable_multibyte_characters));
     }
   process_coding.src_multibyte = 0;
 
diff --git a/src/dispnew.c b/src/dispnew.c
index 46d1917b144..7b594c5b4e8 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -429,6 +429,25 @@ margin_glyphs_to_reserve (struct window *w, int total_glyphs, Lisp_Object margin
   return n;
 }
 
+#if XASSERTS
+/* Return non-zero if ROW's hash value is correct, zero if not.  */
+int
+verify_row_hash (struct glyph_row *row)
+{
+  int area, k;
+  unsigned row_hash = 0;
+
+  for (area = LEFT_MARGIN_AREA; area < LAST_AREA; ++area)
+    for (k = 0; k < row->used[area]; ++k)
+      row_hash = ((((row_hash << 4) + (row_hash >> 24)) & 0x0fffffff)
+                  + row->glyphs[area][k].u.val
+                  + row->glyphs[area][k].face_id
+                  + row->glyphs[area][k].padding_p
+                  + (row->glyphs[area][k].type << 2));
+
+  return row_hash == row->hash;
+}
+#endif
 
 /* Adjust glyph matrix MATRIX on window W or on a frame to changed
    window sizes.
@@ -600,6 +619,7 @@ adjust_glyph_matrix (struct window *w, struct glyph_matrix *matrix, int x, int y
                   row->glyphs[LAST_AREA]
                     = row->glyphs[LEFT_MARGIN_AREA] + dim.width;
                 }
+              xassert (!row->enabled_p || verify_row_hash (row));
               ++row;
             }
         }
@@ -1271,6 +1291,9 @@ line_draw_cost (struct glyph_matrix *matrix, int vpos)
 static inline int
 row_equal_p (struct glyph_row *a, struct glyph_row *b, int mouse_face_p)
 {
+  xassert (verify_row_hash (a));
+  xassert (verify_row_hash (b));
+
   if (a == b)
     return 1;
   else if (a->hash != b->hash)
@@ -4334,10 +4357,10 @@ scrolling_window (struct window *w, int header_line_p)
   j = last_old;
   while (i - 1 > first_new
          && j - 1 > first_old
-         && MATRIX_ROW (current_matrix, i - 1)->enabled_p
-         && (MATRIX_ROW (current_matrix, i - 1)->y
-             == MATRIX_ROW (desired_matrix, j - 1)->y)
-         && !MATRIX_ROW (desired_matrix, j - 1)->redraw_fringe_bitmaps_p
+         && MATRIX_ROW (current_matrix, j - 1)->enabled_p
+         && (MATRIX_ROW (current_matrix, j - 1)->y
+             == MATRIX_ROW (desired_matrix, i - 1)->y)
+         && !MATRIX_ROW (desired_matrix, i - 1)->redraw_fringe_bitmaps_p
          && row_equal_p (MATRIX_ROW (desired_matrix, i - 1),
                          MATRIX_ROW (current_matrix, j - 1), 1))
     --i, --j;
diff --git a/src/keyboard.c b/src/keyboard.c
index 11c37d14f64..f8c31af3fbe 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -8133,7 +8133,7 @@ parse_tool_bar_item (Lisp_Object key, Lisp_Object item)
   Lisp_Object caption;
   int i, have_label = 0;
 
-  /* Defininition looks like `(menu-item CAPTION BINDING PROPS...)'.
+  /* Definition looks like `(menu-item CAPTION BINDING PROPS...)'.
      Rule out items that aren't lists, don't start with
      `menu-item' or whose rest following `tool-bar-item' is not a
      list.  */
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index e97f7f3aca4..36e4511d845 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -24,6 +24,9 @@ ALL = emacs
 # Set EMACSLOADPATH correctly (in case already defined in environment).
 EMACSLOADPATH=$(CURDIR)/../lisp
 
+# Size in MBs of the static heap in temacs.exe.
+HEAPSIZE = 27
+
 #
 # HAVE_CONFIG_H is required by some generic gnu sources stuck into
 # the emacs source tree.
@@ -177,7 +180,7 @@ temacs:         stamp_BLD $(TEMACS)
 $(TEMACS):      $(TLIB0) $(TLIB1) $(TLIB2) $(TLASTLIB) $(TOBJ) $(TRES) \
                   ../nt/$(BLD)/addsection.exe $(GNULIB)
         $(LINK) $(LINK_OUT)$(TEMACS_TMP) $(FULL_LINK_FLAGS) $(TOBJ) $(TRES) $(LIBS)
-        "$(THISDIR)/../nt/$(BLD)/addsection" "$(TEMACS_TMP)" "$(TEMACS)" EMHEAP 21
+        "$(THISDIR)/../nt/$(BLD)/addsection" "$(TEMACS_TMP)" "$(TEMACS)" EMHEAP $(HEAPSIZE)
 
 # These omit firstfile.${O}, but there's no documentation in there
 # anyways.
diff --git a/src/nsfns.m b/src/nsfns.m
index 23362433a39..20b021c6f5d 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -1057,7 +1057,7 @@ unwind_create_frame (Lisp_Object frame)
     return Qnil;
 
   /* If frame is ``official'', nothing to do.  */
-  if (!CONSP (Vframe_list) || !EQ (XCAR (Vframe_list), frame))
+  if (NILP (Fmemq (frame, Vframe_list)))
     {
 #if GLYPH_DEBUG && XASSERTS
       struct ns_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f);
diff --git a/src/s/hpux10-20.h b/src/s/hpux10-20.h
index 98bee64eb08..be457498add 100644
--- a/src/s/hpux10-20.h
+++ b/src/s/hpux10-20.h
@@ -89,7 +89,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #undef HAVE_RANDOM
 
 
-/* Rainer Malzbender <rainer@displaytech.com> says definining
+/* Rainer Malzbender <rainer@displaytech.com> says defining
    HAVE_XRMSETDATABASE allows Emacs to compile on HP-UX 10.20 using GCC.  */
 #ifndef HAVE_XRMSETDATABASE
 #define HAVE_XRMSETDATABASE
diff --git a/src/w32fns.c b/src/w32fns.c
index 6f32442514a..ffbcff86694 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -3986,7 +3986,7 @@ unwind_create_frame (Lisp_Object frame)
   struct frame *f = XFRAME (frame);
 
   /* If frame is ``official'', nothing to do.  */
-  if (!CONSP (Vframe_list) || !EQ (XCAR (Vframe_list), frame))
+  if (NILP (Fmemq (frame, Vframe_list)))
     {
 #if GLYPH_DEBUG
       struct w32_display_info *dpyinfo = FRAME_W32_DISPLAY_INFO (f);
diff --git a/src/w32font.c b/src/w32font.c
index 26bf4207de5..365f8b78a5e 100644
--- a/src/w32font.c
+++ b/src/w32font.c
@@ -2221,7 +2221,7 @@ font_supported_scripts (FONTSIGNATURE * sig)
      so don't need to mark them separately.  */
   /* 1: Latin-1 supplement, 2: Latin Extended A, 3: Latin Extended B.  */
   SUBRANGE (4, Qphonetic);
-  /* 5: Spacing and tone modifiers, 6: Combining Diacriticals.  */
+  /* 5: Spacing and tone modifiers, 6: Combining Diacritical Marks.  */
   SUBRANGE (7, Qgreek);
   SUBRANGE (8, Qcoptic);
   SUBRANGE (9, Qcyrillic);
@@ -2311,7 +2311,7 @@ font_supported_scripts (FONTSIGNATURE * sig)
   /* 115: Saurashtra, 116: Kayah Li, 117: Rejang.  */
   SUBRANGE (118, Qcham);
   /* 119: Ancient symbols, 120: Phaistos Disc.  */
-  /* 121: Carian, Lycian, Lydian, 122: Dominos, Mah Jong tiles.  */
+  /* 121: Carian, Lycian, Lydian, 122: Dominoes, Mahjong tiles.  */
   /* 123-127: Reserved.  */
 
   /* There isn't really a main symbol range, so include symbol if any
diff --git a/src/window.c b/src/window.c
index 83a8974e88d..0a780a0170a 100644
--- a/src/window.c
+++ b/src/window.c
@@ -465,41 +465,6 @@ Return nil if WINDOW has no previous sibling.  */)
   return decode_any_window (window)->prev;
 }
 
-DEFUN ("window-splits", Fwindow_splits, Swindow_splits, 0, 1, 0,
-       doc: /* Return splits status for the window WINDOW.
-If WINDOW is omitted or nil, it defaults to the selected window.
-
-If the value returned by this function is nil and WINDOW is resized, the
-corresponding space is preferably taken from (or given to) WINDOW's
-right sibling.  When WINDOW is deleted, its space is given to its left
-sibling.
-
-If the value returned by this function is non-nil, resizing and deleting
-WINDOW may resize all windows in the same combination.  */)
-  (Lisp_Object window)
-{
-  return decode_any_window (window)->splits;
-}
-
-DEFUN ("set-window-splits", Fset_window_splits, Sset_window_splits, 2, 2, 0,
-       doc: /* Set splits status of window WINDOW to STATUS.
-If WINDOW is omitted or nil, it defaults to the selected window.
-
-If STATUS is nil and WINDOW is later resized, the corresponding space is
-preferably taken from (or given to) WINDOW's right sibling.  When WINDOW
-is deleted, its space is given to its left sibling.
-
-If STATUS is non-nil, resizing and deleting WINDOW may resize all
-windows in the same combination.  */)
-  (Lisp_Object window, Lisp_Object status)
-{
-  register struct window *w = decode_any_window (window);
-
-  w->splits = status;
-
-  return w->splits;
-}
-
 DEFUN ("window-nest", Fwindow_nest, Swindow_nest, 0, 1, 0,
        doc: /* Return nest status of window WINDOW.
 If WINDOW is omitted or nil, it defaults to the selected window.
@@ -2769,9 +2734,6 @@ window-start value is reasonable when this function is called.  */)
 
   replace_window (root, window, 1);
 
-  /* Reset WINDOW's splits status.  */
-  w->splits = Qnil;
-
   /* This must become SWINDOW anyway ....... */
   if (!NILP (w->buffer) && !resize_failed)
     {
@@ -3286,7 +3248,6 @@ make_parent_window (Lisp_Object window, int horflag)
   p->start = Qnil;
   p->pointm = Qnil;
   p->buffer = Qnil;
-  p->splits = Qnil;
   p->nest = Qnil;
   p->window_parameters = Qnil;
 }
@@ -3334,7 +3295,7 @@ make_window (void)
   w->start_at_line_beg = w->display_table = w->dedicated = Qnil;
   w->base_line_number = w->base_line_pos = w->region_showing = Qnil;
   w->column_number_displayed = w->redisplay_end_trigger = Qnil;
-  w->splits = w->nest = w->window_parameters = Qnil;
+  w->nest = w->window_parameters = Qnil;
   w->prev_buffers = w->next_buffers = Qnil;
   /* Initialize non-Lisp data.  */
   w->desired_matrix = w->current_matrix = 0;
@@ -3776,10 +3737,6 @@ set correctly.  See the code of `split-window' for how this is done.  */)
       p = XWINDOW (o->parent);
       /* Store value of `window-nest' in new parent's nest slot.  */
       p->nest = Vwindow_nest;
-      /* Have PARENT inherit splits slot value from OLD.  */
-      p->splits = o->splits;
-      /* Store value of `window-splits' in OLD's splits slot.  */
-      o->splits = Vwindow_splits;
       /* These get applied below.  */
       p->new_total = horflag ? o->total_cols : o->total_lines;
       p->new_normal = new_normal;
@@ -3830,9 +3787,6 @@ set correctly.  See the code of `split-window' for how this is done.  */)
   n->scroll_bar_width = r->scroll_bar_width;
   n->vertical_scroll_bar_type = r->vertical_scroll_bar_type;
 
-  /* Store `window-splits' in NEW's splits slot.  */
-  n->splits = Vwindow_splits;
-
   /* Directly assign orthogonal coordinates and sizes.  */
   if (horflag)
     {
@@ -3972,7 +3926,6 @@ Signal an error when WINDOW is the only window on its frame.  */)
              PARENT (the nest slot is not inherited).  */
           s->normal_cols = p->normal_cols;
           s->normal_lines = p->normal_lines;
-          s->splits = p->splits;
           /* Mark PARENT as deleted.  */
           p->vchild = p->hchild = Qnil;
           /* Try to merge SIBLING into its new parent.  */
@@ -5359,7 +5312,7 @@ struct saved_window
   Lisp_Object left_margin_cols, right_margin_cols;
   Lisp_Object left_fringe_width, right_fringe_width, fringes_outside_margins;
   Lisp_Object scroll_bar_width, vertical_scroll_bar_type, dedicated;
-  Lisp_Object splits, nest, window_parameters;
+  Lisp_Object nest, window_parameters;
 };
 
 #define SAVED_WINDOW_N(swv,n) \
@@ -5590,7 +5543,6 @@ the return value is nil.  Otherwise the value is t.  */)
           w->scroll_bar_width = p->scroll_bar_width;
           w->vertical_scroll_bar_type = p->vertical_scroll_bar_type;
           w->dedicated = p->dedicated;
-          w->splits = p->splits;
           w->nest = p->nest;
           w->window_parameters = p->window_parameters;
           XSETFASTINT (w->last_modified, 0);
@@ -5869,7 +5821,6 @@ save_window_save (Lisp_Object window, struct Lisp_Vector *vector, int i)
       p->scroll_bar_width = w->scroll_bar_width;
       p->vertical_scroll_bar_type = w->vertical_scroll_bar_type;
       p->dedicated = w->dedicated;
-      p->splits = w->splits;
       p->nest = w->nest;
       p->window_parameters = w->window_parameters;
       if (!NILP (w->buffer))
@@ -6333,7 +6284,7 @@ freeze_window_starts (struct frame *f, int freeze_p)
    and the like.
 
    This ignores a couple of things like the dedicatedness status of
-   window, splits, nest and the like.  This might have to be fixed.  */
+   window, nest and the like.  This might have to be fixed.  */
 
 int
 compare_window_configurations (Lisp_Object configuration1, Lisp_Object configuration2, int ignore_positions)
@@ -6545,16 +6496,7 @@ variable is non-nil, splitting a window may resize all windows in the
 same combination.  This also allows to split a window that is otherwise
 too small or of fixed size.
 
-The value of this variable is also assigned to the split status of the
-new window and, provided the old and new window form a new combination,
-to the window that was split as well.  The split status of a window can
-be retrieved with the function `window-splits' and altered by the
-function `set-window-splits'.
-
-If the value of the variable `window-nest' is non-nil, the space for the
-new window is exclusively taken from the window that shall be split, but
-the split status of the window that is split as well as that of the new
-window are still set to the value of this variable.  */);
+This variable takes no effect if `window-nest' is non-nil.  */);
   Vwindow_splits = Qnil;
 
   DEFVAR_LISP ("window-nest", Vwindow_nest,
@@ -6591,8 +6533,6 @@ function `window-nest' and altered by the function `set-window-nest'.  */);
   defsubr (&Swindow_left_child);
   defsubr (&Swindow_next_sibling);
   defsubr (&Swindow_prev_sibling);
-  defsubr (&Swindow_splits);
-  defsubr (&Sset_window_splits);
   defsubr (&Swindow_nest);
   defsubr (&Sset_window_nest);
   defsubr (&Swindow_use_time);
diff --git a/src/window.h b/src/window.h
index 6a9641e3e6d..c11235bd67b 100644
--- a/src/window.h
+++ b/src/window.h
@@ -258,10 +258,6 @@ struct window
        must run the redisplay-end-trigger-hook.  */
     Lisp_Object redisplay_end_trigger;
 
-    /* Non-nil means deleting or resizing this window distributes
-       space among all windows in the same combination.  */
-    Lisp_Object splits;
-
     /* Non-nil means this window's child windows are never
        (re-)combined.  */
     Lisp_Object nest;
diff --git a/src/xdisp.c b/src/xdisp.c
index b4eaef9d0c7..dfb794f38d3 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -22121,6 +22121,12 @@ fill_composite_glyph_string (struct glyph_string *s, struct face *base_face,
     }
   s->cmp_to = i;
 
+  if (s->face == NULL)
+    {
+      s->face = base_face->ascii_face;
+      s->font = s->face->font;
+    }
+
   /* All glyph strings for the same composition has the same width,
      i.e. the width set for the first component of the composition.  */
   s->width = s->first_glyph->pixel_width;
@@ -27968,7 +27974,6 @@ syms_of_xdisp (void)
   DEFSYM (Qhollow, "hollow");
   DEFSYM (Qhand, "hand");
   DEFSYM (Qarrow, "arrow");
-  DEFSYM (Qtext, "text");
   DEFSYM (Qinhibit_free_realized_faces, "inhibit-free-realized-faces");
 
   list_of_error = Fcons (Fcons (intern_c_string ("error"),
diff --git a/src/xfaces.c b/src/xfaces.c
index 9faa7c79e0b..0ed6fa1d8e2 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -27,7 +27,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
    1. Font family name.
 
-   2. Font foundary name.
+   2. Font foundry name.
 
    3. Relative proportionate width, aka character set width or set
    width (swidth), e.g. `semi-compressed'.
diff --git a/src/xfns.c b/src/xfns.c
index 49c4c774cae..2359a1a82c2 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -2929,7 +2929,7 @@ unwind_create_frame (Lisp_Object frame)
     return Qnil;
 
   /* If frame is ``official'', nothing to do.  */
-  if (!CONSP (Vframe_list) || !EQ (XCAR (Vframe_list), frame))
+  if (NILP (Fmemq (frame, Vframe_list)))
     {
 #if GLYPH_DEBUG && XASSERTS
       struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f);