*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 751db7b..064b4f7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-10  Colin Walters  <walters@verbum.org>
+
+       * configure.in: Add --game-dir, --game-user.  Test to see if we
+       can use them.
+
 2002-04-08  Pavel Jan\e,Bm\e(Bk  <Pavel@Janik.cz>
 
        * configure.in: Add --with-sound.

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 8444748..e480cf1 100644 (file)
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,5 +1,20 @@
 2002-04-10  Colin Walters  <walters@verbum.org>
 
+       * update-game-score.c: (toplevel): Include stdarg.h.
+       (MAX_DATA_LEN, MAX_SCORES): New.
+       (SCORE_FILE_PREFIX): If HAVE_SHARED_GAME_DIR is not defined,
+       default to ~/.emacs.d/games.
+       (get_user_id): Don't zero uid in the case where we can't get the
+       username.
+       (lose): New function.
+       (main): Actually use `max', and default it to MAX_SCORES.
+       Correctly handle new default for SCORE_FILE_PREFIX.  Use `lose'
+       function.
+       (read_score): Handle the case of reading unamelen characters, then
+       finishing.  Use mktemp if mkstemp isn't available.
+       (lock_file, unlock_file): Delete unused versions.
+       (lock_file): Always sleep, even if we unlinked the lock file.
+
        * Makefile.in (gamedir, gameuser): New variables.
        (toplevel, UTILITIES): Add update-game-score.
        (${archlibdir}): Handle HAVE_SHARED_GAME_DIR.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 274625b..d83fda2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -131,14 +131,10 @@
 
        * files.el (display-time-string): Fix last change.
 
-<<<<<<< ChangeLog
->>>>>>> 1.3683
-=======
 2002-04-07  Sam Steingold  <sds@gnu.org>
 
        * vc-cvs.el (vc-cvs-checkin): Pass the required argument to `error'.
 
->>>>>>> 1.3687
 2002-04-07  Jason Rumney  <jasonr@gnu.org>
 
        * international/mule-cmds.el (set-default-coding-systems)
@@ -152,7 +148,6 @@
 
        * simple.el (play-sound): Move to subr.el.
 
->>>>>>> 1.3679
 2002-04-06  Richard M. Stallman  <rms@gnu.org>
 
        * files.el (display-time-string-forms): Mark as risky.

diff --git a/src/ChangeLog b/src/ChangeLog
index ef3df3e..c2bbd88 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2002-04-10  Colin Walters  <walters@verbum.org>
 
+       * config.in: Add HAVE_SHARED_GAME_DIR.
+
        * callproc.c: (Vgame_score_directory): New variable.
        (syms_of_callproc) <Vgame_score_directory>: DEFVAR_LISP.