Merge from mainline.

5 files changed, 21 insertions, 5 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 38368f33a70..795b6059a6f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,19 @@
+2010-01-30  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * character.h (CHAR_PRINTABLE_P): Reparenthesize to avoid warning.
+
+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
+        event->uChar.AsciiChar with 128.
+
 2010-01-28  Chong Yidong  <cyd@stupidchicken.com>
 
         * fileio.c (Frename_file): Fix last change (Bug#5487).
diff --git a/src/character.h b/src/character.h
index 2d75c9113fb..1f1f6eade84 100644
--- a/src/character.h
+++ b/src/character.h
@@ -136,8 +136,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Nonzero if character C has a printable glyph.  */
 #define CHAR_PRINTABLE_P(c)     \
-  (((c) >= 32 && ((c) < 127)    \
-    || ! NILP (CHAR_TABLE_REF (Vprintable_chars, (c)))))
+  (((c) >= 32 && (c) < 127)     \
+   || ! NILP (CHAR_TABLE_REF (Vprintable_chars, (c))))
 
 /* Return byte length of multibyte form for character C.  */
 #define CHAR_BYTES(c)                   \
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/w32inevt.c b/src/w32inevt.c
index 159751c8b46..864b3b3f0bb 100644
--- a/src/w32inevt.c
+++ b/src/w32inevt.c
@@ -470,7 +470,7 @@ key_event (KEY_EVENT_RECORD *event, struct input_event *emacs_ev, int *isdead)
           emacs_ev->kind = NO_EVENT;
           return 0;
         }
-      else if (event->uChar.AsciiChar > 0 && event->uChar.AsciiChar < 128)
+      else if (event->uChar.AsciiChar > 0)
         {
           emacs_ev->kind = ASCII_KEYSTROKE_EVENT;
           emacs_ev->code = event->uChar.AsciiChar;
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",