diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-07-10 23:05:57 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-07-10 23:05:57 -0700 |
| commit | da85a02af7585384008d3ebec836a7b8571f175d (patch) | |
| tree | e6d4f34119ea1c45985eaed207ef6b47f650ea93 /lib-src | |
| parent | 7f5515125fbc9b46454e1f84b7e3052a0a5326f0 (diff) | |
| parent | 4d45a8b7a237e1d33d0ae71d95a0ed7165ea6cda (diff) | |
| download | emacs-da85a02af7585384008d3ebec836a7b8571f175d.tar.gz emacs-da85a02af7585384008d3ebec836a7b8571f175d.tar.bz2 emacs-da85a02af7585384008d3ebec836a7b8571f175d.zip | |
Merge from trunk.
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 6 | ||||
| -rw-r--r-- | lib-src/update-game-score.c | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 5d95ec74277..04d0828a8ab 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,4 +1,4 @@ -2011-07-06 Paul Eggert <eggert@cs.ucla.edu> +2011-07-11 Paul Eggert <eggert@cs.ucla.edu> Assume freestanding C89 headers, string.h, stdlib.h. * ebrowse.c: Include stdlib.h unconditionally. @@ -11,6 +11,10 @@ Assume support for memcmp, memcpy, memmove, memset. * etags.c (absolute_filename): Assume memmove exists. +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 diff --git a/lib-src/update-game-score.c b/lib-src/update-game-score.c index 284beafb9d9..2a89379aefe 100644 --- a/lib-src/update-game-score.c +++ b/lib-src/update-game-score.c @@ -64,7 +64,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"); @@ -106,8 +106,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; |