summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2010-01-29 14:02:02 -0500
committerChong Yidong <cyd@stupidchicken.com>2010-01-29 14:02:02 -0500
commitd38e0e396b7eb4aef61a4b430864b7cb2666b6fb (patch)
treebb2d80328d6f0d9f222984629913880f4c4274b4
parent32d6b4da213cfa2b8a72965cc5e0cb5a26365c3c (diff)
downloademacs-d38e0e396b7eb4aef61a4b430864b7cb2666b6fb.tar.gz
Change default XFT font to 10pt, and default frame height to 35 rows (Bug#3643).
* frame.c (DEFAULT_ROWS): Change default to 35. * xfns.c (x_default_font_parameter): Change default XFT font to monospace-10 (Bug#3643).
-rw-r--r--src/ChangeLog7
-rw-r--r--src/frame.c2
-rw-r--r--src/xfns.c2
3 files changed, 9 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 8b411ebcf9b..dca88045d57 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2010-01-29 Chong Yidong <cyd@stupidchicken.com>
+
+ * frame.c (DEFAULT_ROWS): Change default to 35.
+
+ * xfns.c (x_default_font_parameter): Change default XFT font to
+ monospace-10 (Bug#3643).
+
2010-01-29 Eli Zaretskii <eliz@gnu.org>
* w32inevt.c (key_event): Remove unnecessary comparison of
diff --git a/src/frame.c b/src/frame.c
index 631cc6b06b3..f05f9f751da 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -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
diff --git a/src/xfns.c b/src/xfns.c
index 0ebce8d1e24..96fb090e327 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -3089,7 +3089,7 @@ x_default_font_parameter (f, parms)
= {
#ifdef HAVE_XFT
/* This will find the normal Xft font. */
- "monospace-12",
+ "monospace-10",
#endif
"-adobe-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-1",
"-misc-fixed-medium-r-normal-*-*-140-*-*-c-*-iso8859-1",