mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Merge from trunk.

Browse source
This commit is contained in:
Paul Eggert 2011-07-10 23:05:57 -07:00
commit da85a02af7
83 changed files with 4183 additions and 3590 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib-src/ChangeLog
View file

@ -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

5
lib-src/update-game-score.c
View file

@ -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;