font.c (font_parse_xlfd): If FONT is a font-entity and pixel size in NAME is invalid...

[gnu-emacs] / src / frame.c

diff --git a/src/frame.c b/src/frame.c
index 618acf68b6b85ab8a2bfc93088797bde4ccd639d..f05f9f751da3c1dfbc5fd7f79508ce62d75982eb 100644 (file)
--- a/src/frame.c
+++ b/src/frame.c
@@ -1,6 +1,6 @@
 /* Generic frame functions.
    Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2001, 2002, 2003,
-     2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+     2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -4191,7 +4191,7 @@ On Nextstep, this just calls `ns-parse-geometry'.  */)
 
    This function does not make the coordinates positive.  */
 
-#define DEFAULT_ROWS 40
+#define DEFAULT_ROWS 35
 #define DEFAULT_COLS 80
 
 int