merge from upstream

3 files changed, 19 insertions, 3 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index b7a95fe8043..2a4c1024293 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,12 @@
+2011-07-09  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * update-game-score.c (usage): Update usage line.
+
+2011-07-02  Jason Rumney  <jasonr@gnu.org>
+
+        * emacsclient.c (decode_options) [WINDOWSNT]: Avoid tty mode on
+        Windows (Bug#5486).
+
 2011-06-25  Glenn Morris  <rgm@gnu.org>
 
         * emacsclient.c (decode_options) <opt>: Add `F:'.
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index c78a42bffe8..2af139aee6d 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -652,6 +652,14 @@ decode_options (int argc, char **argv)
 an empty string");
       exit (EXIT_FAILURE);
     }
+
+  /* TTY frames not supported on Windows.  Continue using GUI rather than
+     forcing the user to change their command-line.  This is required since
+     tty is set above if certain options are given and $DISPLAY is not set,
+     which is not obvious to users.  */
+  if (tty)
+      tty = 0;
+
 #endif /* WINDOWSNT */
 }
 
diff --git a/lib-src/update-game-score.c b/lib-src/update-game-score.c
index e95e2ce259d..76483c371ff 100644
--- a/lib-src/update-game-score.c
+++ b/lib-src/update-game-score.c
@@ -71,7 +71,7 @@ static int usage (int err) NO_RETURN;
 static int
 usage (int err)
 {
-  fprintf (stdout, "Usage: update-game-score [-m MAX ] [ -r ] game/scorefile SCORE DATA\n");
+  fprintf (stdout, "Usage: update-game-score [-m MAX] [-r] [-d DIR] game/scorefile SCORE DATA\n");
   fprintf (stdout, "       update-game-score -h\n");
   fprintf (stdout, " -h\t\tDisplay this help.\n");
   fprintf (stdout, " -m MAX\t\tLimit the maximum number of scores to MAX.\n");
@@ -113,8 +113,7 @@ static void lose_syserr (const char *msg) NO_RETURN;
 #ifndef HAVE_STRERROR
 #ifndef WINDOWSNT
 char *
-strerror (errnum)
-     int errnum;
+strerror (int errnum)
 {
   extern char *sys_errlist[];
   extern int sys_nerr;