2 files changed, 9 insertions, 5 deletions

diff --git a/src/dispextern.h b/src/dispextern.h
index 1325ff9da28..f2c42de6cd2 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -1542,7 +1542,8 @@ struct glyph_string
    large vertical space.  The heuristics is in the factor of 3.  We
    ignore the ascent and descent values reported by such fonts, and
    instead go by the values reported for individual glyphs.  */
-#define FONT_TOO_HIGH(ft)  ((ft)->ascent + (ft)->descent > 3*(ft)->pixel_size)
+#define FONT_TOO_HIGH(ft)                                               \
+  ((ft)->pixel_size > 0 && (ft)->ascent + (ft)->descent > 3*(ft)->pixel_size)
 
 
 /***********************************************************************
diff --git a/src/w32.c b/src/w32.c
index 71a38b91946..1db34260978 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -2822,10 +2822,13 @@ init_environment (char ** argv)
                   }
                 if (strcmp (env_vars[i].name, "HOME") == 0 && !appdata)
                   Vdelayed_warnings_list
-                    = Fcons (listn (CONSTYPE_HEAP, 2,
-                                    intern ("initialization"),
-                                    build_string ("Setting HOME to C:\\ by default is deprecated")),
-                             Vdelayed_warnings_list);
+                    = Fcons
+                    (listn (CONSTYPE_HEAP, 2,
+                            intern ("initialization"), build_string
+                            ("Use of `C:\\.emacs' without defining `HOME'\n"
+                             "in the environment is deprecated, "
+                             "see `Windows HOME' in the Emacs manual.")),
+                     Vdelayed_warnings_list);
               }
 
             if (lpval)