5 files changed, 16 insertions, 11 deletions

diff --git a/src/ChangeLog.3 b/src/ChangeLog.3
index 3cb0d1ac453..5162519148d 100644
--- a/src/ChangeLog.3
+++ b/src/ChangeLog.3
@@ -15583,7 +15583,7 @@
 
 1989-04-29  Joe Arceneaux  (jla@apple-gunkies.ai.mit.edu)
 
-        * xterm.c (x_term_init): Don't set visible bell, as it pre-empts
+        * xterm.c (x_term_init): Don't set visible bell, as it preempts
         .emacs control.
 
 1989-04-26  Richard Stallman  (rms@sugar-bombs.ai.mit.edu)
diff --git a/src/frame.c b/src/frame.c
index c77b016b709..49203fce375 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -7153,11 +7153,11 @@ Gtk+ tooltips are not used) and on Windows.  */);
   tooltip_reuse_hidden_frame = false;
 
   DEFVAR_BOOL ("use-system-tooltips", use_system_tooltips,
-               doc: /* Use the toolkit to display tooltips.
-This option is only meaningful when Emacs is built with GTK+ or Haiku
-windowing support, and results in tooltips that look like those
-displayed by other GTK+ or Haiku programs, but will not be able to
-display text properties inside tooltip text.  */);
+               doc: /* Whether to use the toolkit to display tooltips.
+This option is only meaningful when Emacs is built with GTK+, NS or Haiku
+windowing support, and, if it's non-nil (the default), it results in
+tooltips that look like those displayed by other GTK+/NS/Haiku programs,
+but will not be able to display text properties inside tooltip text.  */);
   use_system_tooltips = true;
 
   DEFVAR_LISP ("iconify-child-frame", iconify_child_frame,
diff --git a/src/keyboard.c b/src/keyboard.c
index 6208b333e9c..850b5e06480 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -2675,7 +2675,7 @@ read_char (int commandflag, Lisp_Object map,
             /* Normal case: no input arrived during redisplay.  */
             break;
 
-          /* Input arrived and pre-empted redisplay.
+          /* Input arrived and preempted redisplay.
              Process any events which are not user-visible.  */
           swallow_events (false);
           /* If that cleared input_pending, try again to redisplay.  */
diff --git a/src/w32.c b/src/w32.c
index deeca031f64..85916ad74a9 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -7681,7 +7681,7 @@ w32_memory_info (unsigned long long *totalram, unsigned long long *freeram,
 {
   MEMORYSTATUS memst;
   MEMORY_STATUS_EX memstex;
-
+  memstex.dwLength = sizeof (memstex);
   /* Use GlobalMemoryStatusEx if available, as it can report more than
      2GB of memory.  */
   if (global_memory_status_ex (&memstex))
@@ -7692,7 +7692,9 @@ w32_memory_info (unsigned long long *totalram, unsigned long long *freeram,
       *freeswap  = memstex.ullAvailPageFile;
       return 0;
     }
-  else if (global_memory_status (&memst))
+
+  memst.dwLength = sizeof (memst);
+  if (global_memory_status (&memst))
     {
       *totalram = memst.dwTotalPhys;
       *freeram   = memst.dwAvailPhys;
diff --git a/src/xdisp.c b/src/xdisp.c
index 0497490928f..2676e982c9e 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -6194,7 +6194,9 @@ handle_single_display_spec (struct it *it, Lisp_Object spec, Lisp_Object object,
             {
               struct face *face = FACE_FROM_ID (it->f, it->face_id);
               it->voffset = - (XFLOATINT (value)
-                               * (normal_char_height (face->font, -1)));
+                               * (face->font
+                                  ? normal_char_height (face->font, -1)
+                                  : FRAME_LINE_HEIGHT (it->f)));
             }
 #endif /* HAVE_WINDOW_SYSTEM */
         }
@@ -32168,7 +32170,8 @@ produce_stretch_glyph (struct it *it)
   /* Compute height.  */
   if (FRAME_WINDOW_P (it->f))
     {
-      int default_height = normal_char_height (font, ' ');
+      int default_height =
+        font ? normal_char_height (font, ' ') : FRAME_LINE_HEIGHT (it->f);
 
       if ((prop = plist_get (plist, QCheight), !NILP (prop))
           && calc_pixel_width_or_height (&tem, it, prop, font, false, NULL))