Merge from trunk; up to 2014-02-23T23:41:17Z!lekktu@gmail.com.

19 files changed, 1119 insertions, 1282 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 81876d86165..fcdde8003bc 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,281 @@
+2014-01-22  Eli Zaretskii  <eliz@gnu.org>
+
+        * update-game-score.c (write_scores) [WINDOWSNT]: Use chmod
+        instead of fchmod.
+
+2014-01-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Fix miscellaneous update-game-score bugs.
+        * update-game-score.c (difftime) [!HAVE_DIFFTIME]: Remove.
+        (read_score) [HAVE_GETDELIM]: Don't access uninitialized storage,
+        as that leads to undefined behavior, which is a bad thing
+        particularly in a setuid program.
+        (read_scores, write_scores): Check for fclose failure; on some
+        systems, I/O errors are not reported by primitives like getc and
+        putc, but instead are delayed until fclose, so fclose failures
+        should be diagnosed like other read and write errors.
+        (write_scores): Use fchmod, not chmod, to avoid a race.
+        Otherwise, if the lock is broken by some other process,
+        update-game-score might try to change the permission on someone
+        else's file or on a nonexistent file, and incorrectly report an
+        error when this fails.
+        (lock_file): Fix test for out-of-date lock file; it was reversed.
+        That is, it incorrectly broke locks when they were more than an
+        hour into the future, instead of when they were more than an hour
+        in the past.  Use ordinary subtraction rather than difftime; since
+        we're already assuming POSIX we don't need to worry about the
+        possibility of time_t being a magic cookie, and since timestamps
+        are positive we don't need to worry about integer overflow when
+        subtracting them.  Put two spaces, not just one, after a sentence
+        end in a comment.
+
+2014-01-19  Paul Eggert  <eggert@cs.ucla.edu>
+
+        update-game-score fixes for -m and integer overflow (Bug#16428)
+        * update-game-score.c: Include inttypes.h, stdbool.h.
+        (min): New macro, if not already defined.
+        (MAX_SCORES, main): Limit the maximum number of scores only from
+        limits imposed by the underyling platform, instead of the
+        arbitrary value 200.
+        (struct score_entry, main, read_score, write_score):
+        Scores are now intmax_t, not long.
+        (get_user_id): Reject user names containing spaces or newlines,
+        as they would mess up the score file.
+        Allow uids that don't fit in 'long'.
+        Increase the size of the buffer, to avoid overrun in weird cases.
+        (get_prefix, main): Use bool for boolean.
+        (main): Rewrite expr to avoid possibility of signed integer
+        overflow.  Don't allow newlines in data, as this would mess up
+        the score file.  Check for memory allocation failure when adding
+        the new score, or when unlockint the file.  Implement -m.
+        (read_score): Check for integer overflow when reading a score.
+        (read_score) [!HAVE_GETDELIM]: Check for integer overflow when
+        data gets very long.  Check only for space to delimit names,
+        since that's what's done in the HAVE_GETDELIM case.
+        (read_scores): New parameter ALLOC.  Change counts to ptrdiff_t.
+        All uses changed.  Use push_score to add individual scores;
+        that's simpler than repeating its contents.
+        (score_compare_reverse): Simplify.
+        (push_score): New parameter SIZE.  Change counts to ptrdiff_t.
+        All uses changed.  Check for integer overflow of size calculation.
+        (sort_scores, write_scores): Change counts to ptrdiff_t.
+        (unlock_file): Preserve errno on success, so that storage
+        exhaustion is diagnosed correctly.
+
+2014-01-05  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Spelling fixes.
+        * Makefile.in (regex.o): Remove reference to no-longer-used macros
+        CONFIG_BROKETS and INHIBIT_STRING_HEADER.  "BROKETS" was a
+        misspelling anyway....
+
+2013-12-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Use bool for boolean, focusing on headers.
+        * emacsclient.c, etags.c, hexl.c (FALSE, TRUE):
+        Remove.  All uses replaced with uncapitalized version.
+        * emacsclient.c (message):
+        * etags.c (make_tag, pfnote, consider_token, make_C_tag, lang_names):
+        * hexl.c (un_flag, iso_flag, endian):
+        * pop.c (pop_debug, pop_open, pop_multi_first, pop_multi_next)
+        (pop_trash):
+        Use bool for boolean.
+        * etags.c (bool): Remove.
+        * etags.c (globals, members, declarations, no_line_directive)
+        (no_duplicates): Use 'int' for boolean values that getopt requires
+        to be 'int'.  Formerly, these were 'bool' and 'bool' was 'int',
+        but we can no longer rely on this implementation.
+        * pop.h (struct _popserver): Use bool_bf for boolean bit-fields.
+
+2013-11-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * ebrowse.c (xstrdup):
+        * etags.c (savenstr): Prefer tail calls.
+        * etags.c (concat): Omit unnecessary assignment.
+
+2013-10-24  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in ($(DESTDIR)${archlibdir}):
+        Avoid non-portable "`\" nesting.
+
+        * Makefile.in (abs_top_srcdir): New, set by configure.
+
+2013-10-23  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in ($(DESTDIR)${archlibdir}, need-blessmail, install)
+        (uninstall): Quote entities that might contain whitespace.
+
+2013-10-10  Glenn Morris  <rgm@gnu.org>
+
+        * make-docfile.c (search_lisp_doc_at_eol):
+        Use int rather than char with getc.  (Bug#15481)
+
+2013-09-20  Paul Eggert  <eggert@cs.ucla.edu>
+
+        A simpler, centralized INLINE.
+        * profile.c (INLINE): New macro.
+        (SYSTIME_INLINE): Remove.
+
+2013-08-28  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * Makefile.in (SHELL): Now @SHELL@, not /bin/sh,
+        for portability to hosts where /bin/sh has problems.
+
+2013-08-10  Eli Zaretskii  <eliz@gnu.org>
+
+        * update-game-score.exe.manifest: New file.
+
+        * Makefile.in (UPDATE_MANIFEST): New variable.
+        (SCRIPTS): Add $(UPDATE_MANIFEST).
+
+2013-08-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * makefile.w32-in (lisp2): Add nadvice.elc.
+
+2013-08-05  Eli Zaretskii  <eliz@gnu.org>
+
+        * update-game-score.c (read_score): Try reading a character before
+        probing the stream for EOF.  Initialize score->score to zero,
+        before reading and accumulating the score.
+        (read_scores): Fix logic that determines which value to return.
+        Close the input stream when finished reading the scores (avoids
+        failures in overwriting the file with a new one on MS-Windows,
+        since a file that is open cannot be deleted).
+
+        * ntlib.h (rename): Don't undefine.
+
+        * ntlib.c (sys_rename): New function, needed for
+        update-game-score.
+
+2013-08-04  Eli Zaretskii  <eliz@gnu.org>
+
+        * ntlib.h: Include fcntl.h.
+        (mkostemp): Declare prototype.
+        (mktemp): Don't redefine.
+
+        * ntlib.c (mkostemp): New function.  (Bug#15015)
+
+2013-08-04  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Fix some minor races in hosts lacking mkostemp (Bug#15015).
+        * movemail.c (main):
+        * update-game-score.c (write_scores):
+        Use mkostemp (which now works on all platforms, due to changes
+        in the portability layer) rather than mktemp (which has a race)
+        or mkstemp (which we no longer bother with).
+
+2013-07-10  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Port to C89.
+        * ebrowse.c (USAGE): Remove macro with too-long string literal ...
+        (usage_message): ... and replace it with this new static constant
+        containing multiple literals.  All uses changed.
+        * emacsclient.c (print_help_and_exit):
+        Rewrite to avoid string literals longer than the C89 limits.
+        (start_daemon_and_retry_set_socket):
+        Rewrite to avoid non-constant array initializer.
+        * make-docfile.c (enum global_type): Omit trailing comma.
+
+2013-07-02  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Prefer plain 'static' to 'static inline' (Bug#12541).
+        I missed these instances of 'static inline' in an earlier sweep.
+        * ebrowse.c (putstr):
+        * etags.c (hash):
+        * make-docfile.c (put_char): No longer inline.
+        * etags.c (hash): Prefer int to unsigned when either will do.
+
+2013-06-21  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Use C99-style flexible array members if available.
+        * ebrowse.c: Include <stddef.h>, for offsetof.
+        (struct member, struct alias, struct sym):
+        Use FLEXIBLE_ARRAY_MEMBER.
+        (add_sym, add_member, make_namespace, register_namespace_alias):
+        Use offsetof (struct, flex_array_member), not sizeof (struct), as
+        that ports better to pre-C99 non-GCC.
+
+2013-05-29  Eli Zaretskii  <eliz@gnu.org>
+
+        * Makefile.in (mostlyclean): Remove *.res files.
+
+2013-05-18  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Port --enable-gcc-warnings to clang.
+        * etags.c: Omit unnecessary forward decls.
+        (print_version, print_help): Declare _Noreturn.
+        * pop.c (socket_connection) [HAVE_GETADDRINFO]: Simplify.
+
+2013-05-16  Eli Zaretskii  <eliz@gnu.org>
+
+        * update-game-score.c [WINDOWSNT]: Include "ntlib.h".
+
+        * ntlib.h (sleep): Update prototype.
+        (geteuid): Add prototype.
+
+        * ntlib.c (sleep): Now returns an unsigned value.
+        (getgid): New function.
+
+        * Makefile.in (CLIENTW, LIB_WSOCK32, LIBS_ECLIENT, NTLIB)
+        (CLIENTRES, WINDRES, NTINC, NTDEPS): New variables.
+        (INSTALLABLES): Add $(CLIENTW).
+        (LIBS_MOVE): Use $(LIB_WSOCK32).
+        ($(DESTDIR)${archlibdir}): Use $(EXEEXT) on update-game-score.
+        (test-distrib${EXEEXT}): Use $(EXEEXT) on test-distrib.
+        (etags${EXEEXT}, ebrowse${EXEEXT}, ctags${EXEEXT})
+        (profile${EXEEXT}, make-docfile${EXEEXT}, movemail${EXEEXT})
+        (emacsclient${EXEEXT}, hexl${EXEEXT}, update-game-score${EXEEXT}):
+        Add $(NTLIB) to prerequisites.  Use $(EXEEXT).
+        (pop.o): Add pop.h to prerequisites.
+        (emacsclientw${EXEEXT}, ntlib.o): New targets.
+        (emacsclient.res): New target.
+
+2013-05-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * makefile.w32-in ($(DOC)): Use DOC rather than DOC-X.
+
+2013-05-06  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * make-docfile.c (search_lisp_doc_at_eol) [DEBUG]: Fix typo,
+        by removing references to no-longer-existing locals.
+
+2013-03-26  Eli Zaretskii  <eliz@gnu.org>
+
+        Fix incompatibilities between MinGW.org and MinGW64 headers.
+        * ntlib.c (struct timespec) [!_TIMEZONE_DEFINED]: Define the
+        struct only if _TIMEZONE_DEFINED is not defined.
+
+2013-03-23  cg  <chengang31@gmail.com>  (tiny change)
+
+        * makefile.w32-in (LIB_SRC): Move before first use.
+
+2013-03-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * pop.c: Fix ERRMAX typo (Bug#13925).
+        (socket_connection) [!HAVE_KRB5_ERROR_TEXT && HAVE_KRB5_ERROR_E_TEXT]:
+        Use ERROR_MAX, not ERRMAX.
+
+2013-03-13  Paul Eggert  <eggert@cs.ucla.edu>
+
+        File synchronization fixes (Bug#13944).
+        * Makefile.in (LIB_FDATASYNC): New macro.
+        (emacsclient${EXEEXT}): Use it.
+        * emacsclient.c (main): Use fdatasync, not fsync, since we don't
+        care about metadata.  Keep trying if interrupted.
+        * movemail.c (main, popmail): Don't worry about BSD_SYSTEM, since
+        fsync is available everywhere (or there is a substitute).
+        Don't report an error if fsync returns EINVAL.
+
+        Static checking by Sun C 5.12.
+        * etags.c (analyse_regex): Omit unreachable code.
+
+        * movemail.c (main): Call umask on all systems.
+        This is OK since Emacs already assumes umask elsewhere.
+        Don't grant more read permissions than necessary.
+        The old 0333 dates back to before we called setuid,
+        so it was needed back then to ensure user-readability,
+        but 0377 should suffice now.
+
 2013-02-08  Paul Eggert  <eggert@cs.ucla.edu>
 
         * movemail.c (getenv): Remove decl (unused since 1994).
@@ -478,7 +756,7 @@
 
 2012-05-05  Jim Meyering  <meyering@redhat.com>
 
-        * lib-src/pop.c (pop_stat, pop_list, pop_multi_first, pop_last):
+        * pop.c (pop_stat, pop_list, pop_multi_first, pop_last):
         NUL-terminate the error buffer (Bug#11372).
 
 2012-05-02  Juanma Barranquero  <lekktu@gmail.com>
@@ -636,7 +914,7 @@
         to avoid potential buffer overflow issues on typical 64-bit hosts.
         (whatlen_max): New static var.
         (main): Avoid buffer overflow if subsidiary command length is
-        greater than BUFSIZ or 2*BUFSIZ + 20. Do not use sprintf when its
+        greater than BUFSIZ or 2*BUFSIZ + 20.  Do not use sprintf when its
         result might not fit in 'int'.
 
         * movemail.c (main): Do not use sprintf when its result might not fit
@@ -987,7 +1265,7 @@
 
 2011-01-30  Jim Meyering  <meyering@redhat.com>
 
-        make-docfile: don't corrupt heap for an invalid .elc file
+        * make-docfile.c: Don't corrupt heap for an invalid .elc file
         "printf '#@1a' > in.elc; ./make-docfile in.elc" would store 0
         one byte before just-malloc'd saved_string buffer.
         * make-docfile.c (scan_lisp_file): Diagnose an invalid dynamic
@@ -3687,7 +3965,7 @@
 
 2002-03-05  Francesco Potortì  <pot@gnu.org>
 
-        * etags.c: Honour #line directives.
+        * etags.c: Honor #line directives.
         (no_line_directive): New global var; set it for old behavior.
         (main): Remove some #ifdef in the getopt switch.
         (add_node, put_entries): Code added to merge different chunks of
@@ -4795,7 +5073,7 @@
 1999-06-23  Dave Love  <fx@gnu.org>
 
         * etags.c (erlang_attribute): Fix undefined variable usage (after
-        Potorti).
+        Potortì).
 
 1999-05-02  Andrew Innes  <andrewi@gnu.org>
 
@@ -5161,7 +5439,7 @@
         (longopts): New long options without short counterpart are
         globals, members, no-globals, no-members.  Regexp options are now
         defined  conditionally to ETAGS_REGEXPS.
-        (print_help): Updated.
+        (print_help): Update.
 
 1997-05-22  Francesco Potortì  <F.Potorti@cnuce.cnr.it>
 
@@ -6034,7 +6312,7 @@
 
 1995-06-13  Geoff Voelker  <voelker@cs.washington.edu>
 
-        * etags.c (process_file,absolute_filename): Handle filenames
+        * etags.c (process_file, absolute_filename): Handle filenames
         starting with a drive letter.
 
         * makefile.nt (install): Copy wakeup.exe properly.
@@ -6061,12 +6339,12 @@
 1995-05-25  Geoff Voelker  <voelker@cs.washington.edu>
 
         * makefile.nt (LIBS): Use BASE_LIBS.
-        (make-docfile.exe,hexl.exe,wakeup.exe,etags.exe): Don't depend
+        (make-docfile.exe, hexl.exe, wakeup.exe, etags.exe): Don't depend
         upon LIBS.
         (DOC): Use del instead of rm.
         (DOC) [WINDOWS95]: Use DOC.
         (clean): Handle MSVC aux files.
-        (config.h,paths.h): Use $(CP) instead of cp.
+        (config.h, paths.h): Use $(CP) instead of cp.
         (config.h): Use $(CONFIG_H)
         (make-docfile.obj): Depend upon config.h.
         Clean up comments.
@@ -7889,14 +8167,6 @@
         * emacsserver.c (msgcatch): Use the SIGTYPE macro to declare the
         type of this function.
 
-1992-04-14  Jim Blandy  (jimb@pogo.cs.oberlin.edu)
-
-        * ChangeLog: Since the old etc contents have been split into etc
-        and lib-src, the old etc's ChangeLog has been duplicated in the
-        new etc and lib-src.  That means that each contains complete and
-        coherent information, although each contains extraneous
-        information.
-
 1992-04-08  Jim Blandy  (jimb@pogo.cs.oberlin.edu)
 
         * etags.c: "--no-warning" option renamed to "--no-warn",
@@ -7905,595 +8175,24 @@
         * Makefile: Renamed to Makefile.in; the configure script
         will edit this to produce Makefile.
 
-1992-04-07  Jim Blandy  (jimb@pogo.cs.oberlin.edu)
-
-        * etags.c (print_help, print_version): New functions.
-        (main): Options added to support them.
-
-        * etags.c (longopts): New array of long names for the options.
-        (main): Recognize them.
-
-1992-04-06  Jim Blandy  (jimb@pogo.cs.oberlin.edu)
-
-        * etags.c (C_entries): Remove comment saying that \" in a string
-        isn't recognized as magic, because it is correctly handled.
-
-        * getopt.c, getopt.h: New files, from GNU C library.
-        * etags.c: Rewritten to use getopt.
-        #include "getopt.h".
-        (file_num): Variable deleted; its role is now played by getopt's
-        optind.
-        (main): Argument processing loop rewritten to call getopt to get
-        next option.  Options which take parameters (-o and -i) rewritten
-        to get parameter from optarg instead of argv[1].
-        Filename preprocessing loop and update command changed similarly.
-        * Makefile (etags, ctags): Depend on and link with getopt.h,
-        getopt.o, and getopt1.o.
-        (getopt.o, getopt1.o): New targets for the GNU getopt routines.
-
-        * etags.c (outfflag): Variable deleted; it is non-zero iff outfile
-        is non-zero.
-
-        (main): In the argument processing loop, the 'goto next_arg'
-        statements are breaking out of the switch statement in exactly the
-        same way that a simple 'break' statement would; replace the gotos
-        with breaks, and remove the label.
-
-1992-04-06  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
-
-        * etags.c (C_entries): Clear tydef and next_token_is_func at start.
-        (consider_token): Move next_token_is_func to global.
-
-1992-04-02  Jim Blandy  (jimb@pogo.cs.oberlin.edu)
-
-        * Makefile: Conform with GNU coding standards:
-        (mostlyclean): New target, synonymous with clean.
-        (TAGS, check): New targets.
-        (INSTALL, INSTALLFLAGS): New variables.
-
-1992-03-31  Jim Blandy  (jimb@pogo.cs.oberlin.edu)
-
-        * lib-src/Makefile, etc/MACHINES, etc/NEWS: Changed references to
-        `config.emacs' to `configure'.
-
-        * lib-src/Makefile: Adjusted for renaming of share-lib to etc.
-        * etc/MACHINES: Same.
-
-1992-03-30  Jim Blandy  (jimb@pogo.cs.oberlin.edu)
-
-        * movemail.c (main): Allow tempname to be as long as necessary,
-        instead of limiting it to 39 characters.
-
-        * movemail.c (main): Move declaration of buf from top of function
-        to local block surrounding the copy loop.  This makes it less
-        likely to be confused with the buf used by the code which checks the
-        permissions on outname's directory.
-
-1992-03-20  Jim Kingdon  (kingdon@albert.gnu.ai.mit.edu)
-
-        * SERVICE: Remove my entry.
-
-1992-03-09  David J. MacKenzie  (djm@nutrimat.gnu.ai.mit.edu)
-
-        * Makefile (emacstool, nemacstool, xvetool): Use ${CFLAGS}, not
-        hardcoded -g.
-
-        * movemail.c (xmalloc): Return char *, not int.
-        (main) [!MAIL_USE_FLOCK]: Add a new conditional, MAIL_UNLINK_SPOOL,
-        that is off by default -- normally don't unlink the mail spool
-        file, just empty it.  Pass creat mode 0600, not 0666.
-
-1992-02-07  Jim Blandy  (jimb@pogo.cs.oberlin.edu)
-
-        * Makefile (../arch-lib): Depend on ${EXECUTABLES}.
-        (all): Instead of here.
-        (install): Don't use the -s option, since people need symbols to
-        debug code.
-
-1992-01-19  Eric Youngdale  (youngdale@v6550c.nrl.navy.mil)
-
-        * etags-vmslib.c (fn_exp): Add type cast.
-
-1992-01-18  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
-
-        * movemail.c: Changes in comments.
-
-1992-01-13  Jim Blandy  (jimb@pogo.cs.oberlin.edu)
-
-        * Makefile: Make the distclean target erase the DOC files from
-        ../share-lib and the executables from ../arch-lib.
-
-1992-01-09  Jim Blandy  (jimb@pogo.cs.oberlin.edu)
-
-        * emacsclient.c: #include <sys/stat.h>
-        (main): Do declare statbfr.
-
-1991-12-21  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
-
-        * emacsserver.c, emacsclient.c [BSD]: Use either /tmp or ~
-        for the socket, depending on SERVER_HOME_DIR.
-        If using /tmp, put host name in the socket name.
-
-        * movemail.c (pfatal_and_delete): New function.
-        (main, popmail): Use it.
-        (popmail): Close output before deleting messages.
-        Check for error on close and on fsync.
-        Use `fatal' where appropriate.
-        (main): Remove (void).
-
-        * aixcc.lex: New file.  Not officially part of Emacs.
-        * Makefile: Rules for that.
-
-1991-12-04  Jim Blandy  (jimb@pogo.gnu.ai.mit.edu)
-
-        * yow.c (main): Rename all references to PATH_EXEC to PATH_DATA.
-
-        * etags.c (main): Properly cast call to alloca that initializes
-        included_files.
-
-1991-08-17  Roland McGrath  (roland@geech.gnu.ai.mit.edu)
-
-        * etags.c (files_are_tag_tables): Remove global var.
-        (process_file): Don't test it.  Also remove hack checking for a
-        file named "TAGS".
-        (main): -i now takes an arg which is the name of a file to include.
-        Collect these names and emit include tags for them after processing
-        all the argument files.
-
-1991-07-30  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
-
-        * wakeup.c: Terminate if parent goes away.
-
-1991-07-18  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
-
-        * etags.c (C_entries): Process token before handling end of line.
-        When inner loops reach end of line, just back up.
-        Let the real end of line processing happen in just one place.
-        (consider_token): Likewise.
-
-1991-04-11  Jim Blandy  (jimb@geech.gnu.ai.mit.edu)
-
-        * etags.c (TEX_mode): Skip comments while scanning the text to see
-        which escape character this file uses.
-
-1991-03-29  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
-
-        * emacsserver.c [USG]: Terminate if msgrcv fails.
-
-1991-03-03  Richard Stallman  (rms@mole.ai.mit.edu)
-
-        * emacsserver.c [BSD]: Check for errors on stdin after scanf.
-
-1991-01-25  Jim Blandy  (jimb@churchy.ai.mit.edu)
-
-        * make-docfile: Find the arguments to a C function correctly,
-        by not ignoring the character that read_c_string returns.
-        Don't even try to find argument names for functions that take MANY
-        or UNEVALLED arguments, since they're a figment of the docstring's
-        imagination.
-
-1991-01-14  Jim Blandy  (jimb@churchy.ai.mit.edu)
-
-        * make-docfile: Read the .elc files generated by the new byte
-        compiler.
-
-1990-12-31  Richard Stallman  (rms@mole.ai.mit.edu)
-
-        * refcard.tex: Use cm fonts, not am, in multi-column mode.
-
-1990-11-29  Richard Stallman  (rms@mole.ai.mit.edu)
-
-        * movemail.c (mbx_delimit_begin): Put space before `unseen'.
-
-1990-11-27  Richard Stallman  (rms@mole.ai.mit.edu)
-
-        * Makefile (install*): No need to install wakeup.
-
-1990-11-26  Richard Stallman  (rms@mole.ai.mit.edu)
-
-        * Makefile (install*): Install emacsclient like etags.
-
-1990-11-13  Richard Stallman  (rms@mole.ai.mit.edu)
-
-        * movemail.c (error): Handle 3 args.
-        (main): Don't check input access if using pop.
-
-1990-10-16  Richard Stallman  (rms@mole.ai.mit.edu)
-
-        * etags.c (find_entries): Check for numbers after Scheme suffix.
-
-1990-10-14  Richard Stallman  (rms@mole.ai.mit.edu)
-
-        * termcap.dat (vt200-80): Fix ke and ks to frob flag 1.
-
-1990-10-09  Richard Stallman  (rms@mole.ai.mit.edu)
-
-        * Makefile (nemacstool, xvetool): New targets.
-
-1990-09-26  Richard Stallman  (rms@mole.ai.mit.edu)
-
-        * emacsclient.c: Include errno.h and define related variables.
-
-1990-09-23  Richard Stallman  (rms@mole.ai.mit.edu)
-
-        * emacsclient.c: Change usage message.
-
-1990-08-30  David Lawrence  (tale@pogo.ai.mit.edu)
-
-        * emacs.1: Add break before -nw option.
-
-1990-08-19  David J. MacKenzie  (djm@apple-gunkies)
-
-        * qsort.c: Replace with GNU version.
-
-1990-08-14  David J. MacKenzie  (djm@apple-gunkies)
-
-        * wakeup.c: New program replacing loadst.c.
-
-1990-08-14  Richard Stallman  (rms@sugar-bombs.ai.mit.edu)
-
-        * emacsclient.c [USG]: Pass msgsnd only 4 args.
-
-1990-08-09  David J. MacKenzie  (djm@pogo.ai.mit.edu)
-
-        * etags.c: Rename `flag' variables for what they do instead of
-        which option character sets them.
-
-1990-05-28  Richard Stallman  (rms@sugar-bombs.ai.mit.edu)
-
-        * loadst.c (main): Conditional to get load average on Apollo.
-
-1990-05-22  Joseph Arceneaux  (jla@churchy.ai.mit.edu)
-
-        * emacsserver.c: Set the permission on the socket to 0600.
-
-1990-03-27  Richard Stallman  (rms@sugar-bombs.ai.mit.edu)
-
-        * emacsclient.c [BSD]: Print clean message for failing getwd.
-
-1990-03-20  David Lawrence  (tale@pogo.ai.mit.edu)
-
-        * getdate.y: Use the getdate.y from GNU tar for timer.
-
-1990-03-18  Jim Kingdon  (kingdon@pogo.ai.mit.edu)
-
-        * emacsclient.c (main): Don't put brackets around "filename" in
-        usage message.  It isn't optional.
-
-1990-03-14  Joseph Arceneaux  (jla@churchy.ai.mit.edu)
-
-        * etags.c (getit): Recognize '$' as beginning identifiers.
-
-1990-02-22  David Lawrence  (tale@pogo.ai.mit.edu)
-
-        * emacsserver.c: Renamed from server.c.
-        * Makefile: Reference emacsserver rather than server.
-        * MACHINES: Doc fix for new emacsserver name.
-
-1990-01-25  Richard Stallman  (rms@sugar-bombs.ai.mit.edu)
-
-        * emacsclient.c: Print program name in error messages.
-
-1990-01-19  David Lawrence  (tale@cocoa-puffs)
-
-        * timer.c, getdate.y (new files) and Makefile:
-        Sub-process support for run-at-time in timer.el.
-        Doesn't yet work correctly for USG.
-
-1990-01-10  Jim Kingdon  (kingdon@pogo)
-
-        * MACHINES: Add HP 300 running BSD.
-
-1990-01-02  Richard Stallman  (rms@sugar-bombs.ai.mit.edu)
-
-        * yow.c: Dynamically allocate buffer; skip header before random
-        choice to avoid bias toward first item.
-
-1989-12-24  Richard Stallman  (rms@sugar-bombs.ai.mit.edu)
-
-        * etags.c (readline): Separate out init of `pend'.
-
-1989-12-17  Richard Stallman  (rms@sugar-bombs.ai.mit.edu)
-
-        * etags.c: Undo changes relating to isgoodhdr.
-
-1989-12-16  Mosur Mohan  (rms@sugar-bombs.ai.mit.edu)
-
-        * etags.c (isgoodhdr): New macro.
-        (_gdh, notgdh): New variable used by that.
-        (init): Initialize _gdh.
-        (find_entries): Set header_file.
-        (consider_token): Use isgoodhdr if in header file.
-
-        * etags.c (total_size_of_entries):
-        Was miscalculating by 1 in rewritten case.
-
-        * etags.c (PAS_funcs): One arg to pfnote was missing.
-
-1989-12-05  Joseph Arceneaux  (jla@spiff)
-
-        * MACHINES: Change for the ULTRIX entry.
-
-1989-11-21  Joseph Arceneaux  (jla@spiff)
-
-        * etags.c (process_file): If file is not regular, return.
-
-1989-11-06  Richard Stallman  (rms@sugar-bombs.ai.mit.edu)
-
-        * loadst.c (main): Handle FIXUP_KERNEL_SYMBOL_ADDR.
-
-1989-10-30  Richard Stallman  (rms@sugar-bombs.ai.mit.edu)
-
-        * loadst.c (load_average): If HAVE_GETLOADAVG, use getloadavg.
-        (main): If HAVE_GETLOADAVG, don't call `nlist'.
-
-1989-10-25  Richard Stallman  (rms@sugar-bombs.ai.mit.edu)
-
-        * etags.c (consider_token): Allow any number of typespec keywords
-        after `typedef', before new type name.
-        (enum sym_type): Add st_C_typespec.
-        (C_create_stab): Put typespec kwds in table.
-
-1989-08-27  Richard Stallman  (rms@apple-gunkies.ai.mit.edu)
-
-        * etags.c (main): Don't depend on name invoked by.
-        If CTAGS is not defined, assume it is ETAGS.
-
-1989-07-31  Richard Stallman  (rms@sugar-bombs.ai.mit.edu)
-
-        * etags.c (L_funcs): Allow package name in define construct,
-        as in (foo::defmumble name-defined ...).
-
-1989-07-30  Richard Stallman  (rms@sugar-bombs.ai.mit.edu)
-
-        * etags.c (find_entries): Stupid bug testing for C filename suffixes.
-
-        * Makefile (yow): Depends on ../src/paths.h.
-
-1989-07-04  Richard Stallman  (rms@apple-gunkies.ai.mit.edu)
-
-        * etags.c: Fix compilation by moving Pascal after Fortran.
-
-1989-06-15  Richard Stallman  (rms@sugar-bombs.ai.mit.edu)
-
-        * movemail.c [USG]: Define F_OK, etc., if not found in header.
-
-1989-05-27  Richard Stallman  (rms@sugar-bombs.ai.mit.edu)
-
-        * hexl.c: New file, supports hexl-mode.
-
-1989-05-14  Richard Stallman  (rms@sugar-bombs.ai.mit.edu)
-
-        * movemail.c: New compilation flag MAIL_USE_MMDF.
-
-1989-05-08  Richard Stallman  (rms@sugar-bombs.ai.mit.edu)
-
-        * emacsclient.c: Use BSD code whenever HAVE_SOCKETS.
-        * server.c: Likewise.
-
-        * make-docfile.c (scan_c_file): Output argument names at end of string.
-        (write_c_args): New subroutine.
-
-1989-04-27  Richard Stallman  (rms@sugar-bombs.ai.mit.edu)
-
-        * movemail.c: Report failure of flock.
-
-1989-04-19  Richard Stallman  (rms@sugar-bombs.ai.mit.edu)
-
-        * etags.c (find_entries): Allow multi-letter extensions for fortran.
-
-1989-04-18  Richard Stallman  (rms@sugar-bombs.ai.mit.edu)
-
-        * loadst.c: On bsd4.3, use gettimeofday instead of CPUSTATES.
-
-1989-03-15  Jeff Peck  (rms@sugar-bombs.ai.mit.edu)
-
-        * emacstool.c: setenv IN_EMACSTOOL=t, TERM=sun, TERMCAP=.
-
-        * emacstool.1: Update to document environment variables.
-
-1989-02-21  Richard Stallman  (rms@sugar-bombs.ai.mit.edu)
-
-        * etags.c (PAS_funcs): New function by Mosur Mohan.
-
-        * movemail.c: On sysv, include unistd.h.
-
-1989-02-18  Richard Stallman  (rms@sugar-bombs.ai.mit.edu)
-
-        * b2m.c: New file.
-
-1989-02-15  Richard Stallman  (rms@sugar-bombs.ai.mit.edu)
-
-        * etags.c: Prolog support from Sunichirou Sugou.
-
-1989-02-03  Richard Stallman  (rms@sugar-bombs.ai.mit.edu)
-
-        * Makefile (clean): New target.
-
-1989-01-25  Richard Stallman  (rms@sugar-bombs.ai.mit.edu)
-
-        * fakemail.c (put_line): Break header lines at 79 cols.
-
-1989-01-19  Richard Stallman  (rms@sugar-bombs.ai.mit.edu)
-
-        * etags.c: Greatly rewritten by Sam Kendall for C++ support and for
-        multiple tags per line.
-
-1989-01-03  Richard Stallman  (rms@sugar-bombs.ai.mit.edu)
-
-        * movemail.c: Check access before doing real work.
-        Check that outfile is in a writable directory.
-        On fatal error, delete the lock file.
-
-1988-12-31  Richard Mlynarik  (mly@rice-chex.ai.mit.edu)
-
-        * env.c: Add decl for my-index
-        * etags.c (file-entries): .oak => scheme.
-
-1988-12-30  Richard Stallman  (rms@sugar-bombs.ai.mit.edu)
-
-        * movemail.c: Use `access' to check input and output files.
-
-1988-12-28  Richard Stallman  (rms@sugar-bombs.ai.mit.edu)
-
-        * emacsclient.c (main): Ignore all of CWD before first slash.
-
-1988-12-27  Richard Stallman  (rms@sugar-bombs.ai.mit.edu)
-
-        * etags.c (readline): Double linebuffer->size outside the xrealloc.
-
-1988-12-22  Richard Stallman  (rms@sugar-bombs.ai.mit.edu)
-
-        * server.c, emacsclient.c: Don't try to use gid_t; it isn't defined.
-        * server.c: chmod the socket to 0700.
-
-1988-12-09  Richard Stallman  (rms@sugar-bombs.ai.mit.edu)
-
-        * fakemail.c (main): Let env var FAKEMAILER override pgm to run.
-        (add_field): Delete comments and turn `<', `>' to spaces
-        in header lines.
-        (USE_FAKEMAIL): New customization macro says to make fakemail
-        not be a no-op even on a BSD system.
-
-1988-12-01  Richard Stallman  (rms@sugar-bombs.ai.mit.edu)
-
-        * etags.c (consider_token): Skip comments just like whitespace.
-        Notice `struct', etc. and set strtag for those tokens.
-        Return 1 for the token following `struct' if an open-brace follows it.
-        (C_entries): Special handling of token following `struct'
-        needed because we have probably advanced to the following line
-        to find the `{'.
-        (main): New option `T' sets tflag and strflag.
-        Set both of them by default if eflags.
-
-1988-11-30  Richard Stallman  (rms@sugar-bombs.ai.mit.edu)
-
-        * movemail.c: Do fsync before closing output.
-
-1988-11-29  Richard Mlynarik  (mly@pickled-brain.ai.mit.edu)
-
-        * movemail.c: Better error message when can't create tempname.
-        This file needs a great deal of extra error-checking and lucid reporting...
-
-1988-11-16  Richard Stallman  (rms@sugar-bombs.ai.mit.edu)
-
-        * etags.c: Support assembler code for .s and .a files.
-        (getit): Allow underscore in a tag.
-
-1988-11-15  Richard Stallman  (rms@sugar-bombs.ai.mit.edu)
-
-        * movemail.c: Close output and check errors before deleting input.
-
-1988-10-01  Richard Stallman  (rms@apple-gunkies.ai.mit.edu)
-
-        * emacsclient.c [SYSVIPC]: Compute cwd only once; decide properly
-        whether to prefix it.  Handle line number args.
-
-1988-09-24  Richard Stallman  (rms@gluteus.ai.mit.edu)
-
-        * etags.c (main): Default setting of eflag was backwards.
-
-1988-09-23  Richard Stallman  (rms@sugar-bombs.ai.mit.edu)
-
-        * etags.c: New option -i.  -f renamed -o.
-        `-' as input file means read input file names from stdin.
-        -i spec'd or input file named TAGS means the input file is another
-        tag table; output an "include" line for it.
-
-1988-09-19  Richard Stallman  (rms@sugar-bombs.ai.mit.edu)
-
-        * Makefile: New vars DESTDIR, BINDIR, LIBDIR, MANDIR, MANEXT.
-        New targets install, install.sysv, install.xenix.
-        This makefile is now responsible for installing executables
-        and documentation from this directory into system directories.
-
-1988-09-16  Richard Stallman  (rms@corn-chex.ai.mit.edu)
-
-        * server.c, emacsclient.c (main): Compute socket name from euid.
-
-1988-08-04  Richard Stallman  (rms@sugar-bombs.ai.mit.edu)
-
-        * emacsclient.c: Args like +DIGITS are passed through unchanged.
-
-1988-07-12  Richard Stallman  (rms@sugar-bombs.ai.mit.edu)
-
-        * server.c: If both BSD and HAVE_SYSVIPC, use the latter.
-        * emacsclient.c: Likewise.
-        In the HAVE_SYSVIPC alternative, if BSD, use getwd instead of getcwd.
-
-1988-06-23  Richard Stallman  (rms@sugar-bombs.ai.mit.edu)
-
-        * etags.c: Handle `typedef struct foo {' (price@mcc.com).
-        (istoken): New string-comparison macro.
-        (consider_token): New arg `level'.  New state `tag_ok' in `tydef'.
-
-1988-06-14  Richard Stallman  (rms@sugar-bombs.ai.mit.edu)
-
-        * etags.c: Changes for VMS.
-        Always define ETAGS on VMS.
-        Define macros GOOD and BAD for success and failure exit codes.
-        (begtk, intk): Allow `$' in identifiers.
-        (main): Don't support -B, -F or -u on VMS.
-        Alternate loop for scanning filename arguments.
-        (system): Delete definition of this function.
-
-        * etags-vmslib.c (system): Undefine this; VMS now provides it.
-
-1988-06-08  Richard Stallman  (rms@sugar-bombs.ai.mit.edu)
-
-        * loadst.c: Prevent multiple-def errors on BSD and BSD4_3
-        around include of param.h.  (Like fns.c.)
-
-1988-05-16  Richard Stallman  (rms@frosted-flakes.ai.mit.edu)
-
-        * loadst.c (load_average): Move load-average code to this new fn.
-        Add conditionals to compute load ave on UMAX.
-
-1988-05-14  Richard Stallman  (rms@lucky-charms.ai.mit.edu)
-
-        * loadst.c: Change DK_HEADER_FILE to DKSTAT_HEADER_FILE
-        with opposite sense.
-
-1988-05-13  Chris Hanson  (cph@kleph)
-
-        * emacsclient.c: Delete references to unused variable `out'.
-        This caused a bus error when used under hp-ux.
-
-1988-05-06  Richard Stallman  (rms@frosted-flakes.ai.mit.edu)
-
-        * loadst.c: Control dk.h conditional with DK_HEADER_FILE.
-
-1988-05-04  Richard Stallman  (rms@rice-krispies.ai.mit.edu)
-
-        * etags.c (find_entries): `.t' or `.sch' means scheme code.
-
-1988-04-29  Richard Stallman  (rms@frosted-flakes.ai.mit.edu)
-
-        * loadst.c: Add BSD4_3 conditional for file dk.h instead of dkstat.h.
-
-1988-04-28  Richard Stallman  (rms@frosted-flakes.ai.mit.edu)
-
-        * movemail.c: #undef close, since config can #define it on V.3.
-        * emacsclient.c, fakemail.c, loadst.c, server.c: Likewise.
-
-1988-04-26  Richard Stallman  (rms@lucky-charms.ai.mit.edu)
-
-        * etags.c (TEX_mode, etc.): Remove superfluous backslashes from
-        invalid escape sequences such as `\{'.
-
-        * loadst.c: Add `sequent' conditional for file dk.h.
-
-1988-03-20  Richard M. Stallman  (rms@wilson)
-
-        * server.c [not BSD and not HAVE_SYSVIPC]: Fix error message.
+1992-04-08  Jim Blandy  (jimb@pogo.cs.oberlin.edu)
 
-        * loadst.c (main) [XENIX]: Use /usr/spool/mail, not /usr/mail.
+        New directory, with files previously in ../etc. [approximate date]
+        * README: New file.
+        * Makefile: Copy here from ../etc/Makefile.
+        * aixcc.lex, b2m.c, cvtmail.c, digest-doc.c:
+        * emacsclient.c, emacsserver.c, emacstool.c, env.c:
+        * etags-vmslib.c, etags.c, fakemail.c, getdate.c, getdate.y:
+        * getopt.c, getopt.h, getopt1.c, hexl.c, leditcfns.c:
+        * make-docfile.c, movemail.c, qsort.c, sorted-doc.c:
+        * test-distrib.c, testfile, timer.c, wakeup.c, yow.c:
+        Move here from ../etc.
 
 ;; Local Variables:
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 1988-1999, 2001-2013 Free Software Foundation, Inc.
+  Copyright (C) 1988-1999, 2001-2014 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 8a6960ee2fe..56cdc09e0fe 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -1,5 +1,6 @@
-# Makefile for lib-src subdirectory in GNU Emacs.
-# Copyright (C) 1985, 1987-1988, 1993-1994, 2001-2013 Free Software
+### @configure_input@
+
+# Copyright (C) 1985, 1987-1988, 1993-1994, 2001-2014 Free Software
 # Foundation, Inc.
 
 # This file is part of GNU Emacs.
@@ -17,10 +18,7 @@
 # You should have received a copy of the GNU General Public License
 # along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
-
-# Avoid trouble on systems where the `SHELL' variable might be
-# inherited from the environment.
-SHELL = /bin/sh
+SHELL = @SHELL@
 
 # Following ../lisp/Makefile.in.
 EMACS = ../src/emacs
@@ -39,6 +37,7 @@ C_SWITCH_MACHINE=@C_SWITCH_MACHINE@
 PROFILING_CFLAGS = @PROFILING_CFLAGS@
 WARN_CFLAGS = @WARN_CFLAGS@
 WERROR_CFLAGS = @WERROR_CFLAGS@
+UPDATE_MANIFEST = @UPDATE_MANIFEST@
 
 # Program name transformation.
 TRANSFORM = @program_transform_name@
@@ -85,6 +84,8 @@ VPATH=@srcdir@
 
 # The top-level source directory, also set by configure.
 top_srcdir=@top_srcdir@
+# MinGW CPPFLAGS may use this.
+abs_top_srcdir=@abs_top_srcdir@
 
 # ==================== Emacs-specific directories ====================
 
@@ -113,8 +114,11 @@ MKDIR_P = @MKDIR_P@
 
 # ========================== Lists of Files ===========================
 
+# emacsclientw.exe for MinGW, empty otherwise
+CLIENTW = @CLIENTW@
+
 # Things that a user might actually run, which should be installed in bindir.
-INSTALLABLES = etags${EXEEXT} ctags${EXEEXT} emacsclient${EXEEXT} \
+INSTALLABLES = etags${EXEEXT} ctags${EXEEXT} emacsclient${EXEEXT} $(CLIENTW) \
                ebrowse${EXEEXT}
 
 INSTALLABLE_SCRIPTS = grep-changelog
@@ -128,7 +132,7 @@ DONT_INSTALL= test-distrib${EXEEXT} make-docfile${EXEEXT}
 
 # Like UTILITIES, but they're not system-dependent, and should not be
 #  deleted by the distclean target.
-SCRIPTS= rcs2log
+SCRIPTS= rcs2log $(UPDATE_MANIFEST)
 
 # All files that are created by the linker, i.e., whose names end in ${EXEEXT}.
 EXE_FILES = ${INSTALLABLES} ${UTILITIES} ${DONT_INSTALL}
@@ -143,17 +147,17 @@ MOVE_FLAGS=
 ## Empty if either MAIL_USE_FLOCK or MAIL_USE_LOCKF, else need-blessmail.
 BLESSMAIL_TARGET=@BLESSMAIL_TARGET@
 
-## -lkrb if HAVE_LIBKRB or -lkrb4 if HAVE_LIBKRB4
+## -lkrb or -lkrb4 if needed
 KRB4LIB=@KRB4LIB@
-## -ldes if HAVE_LIBDES or -ldes425 if HAVE_LIBDES425
+## -ldes or -ldes425 if needed
 DESLIB=@DESLIB@
-## -lkrb5 if HAVE_LIBKRB5
+## -lkrb5 if needed
 KRB5LIB=@KRB5LIB@
-## -lk5crypto if HAVE_LIBK5CRYPTO or -lcrypto if HAVE_LIBCRYPTO
+## -lk5crypto or -lcrypto if needed
 CRYPTOLIB=@CRYPTOLIB@
-## -lcom_err if HAVE_LIBCOM_ERR
+## -lcom_err if needed
 COM_ERRLIB=@COM_ERRLIB@
-## -lhesiod if HAVE_LIBHESIOD
+## -lhesiod if needed
 LIBHESIOD=@LIBHESIOD@
 ## -lresolv if HAVE_LIBRESOLV
 LIBRESOLV=@LIBRESOLV@
@@ -161,10 +165,23 @@ LIBRESOLV=@LIBRESOLV@
 LIBS_MAIL=@LIBS_MAIL@
 ## empty or -lrt or -lposix4 if HAVE_CLOCK_GETTIME
 LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@
+## empty or -lrt or -lposix4 if HAVE_FDATASYNC
+LIB_FDATASYNC = @LIB_FDATASYNC@
+## empty or -lwsock2 for MinGW
+LIB_WSOCK32=@LIB_WSOCK32@
 
 ## Extra libraries to use when linking movemail.
 LIBS_MOVE = $(LIBS_MAIL) $(KRB4LIB) $(DESLIB) $(KRB5LIB) $(CRYPTOLIB) \
-            $(COM_ERRLIB) $(LIBHESIOD) $(LIBRESOLV)
+            $(COM_ERRLIB) $(LIBHESIOD) $(LIBRESOLV) $(LIB_WSOCK32)
+
+## Extra libraries when linking emacsclient
+## (empty or -lcomctl32 for MinGW)
+LIBS_ECLIENT = @LIBS_ECLIENT@
+
+## Extra object files for linking for MinGW
+NTLIB = @NTLIB@
+CLIENTRES = @CLIENTRES@
+WINDRES = @WINDRES@
 
 ## Some systems define this to request special libraries.
 LIBS_SYSTEM = @LIBS_SYSTEM@
@@ -199,10 +216,10 @@ blessmail:
 need-blessmail: blessmail
         @if [ `wc -l <blessmail` != 2 ] ; then \
           dir=`sed -n -e 's/echo mail directory = \(.*\)/\1/p' blessmail`; \
-          echo Assuming $$dir is really the mail spool directory, you should; \
-          echo run  lib-src/blessmail $(DESTDIR)${archlibdir}/movemail${EXEEXT}; \
-          echo as root, to give  movemail${EXEEXT}  appropriate permissions.; \
-          echo Do that after running  make install.; \
+          echo "Assuming $$dir is really the mail spool directory, you should"; \
+          echo "run  lib-src/blessmail $(DESTDIR)${archlibdir}/movemail${EXEEXT}"; \
+          echo "as root, to give  movemail${EXEEXT}  appropriate permissions."; \
+          echo "Do that after running  make install."; \
         fi
 
 ## This is the target invoked by the top-level Makefile.
@@ -216,23 +233,24 @@ maybe-blessmail: $(BLESSMAIL_TARGET)
 $(DESTDIR)${archlibdir}: all
         @echo
         @echo "Installing utilities run internally by Emacs."
-        umask 022; ${MKDIR_P} $(DESTDIR)${archlibdir}
-        if [ `cd $(DESTDIR)${archlibdir} && /bin/pwd` != `/bin/pwd` ]; then \
+        umask 022; ${MKDIR_P} "$(DESTDIR)${archlibdir}"
+        exp_archlibdir=`cd "$(DESTDIR)${archlibdir}" && /bin/pwd`; \
+        if [ "$$exp_archlibdir" != "`/bin/pwd`" ]; then \
           for file in ${UTILITIES}; do \
-            $(INSTALL_PROGRAM) $(INSTALL_STRIP) $$file $(DESTDIR)${archlibdir}/$$file ; \
+            $(INSTALL_PROGRAM) $(INSTALL_STRIP) $$file "$(DESTDIR)${archlibdir}/$$file" ; \
           done ; \
         fi
-        umask 022; ${MKDIR_P} $(DESTDIR)${gamedir}; \
-        touch $(DESTDIR)${gamedir}/snake-scores; \
-        touch $(DESTDIR)${gamedir}/tetris-scores
-        -if chown ${gameuser} $(DESTDIR)${archlibdir}/update-game-score && chmod u+s $(DESTDIR)${archlibdir}/update-game-score; then \
-          chown ${gameuser} $(DESTDIR)${gamedir}; \
-          chmod u=rwx,g=rwx,o=rx $(DESTDIR)${gamedir}; \
+        umask 022; ${MKDIR_P} "$(DESTDIR)${gamedir}"; \
+        touch "$(DESTDIR)${gamedir}/snake-scores"; \
+        touch "$(DESTDIR)${gamedir}/tetris-scores"
+        -if chown ${gameuser} "$(DESTDIR)${archlibdir}/update-game-score${EXEEXT}" && chmod u+s "$(DESTDIR)${archlibdir}/update-game-score${EXEEXT}"; then \
+          chown ${gameuser} "$(DESTDIR)${gamedir}"; \
+          chmod u=rwx,g=rwx,o=rx "$(DESTDIR)${gamedir}"; \
         fi
-        if [ `cd $(DESTDIR)${archlibdir} && /bin/pwd` \
-             != `cd ${srcdir} && /bin/pwd` ]; then \
+        if [ "`cd \"$(DESTDIR)${archlibdir}\" && /bin/pwd`" \
+             != "`cd ${srcdir} && /bin/pwd`" ]; then \
           for file in ${SCRIPTS}; do \
-            $(INSTALL_SCRIPT) ${srcdir}/$$file $(DESTDIR)${archlibdir}/$$file; \
+            $(INSTALL_SCRIPT) ${srcdir}/$$file "$(DESTDIR)${archlibdir}/$$file"; \
           done ; \
         fi
 
@@ -242,27 +260,27 @@ $(DESTDIR)${archlibdir}: all
 install: $(DESTDIR)${archlibdir}
         @echo
         @echo "Installing utilities for users to run."
-        umask 022; ${MKDIR_P} $(DESTDIR)${bindir}
+        umask 022; ${MKDIR_P} "$(DESTDIR)${bindir}"
         for file in ${INSTALLABLES} ; do \
-          $(INSTALL_PROGRAM) $(INSTALL_STRIP) $${file} $(DESTDIR)${bindir}/`echo $${file} | sed -e 's/${EXEEXT}$$//' -e '$(TRANSFORM)'`${EXEEXT} ; \
+          $(INSTALL_PROGRAM) $(INSTALL_STRIP) $${file} "$(DESTDIR)${bindir}"/`echo $${file} | sed -e 's/${EXEEXT}$$//' -e '$(TRANSFORM)'`${EXEEXT} ; \
         done
         for file in ${INSTALLABLE_SCRIPTS} ; do \
-          $(INSTALL_SCRIPT) ${srcdir}/$${file} $(DESTDIR)${bindir}/`echo $${file} | sed '$(TRANSFORM)'`  ; \
+          $(INSTALL_SCRIPT) ${srcdir}/$${file} "$(DESTDIR)${bindir}"/`echo $${file} | sed '$(TRANSFORM)'`  ; \
         done
 
 uninstall:
         for file in ${INSTALLABLES}; do \
-          rm -f $(DESTDIR)${bindir}/`echo $${file} | sed -e 's/${EXEEXT}$$//' -e '$(TRANSFORM)'`${EXEEXT} ; \
+          rm -f "$(DESTDIR)${bindir}"/`echo $${file} | sed -e 's/${EXEEXT}$$//' -e '$(TRANSFORM)'`${EXEEXT} ; \
         done
         for file in ${INSTALLABLE_SCRIPTS}; do \
-          rm -f $(DESTDIR)${bindir}/`echo $${file} | sed '$(TRANSFORM)'` ; \
+          rm -f "$(DESTDIR)${bindir}"/`echo $${file} | sed '$(TRANSFORM)'` ; \
         done
-        if [ -d $(DESTDIR)${archlibdir} ]; then \
-          (cd $(DESTDIR)${archlibdir} && rm -f ${UTILITIES} ${SCRIPTS}) \
+        if [ -d "$(DESTDIR)${archlibdir}" ]; then \
+          (cd "$(DESTDIR)${archlibdir}" && rm -f ${UTILITIES} ${SCRIPTS}) \
         fi
 
 mostlyclean:
-        -rm -f core *.o
+        -rm -f core *.o *.res
 
 clean: mostlyclean
         -rm -f ${EXE_FILES}
@@ -290,57 +308,77 @@ TAGS: etags${EXEEXT}
 ## distribute Emacs.  If they were clobbered, all the .elc files were
 ## clobbered too.
 test-distrib${EXEEXT}: ${srcdir}/test-distrib.c
-        $(CC) ${ALL_CFLAGS} -o test-distrib ${srcdir}/test-distrib.c
+        $(CC) ${ALL_CFLAGS} -o test-distrib${EXEEXT} ${srcdir}/test-distrib.c
         ./test-distrib ${srcdir}/testfile
 
 ../lib/libgnu.a: $(config_h)
         cd ../lib && $(MAKE) libgnu.a
 
 regex.o: $(srcdir)/../src/regex.c $(srcdir)/../src/regex.h $(config_h)
-        ${CC} -c ${CPP_CFLAGS} -DCONFIG_BROKETS -DINHIBIT_STRING_HEADER \
-          ${srcdir}/../src/regex.c
+        ${CC} -c ${CPP_CFLAGS} ${srcdir}/../src/regex.c
 
-etags${EXEEXT}: ${srcdir}/etags.c regex.o $(config_h)
+etags${EXEEXT}: ${srcdir}/etags.c regex.o $(NTLIB) $(config_h)
         $(CC) ${ALL_CFLAGS} -DEMACS_NAME="\"GNU Emacs\"" \
           -DVERSION="\"${version}\"" ${srcdir}/etags.c \
-          regex.o $(LOADLIBES) -o etags
+          regex.o $(LOADLIBES) $(NTLIB) -o etags${EXEEXT}
 
-ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ${srcdir}/../lib/min-max.h $(config_h)
+ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ${srcdir}/../lib/min-max.h $(NTLIB) \
+                   $(config_h)
         $(CC) ${ALL_CFLAGS} -DVERSION="\"${version}\"" \
-          ${srcdir}/ebrowse.c $(LOADLIBES) -o ebrowse
+          ${srcdir}/ebrowse.c $(LOADLIBES) $(NTLIB) -o ebrowse${EXEEXT}
 
 ## We depend on etags to assure that parallel makes do not write two
 ## etags.o files on top of each other.
 ctags${EXEEXT}: etags${EXEEXT}
         $(CC) ${ALL_CFLAGS} -DCTAGS -DEMACS_NAME="\"GNU Emacs\"" \
           -DVERSION="\"${version}\"" ${srcdir}/etags.c \
-          regex.o $(LOADLIBES) -o ctags
+          regex.o $(LOADLIBES) $(NTLIB) -o ctags${EXEEXT}
 
-profile${EXEEXT}: ${srcdir}/profile.c $(config_h)
+profile${EXEEXT}: ${srcdir}/profile.c $(NTLIB) $(config_h)
         $(CC) ${ALL_CFLAGS} ${srcdir}/profile.c \
-          $(LOADLIBES) $(LIB_CLOCK_GETTIME) -o profile
+          $(LOADLIBES) $(NTLIB) $(LIB_CLOCK_GETTIME) -o profile${EXEEXT}
 
-make-docfile${EXEEXT}: ${srcdir}/make-docfile.c $(config_h)
-        $(CC) ${ALL_CFLAGS} ${srcdir}/make-docfile.c $(LOADLIBES) \
-          -o make-docfile
+make-docfile${EXEEXT}: ${srcdir}/make-docfile.c $(NTLIB) $(config_h)
+        $(CC) ${ALL_CFLAGS} ${srcdir}/make-docfile.c $(LOADLIBES) $(NTLIB) \
+          -o make-docfile${EXEEXT}
 
-movemail${EXEEXT}: ${srcdir}/movemail.c pop.o $(config_h)
+movemail${EXEEXT}: ${srcdir}/movemail.c pop.o $(NTLIB) $(config_h)
         $(CC) ${ALL_CFLAGS} ${MOVE_FLAGS} ${srcdir}/movemail.c pop.o \
-          $(LOADLIBES) $(LIBS_MOVE) -o movemail
+          $(LOADLIBES) $(NTLIB) $(LIBS_MOVE) -o movemail${EXEEXT}
 
-pop.o: ${srcdir}/pop.c ${srcdir}/../lib/min-max.h $(config_h)
+pop.o: ${srcdir}/pop.c ${srcdir}/pop.h ${srcdir}/../lib/min-max.h $(config_h)
         $(CC) -c ${CPP_CFLAGS} ${MOVE_FLAGS} ${srcdir}/pop.c
 
-emacsclient${EXEEXT}: ${srcdir}/emacsclient.c $(config_h)
+emacsclient${EXEEXT}: ${srcdir}/emacsclient.c $(NTLIB) $(config_h)
         $(CC) ${ALL_CFLAGS} ${srcdir}/emacsclient.c \
-           -DVERSION="\"${version}\"" \
-           $(LOADLIBES) -o emacsclient
+           -DVERSION="\"${version}\"" $(NTLIB) $(LOADLIBES) $(LIB_FDATASYNC) \
+           $(LIB_WSOCK32) $(LIBS_ECLIENT) -o emacsclient${EXEEXT}
 
-hexl${EXEEXT}: ${srcdir}/hexl.c $(config_h)
-        $(CC) ${ALL_CFLAGS} ${srcdir}/hexl.c $(LOADLIBES) -o hexl
+emacsclientw${EXEEXT}: ${srcdir}/emacsclient.c $(NTLIB) $(CLIENTRES) $(config_h)
+        $(CC) ${ALL_CFLAGS} $(CLIENTRES) -mwindows ${srcdir}/emacsclient.c \
+           -DVERSION="\"${version}\"" $(LOADLIBES) $(LIB_FDATASYNC) \
+           $(LIB_WSOCK32) $(LIBS_ECLIENT) -o emacsclientw${EXEEXT}
 
-update-game-score${EXEEXT}: ${srcdir}/update-game-score.c $(config_h)
+NTINC = ${srcdir}/../nt/inc
+NTDEPS = $(NTINC)/ms-w32.h $(NTINC)/sys/stat.h $(NTINC)/inttypes.h \
+ $(NTINC)/stdint.h $(NTINC)/pwd.h $(NTINC)/sys/time.h $(NTINC)/stdbool.h \
+ $(NTINC)/sys/wait.h $(NTINC)/unistd.h $(NTINC)/sys/file.h $(NTINC)/netdb.h
+
+# The dependency on $(NTDEPS) is a trick intended to cause recompile of
+# programs on MinGW whenever some private header in nt/inc is modified.
+ntlib.o: ${srcdir}/ntlib.c ${srcdir}/ntlib.h $(NTDEPS)
+        $(CC) -c ${CPP_CFLAGS} ${srcdir}/ntlib.c
+
+hexl${EXEEXT}: ${srcdir}/hexl.c $(NTLIB) $(config_h)
+        $(CC) ${ALL_CFLAGS} ${srcdir}/hexl.c $(LOADLIBES) -o hexl${EXEEXT}
+
+update-game-score${EXEEXT}: ${srcdir}/update-game-score.c $(NTLIB) $(config_h)
         $(CC) ${ALL_CFLAGS} -DHAVE_SHARED_GAME_DIR="\"$(gamedir)\"" \
-          ${srcdir}/update-game-score.c $(LOADLIBES) -o update-game-score
+          ${srcdir}/update-game-score.c $(LOADLIBES) $(NTLIB) \
+          -o update-game-score${EXEEXT}
+
+emacsclient.res: $(NTINC)/../emacsclient.rc
+        $(WINDRES) -O coff --include-dir=$(NTINC)/.. -o emacsclient.res \
+          $(NTINC)/../emacsclient.rc
 
 ## Makefile ends here.
diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c
index 3a237daf5f8..29a88e85f02 100644
--- a/lib-src/ebrowse.c
+++ b/lib-src/ebrowse.c
@@ -1,6 +1,6 @@
 /* ebrowse.c --- parsing files for the ebrowse C++ browser
 
-Copyright (C) 1992-2013 Free Software Foundation, Inc.
+Copyright (C) 1992-2014 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -19,6 +19,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
 #include <config.h>
+#include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -237,7 +238,7 @@ struct member
   char *def_regexp;             /* Regular expression matching definition.  */
   const char *def_filename;     /* File name of definition.  */
   int def_pos;                  /* Buffer position of definition.  */
-  char name[1];                 /* Member name.  */
+  char name[FLEXIBLE_ARRAY_MEMBER]; /* Member name.  */
 };
 
 /* Structures of this type are used to connect class structures with
@@ -256,7 +257,7 @@ struct alias
   struct alias *next;           /* Next in list.  */
   struct sym *namesp;           /* Namespace in which defined.  */
   struct link *aliasee;         /* List of aliased namespaces (A::B::C...).  */
-  char name[1];                 /* Alias name.  */
+  char name[FLEXIBLE_ARRAY_MEMBER]; /* Alias name.  */
 };
 
 /* The structure used to describe a class in the symbol table,
@@ -280,7 +281,7 @@ struct sym
   const char *filename;         /* File in which it can be found.  */
   const char *sfilename;        /* File in which members can be found.  */
   struct sym *namesp;           /* Namespace in which defined. .  */
-  char name[1];                 /* Name of the class.  */
+  char name[FLEXIBLE_ARRAY_MEMBER]; /* Name of the class.  */
 };
 
 /* Experimental: Print info for `--position-info'.  We print
@@ -513,7 +514,7 @@ static char *
 xstrdup (char *s)
 {
   if (s)
-    s = strcpy (xmalloc (strlen (s) + 1), s);
+    return strcpy (xmalloc (strlen (s) + 1), s);
   return s;
 }
 
@@ -567,8 +568,8 @@ add_sym (const char *name, struct sym *nested_in_class)
           puts (name);
         }
 
-      sym = (struct sym *) xmalloc (sizeof *sym + strlen (name));
-      memset (sym, 0, sizeof *sym);
+      sym = xmalloc (offsetof (struct sym, name) + strlen (name) + 1);
+      memset (sym, 0, offsetof (struct sym, name));
       strcpy (sym->name, name);
       sym->namesp = scope;
       sym->next = class_table[h];
@@ -852,7 +853,8 @@ add_global_decl (char *name, char *regexp, int pos, unsigned int hash, int var,
 static struct member *
 add_member (struct sym *cls, char *name, int var, int sc, unsigned int hash)
 {
-  struct member *m = (struct member *) xmalloc (sizeof *m + strlen (name));
+  struct member *m = xmalloc (offsetof (struct member, name)
+                              + strlen (name) + 1);
   struct member **list;
   struct member *p;
   struct member *prev;
@@ -962,8 +964,8 @@ mark_inherited_virtual (void)
 static struct sym *
 make_namespace (char *name, struct sym *context)
 {
-  struct sym *s = (struct sym *) xmalloc (sizeof *s + strlen (name));
-  memset (s, 0, sizeof *s);
+  struct sym *s = xmalloc (offsetof (struct sym, name) + strlen (name) + 1);
+  memset (s, 0, offsetof (struct sym, name));
   strcpy (s->name, name);
   s->next = all_namespaces;
   s->namesp = context;
@@ -1046,7 +1048,7 @@ register_namespace_alias (char *new_name, struct link *old_name)
     if (streq (new_name, al->name) && (al->namesp == current_namespace))
       return;
 
-  al = (struct alias *) xmalloc (sizeof *al + strlen (new_name));
+  al = xmalloc (offsetof (struct alias, name) + strlen (new_name) + 1);
   strcpy (al->name, new_name);
   al->next = namespace_alias_table[h];
   al->namesp = current_namespace;
@@ -1094,7 +1096,7 @@ leave_namespace (void)
 /* Write string S to the output file FP in a Lisp-readable form.
    If S is null, write out `()'.  */
 
-static inline void
+static void
 putstr (const char *s, FILE *fp)
 {
   if (!s)
@@ -3479,7 +3481,9 @@ open_file (char *file)
 
 /* Display usage information and exit program.  */
 
-#define USAGE "\
+static char const *const usage_message[] =
+  {
+    "\
 Usage: ebrowse [options] {files}\n\
 \n\
   -a, --append                  append output to existing file\n\
@@ -3487,6 +3491,8 @@ Usage: ebrowse [options] {files}\n\
   -I, --search-path=LIST        set search path for input files\n\
   -m, --min-regexp-length=N     set minimum regexp length to N\n\
   -M, --max-regexp-length=N     set maximum regexp length to N\n\
+",
+    "\
   -n, --no-nested-classes       exclude nested classes\n\
   -o, --output-file=FILE        set output file name to FILE\n\
   -p, --position-info           print info about position in file\n\
@@ -3496,12 +3502,16 @@ Usage: ebrowse [options] {files}\n\
   -x, --no-regexps              don't record regular expressions\n\
       --help                    display this help\n\
       --version                 display version info\n\
+\n\
 "
+  };
 
 static _Noreturn void
 usage (int error)
 {
-  puts (USAGE);
+  int i;
+  for (i = 0; i < sizeof usage_message / sizeof *usage_message; i++)
+    fputs (usage_message[i], stdout);
   exit (error ? EXIT_FAILURE : EXIT_SUCCESS);
 }
 
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 6feaf18ba60..6593b91e39a 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -1,6 +1,6 @@
 /* Client process that communicates with GNU Emacs acting as server.
 
-Copyright (C) 1986-1987, 1994, 1999-2013 Free Software Foundation, Inc.
+Copyright (C) 1986-1987, 1994, 1999-2014 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -103,14 +103,6 @@ char *getenv (const char *);
 #define EXIT_FAILURE 1
 #endif
 
-#ifndef FALSE
-#define FALSE 0
-#endif
-
-#ifndef TRUE
-#define TRUE 1
-#endif
-
 /* Additional space when allocating buffers for filenames, etc.  */
 #define EXTRA_SPACE 100
 
@@ -433,9 +425,9 @@ ttyname (int fd)
 
 /* Display a normal or error message.
    On Windows, use a message box if compiled as a Windows app.  */
-static void message (int, const char *, ...) ATTRIBUTE_FORMAT_PRINTF (2, 3);
+static void message (bool, const char *, ...) ATTRIBUTE_FORMAT_PRINTF (2, 3);
 static void
-message (int is_error, const char *format, ...)
+message (bool is_error, const char *format, ...)
 {
   va_list args;
 
@@ -528,7 +520,7 @@ decode_options (int argc, char **argv)
           break;
 
         case 'V':
-          message (FALSE, "emacsclient %s\n", VERSION);
+          message (false, "emacsclient %s\n", VERSION);
           exit (EXIT_SUCCESS);
           break;
 
@@ -555,7 +547,7 @@ decode_options (int argc, char **argv)
           break;
 
         default:
-          message (TRUE, "Try `%s --help' for more information\n", progname);
+          message (true, "Try `%s --help' for more information\n", progname);
           exit (EXIT_FAILURE);
           break;
         }
@@ -614,7 +606,7 @@ decode_options (int argc, char **argv)
 
   if (alternate_editor && alternate_editor[0] == '\0')
     {
-      message (TRUE, "--alternate-editor argument or ALTERNATE_EDITOR variable cannot be\n\
+      message (true, "--alternate-editor argument or ALTERNATE_EDITOR variable cannot be\n\
 an empty string");
       exit (EXIT_FAILURE);
     }
@@ -629,8 +621,8 @@ print_help_and_exit (void)
      message aligns properly both in a tty and in a Windows message box.
      Please try to preserve them; otherwise the output is very hard to read
      when using emacsclientw.  */
-  message (FALSE,
-           "Usage: %s [OPTIONS] FILE...\n\
+  message (false,
+           "Usage: %s [OPTIONS] FILE...\n%s%s%s", progname, "\
 Tell the Emacs server to visit the specified files.\n\
 Every FILE can be either just a FILENAME or [+LINE[:COLUMN]] FILENAME.\n\
 \n\
@@ -640,6 +632,7 @@ The following OPTIONS are accepted:\n\
 -nw, -t, --tty          Open a new Emacs frame on the current terminal\n\
 -c, --create-frame      Create a new frame instead of trying to\n\
                         use the current Emacs frame\n\
+", "\
 -F ALIST, --frame-parameters=ALIST\n\
                         Set the parameters of a new frame\n\
 -e, --eval              Evaluate the FILE arguments as ELisp expressions\n\
@@ -647,6 +640,7 @@ The following OPTIONS are accepted:\n\
 -q, --quiet             Don't display messages on success\n\
 -d DISPLAY, --display=DISPLAY\n\
                         Visit the file in the given display\n\
+", "\
 --parent-id=ID          Open in parent window ID, via XEmbed\n"
 #ifndef NO_SOCKETS_IN_FILE_SYSTEM
 "-s SOCKET, --socket-name=SOCKET\n\
@@ -661,7 +655,7 @@ The following OPTIONS are accepted:\n\
                         mode and try connecting again\n"
 #endif /* not WINDOWSNT */
 "\n\
-Report bugs with M-x report-emacs-bug.\n", progname);
+Report bugs with M-x report-emacs-bug.\n");
   exit (EXIT_SUCCESS);
 }
 
@@ -677,7 +671,7 @@ fail (void)
       int i = optind - 1;
 
       execvp (alternate_editor, main_argv + i);
-      message (TRUE, "%s: error executing alternate editor \"%s\"\n",
+      message (true, "%s: error executing alternate editor \"%s\"\n",
                progname, alternate_editor);
     }
   exit (EXIT_FAILURE);
@@ -691,7 +685,7 @@ main (int argc, char **argv)
 {
   main_argv = argv;
   progname = argv[0];
-  message (TRUE, "%s: Sorry, the Emacs server is supported only\n"
+  message (true, "%s: Sorry, the Emacs server is supported only\n"
            "on systems with Berkeley sockets.\n",
            argv[0]);
   fail ();
@@ -722,11 +716,11 @@ sock_err_message (const char *function_name)
                  | FORMAT_MESSAGE_ARGUMENT_ARRAY,
                  NULL, WSAGetLastError (), 0, (LPTSTR)&msg, 0, NULL);
 
-  message (TRUE, "%s: %s: %s\n", progname, function_name, msg);
+  message (true, "%s: %s: %s\n", progname, function_name, msg);
 
   LocalFree (msg);
 #else
-  message (TRUE, "%s: %s: %s\n", progname, function_name, strerror (errno));
+  message (true, "%s: %s: %s\n", progname, function_name, strerror (errno));
 #endif
 }
 
@@ -757,7 +751,7 @@ send_to_emacs (HSOCKET s, const char *data)
           int sent = send (s, send_buffer, sblen, 0);
           if (sent < 0)
             {
-              message (TRUE, "%s: failed to send %d bytes to socket: %s\n",
+              message (true, "%s: failed to send %d bytes to socket: %s\n",
                        progname, sblen, strerror (errno));
               fail ();
             }
@@ -852,25 +846,25 @@ static int
 file_name_absolute_p (const char *filename)
 {
   /* Sanity check, it shouldn't happen.  */
-  if (! filename) return FALSE;
+  if (! filename) return false;
 
   /* /xxx is always an absolute path.  */
-  if (filename[0] == '/') return TRUE;
+  if (filename[0] == '/') return true;
 
   /* Empty filenames (which shouldn't happen) are relative.  */
-  if (filename[0] == '\0') return FALSE;
+  if (filename[0] == '\0') return false;
 
 #ifdef WINDOWSNT
   /* X:\xxx is always absolute.  */
   if (isalpha ((unsigned char) filename[0])
       && filename[1] == ':' && (filename[2] == '\\' || filename[2] == '/'))
-    return TRUE;
+    return true;
 
   /* Both \xxx and \\xxx\yyy are absolute.  */
-  if (filename[0] == '\\') return TRUE;
+  if (filename[0] == '\\') return true;
 #endif
 
-  return FALSE;
+  return false;
 }
 
 #ifdef WINDOWSNT
@@ -889,7 +883,7 @@ initialize_sockets (void)
 
   if (WSAStartup (MAKEWORD (2, 0), &wsaData))
     {
-      message (TRUE, "%s: error initializing WinSock2\n", progname);
+      message (true, "%s: error initializing WinSock2\n", progname);
       exit (EXIT_FAILURE);
     }
 
@@ -940,14 +934,14 @@ get_server_config (const char *config_file, struct sockaddr_in *server,
     }
 
   if (! config)
-    return FALSE;
+    return false;
 
   if (fgets (dotted, sizeof dotted, config)
       && (port = strchr (dotted, ':')))
     *port++ = '\0';
   else
     {
-      message (TRUE, "%s: invalid configuration info\n", progname);
+      message (true, "%s: invalid configuration info\n", progname);
       exit (EXIT_FAILURE);
     }
 
@@ -957,13 +951,13 @@ get_server_config (const char *config_file, struct sockaddr_in *server,
 
   if (! fread (authentication, AUTH_KEY_LENGTH, 1, config))
     {
-      message (TRUE, "%s: cannot read authentication info\n", progname);
+      message (true, "%s: cannot read authentication info\n", progname);
       exit (EXIT_FAILURE);
     }
 
   fclose (config);
 
-  return TRUE;
+  return true;
 }
 
 static HSOCKET
@@ -978,7 +972,7 @@ set_tcp_socket (const char *local_server_file)
     return INVALID_SOCKET;
 
   if (server.sin_addr.s_addr != inet_addr ("127.0.0.1") && !quiet)
-    message (FALSE, "%s: connected to remote socket at %s\n",
+    message (false, "%s: connected to remote socket at %s\n",
              progname, inet_ntoa (server.sin_addr));
 
   /* Open up an AF_INET socket.  */
@@ -1031,7 +1025,7 @@ find_tty (const char **tty_type, const char **tty_name, int noabort)
         return 0;
       else
         {
-          message (TRUE, "%s: could not get terminal name\n", progname);
+          message (true, "%s: could not get terminal name\n", progname);
           fail ();
         }
     }
@@ -1042,7 +1036,7 @@ find_tty (const char **tty_type, const char **tty_name, int noabort)
         return 0;
       else
         {
-          message (TRUE, "%s: please set the TERM variable to your terminal type\n",
+          message (true, "%s: please set the TERM variable to your terminal type\n",
                    progname);
           fail ();
         }
@@ -1055,7 +1049,7 @@ find_tty (const char **tty_type, const char **tty_name, int noabort)
       else
         {
           /* This causes nasty, MULTI_KBOARD-related input lockouts. */
-          message (TRUE, "%s: opening a frame in an Emacs term buffer"
+          message (true, "%s: opening a frame in an Emacs term buffer"
                    " is not supported\n", progname);
           fail ();
         }
@@ -1186,7 +1180,7 @@ set_local_socket (const char *local_socket_name)
   /* Open up an AF_UNIX socket in this person's home directory.  */
   if ((s = socket (AF_UNIX, SOCK_STREAM, 0)) < 0)
     {
-      message (TRUE, "%s: socket: %s\n", progname, strerror (errno));
+      message (true, "%s: socket: %s\n", progname, strerror (errno));
       return INVALID_SOCKET;
     }
 
@@ -1237,7 +1231,7 @@ set_local_socket (const char *local_socket_name)
       strcpy (server.sun_path, local_socket_name);
     else
       {
-        message (TRUE, "%s: socket-name %s too long\n",
+        message (true, "%s: socket-name %s too long\n",
                  progname, local_socket_name);
         fail ();
       }
@@ -1276,7 +1270,7 @@ set_local_socket (const char *local_socket_name)
                   strcpy (server.sun_path, user_socket_name);
                 else
                   {
-                    message (TRUE, "%s: socket-name %s too long\n",
+                    message (true, "%s: socket-name %s too long\n",
                              progname, user_socket_name);
                     exit (EXIT_FAILURE);
                   }
@@ -1300,7 +1294,7 @@ set_local_socket (const char *local_socket_name)
            we are root. */
         if (0 != geteuid ())
           {
-            message (TRUE, "%s: Invalid socket owner\n", progname);
+            message (true, "%s: Invalid socket owner\n", progname);
             return INVALID_SOCKET;
           }
         break;
@@ -1308,12 +1302,12 @@ set_local_socket (const char *local_socket_name)
       case 2:
         /* `stat' failed */
         if (saved_errno == ENOENT)
-          message (TRUE,
+          message (true,
                    "%s: can't find socket; have you started the server?\n\
 To start the server in Emacs, type \"M-x server-start\".\n",
                    progname);
         else
-          message (TRUE, "%s: can't stat %s: %s\n",
+          message (true, "%s: can't stat %s: %s\n",
                    progname, server.sun_path, strerror (saved_errno));
         return INVALID_SOCKET;
       }
@@ -1322,7 +1316,7 @@ To start the server in Emacs, type \"M-x server-start\".\n",
   if (connect (s, (struct sockaddr *) &server, strlen (server.sun_path) + 2)
       < 0)
     {
-      message (TRUE, "%s: connect: %s\n", progname, strerror (errno));
+      message (true, "%s: connect: %s\n", progname, strerror (errno));
       return INVALID_SOCKET;
     }
 
@@ -1345,7 +1339,7 @@ set_socket (int no_exit_if_error)
       s = set_local_socket (socket_name);
       if ((s != INVALID_SOCKET) || no_exit_if_error)
         return s;
-      message (TRUE, "%s: error accessing socket \"%s\"\n",
+      message (true, "%s: error accessing socket \"%s\"\n",
                progname, socket_name);
       exit (EXIT_FAILURE);
     }
@@ -1361,7 +1355,7 @@ set_socket (int no_exit_if_error)
       if ((s != INVALID_SOCKET) || no_exit_if_error)
         return s;
 
-      message (TRUE, "%s: error accessing server file \"%s\"\n",
+      message (true, "%s: error accessing server file \"%s\"\n",
                progname, local_server_file);
       exit (EXIT_FAILURE);
     }
@@ -1379,7 +1373,7 @@ set_socket (int no_exit_if_error)
     return s;
 
   /* No implicit or explicit socket, and no alternate editor.  */
-  message (TRUE, "%s: No socket or alternate editor.  Please use:\n\n"
+  message (true, "%s: No socket or alternate editor.  Please use:\n\n"
 #ifndef NO_SOCKETS_IN_FILE_SYSTEM
 "\t--socket-name\n"
 #endif
@@ -1488,15 +1482,15 @@ start_daemon_and_retry_set_socket (void)
 
       if ((w == -1) || !WIFEXITED (status) || WEXITSTATUS (status))
         {
-          message (TRUE, "Error: Could not start the Emacs daemon\n");
+          message (true, "Error: Could not start the Emacs daemon\n");
           exit (EXIT_FAILURE);
         }
 
       /* Try connecting, the daemon should have started by now.  */
-      message (TRUE, "Emacs daemon should have started, trying to connect again\n");
+      message (true, "Emacs daemon should have started, trying to connect again\n");
       if ((emacs_socket = set_socket (1)) == INVALID_SOCKET)
         {
-          message (TRUE, "Error: Cannot connect even after starting the Emacs daemon\n");
+          message (true, "Error: Cannot connect even after starting the Emacs daemon\n");
           exit (EXIT_FAILURE);
         }
     }
@@ -1509,7 +1503,10 @@ start_daemon_and_retry_set_socket (void)
     {
       char emacs[] = "emacs";
       char daemon_option[] = "--daemon";
-      char *d_argv[] = {emacs, daemon_option, 0 };
+      char *d_argv[3];
+      d_argv[0] = emacs;
+      d_argv[1] = daemon_option;
+      d_argv[2] = 0;
       if (socket_name != NULL)
         {
           /* Pass  --daemon=socket_name as argument.  */
@@ -1521,7 +1518,7 @@ start_daemon_and_retry_set_socket (void)
           d_argv[1] = daemon_arg;
         }
       execvp ("emacs", d_argv);
-      message (TRUE, "%s: error starting emacs daemon\n", progname);
+      message (true, "%s: error starting emacs daemon\n", progname);
     }
 #endif /* WINDOWSNT */
 }
@@ -1551,7 +1548,7 @@ main (int argc, char **argv)
 
   if ((argc - optind < 1) && !eval && current_frame)
     {
-      message (TRUE, "%s: file name or argument required\n"
+      message (true, "%s: file name or argument required\n"
                "Try `%s --help' for more information\n",
                progname, progname);
       exit (EXIT_FAILURE);
@@ -1574,7 +1571,7 @@ main (int argc, char **argv)
   cwd = get_current_dir_name ();
   if (cwd == 0)
     {
-      message (TRUE, "%s: %s\n", progname,
+      message (true, "%s: %s\n", progname,
                "Cannot get current working directory");
       fail ();
     }
@@ -1724,7 +1721,8 @@ main (int argc, char **argv)
       needlf = 2;
     }
   fflush (stdout);
-  fsync (1);
+  while (fdatasync (1) != 0 && errno == EINTR)
+    continue;
 
   /* Now, wait for an answer and print any messages.  */
   while (exit_status == EXIT_SUCCESS)
@@ -1825,7 +1823,8 @@ main (int argc, char **argv)
   if (needlf)
     printf ("\n");
   fflush (stdout);
-  fsync (1);
+  while (fdatasync (1) != 0 && errno == EINTR)
+    continue;
 
   if (rl < 0)
     exit_status = EXIT_FAILURE;
diff --git a/lib-src/etags.c b/lib-src/etags.c
index ec96f45fc94..66e7fbb467f 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -1,4 +1,4 @@
-/* Tags file maker to go with GNU Emacs           -*- coding: latin-1 -*-
+/* Tags file maker to go with GNU Emacs           -*- coding: utf-8 -*-
 
 Copyright (C) 1984 The Regents of the University of California
 
@@ -28,7 +28,7 @@ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-Copyright (C) 1984, 1987-1989, 1993-1995, 1998-2013 Free Software
+Copyright (C) 1984, 1987-1989, 1993-1995, 1998-2014 Free Software
 Foundation, Inc.
 
 This file is not considered part of GNU Emacs.
@@ -64,12 +64,12 @@ University of California, as described above. */
  * 1985 Emacs TAGS format by Richard Stallman.
  * 1989 Sam Kendall added C++.
  * 1992 Joseph B. Wells improved C and C++ parsing.
- * 1993 Francesco Potortì reorganized C and C++.
+ * 1993 Francesco Potortì reorganized C and C++.
  * 1994 Line-by-line regexp tags by Tom Tromey.
- * 2001 Nested classes by Francesco Potortì (concept by Mykola Dzyuba).
- * 2002 #line directives by Francesco Potortì.
+ * 2001 Nested classes by Francesco Potortì (concept by Mykola Dzyuba).
+ * 2002 #line directives by Francesco Potortì.
  *
- * Francesco Potortì <pot@gnu.org> has maintained and improved it since 1993.
+ * Francesco Potortì <pot@gnu.org> has maintained and improved it since 1993.
  */
 
 /*
@@ -80,14 +80,11 @@ University of California, as described above. */
 
 char pot_etags_version[] = "@(#) pot revision number is 17.38.1.4";
 
-#define TRUE    1
-#define FALSE   0
-
 #ifdef DEBUG
 #  undef DEBUG
-#  define DEBUG TRUE
+#  define DEBUG true
 #else
-#  define DEBUG  FALSE
+#  define DEBUG  false
 #  define NDEBUG                /* disable assert */
 #endif
 
@@ -107,12 +104,12 @@ char pot_etags_version[] = "@(#) pot revision number is 17.38.1.4";
 
 #ifdef MSDOS
 # undef MSDOS
-# define MSDOS TRUE
+# define MSDOS true
 # include <fcntl.h>
 # include <sys/param.h>
 # include <io.h>
 #else
-# define MSDOS FALSE
+# define MSDOS false
 #endif /* MSDOS */
 
 #ifdef WINDOWSNT
@@ -150,9 +147,9 @@ char pot_etags_version[] = "@(#) pot revision number is 17.38.1.4";
  tag tables and tags typedefs, #defines and struct/union/enum by default. */
 #ifdef CTAGS
 # undef  CTAGS
-# define CTAGS TRUE
+# define CTAGS true
 #else
-# define CTAGS FALSE
+# define CTAGS false
 #endif
 
 #define streq(s,t)      (assert ((s)!=NULL || (t)!=NULL), !strcmp (s, t))
@@ -194,8 +191,6 @@ char pot_etags_version[] = "@(#) pot revision number is 17.38.1.4";
                                         (char *) (op), (n) * sizeof (Type)))
 #endif
 
-#define bool int
-
 typedef void Lang_function (FILE *);
 
 typedef struct
@@ -316,15 +311,7 @@ static void Texinfo_nodes (FILE *);
 static void Yacc_entries (FILE *);
 static void just_read_file (FILE *);
 
-static void print_language_names (void);
-static void print_version (void);
-static void print_help (argument *);
-int main (int, char **);
-
-static compressor *get_compressor_from_suffix (char *, char **);
 static language *get_language_from_langname (const char *);
-static language *get_language_from_interpreter (char *);
-static language *get_language_from_filename (char *, bool);
 static void readline (linebuffer *, FILE *);
 static long readline_internal (linebuffer *, FILE *);
 static bool nocase_tail (const char *);
@@ -346,7 +333,6 @@ static void find_entries (FILE *);
 static void free_tree (node *);
 static void free_fdesc (fdesc *);
 static void pfnote (char *, bool, char *, int, int, long);
-static void make_tag (const char *, int, bool, char *, int, int, long);
 static void invalidate_nodes (fdesc *, node **);
 static void put_entries (node *);
 
@@ -410,7 +396,7 @@ static const char
   *midtk = "ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz$0123456789";
 
 static bool append_to_tagfile;  /* -a: append to tags */
-/* The next five default to TRUE in C and derived languages.  */
+/* The next five default to true in C and derived languages.  */
 static bool typedefs;           /* -t: create tags for C and Ada typedefs */
 static bool typedefs_or_cplusplus; /* -T: create tags for C typedefs, level */
                                 /* 0 struct/enum/union decls, and C++ */
@@ -418,18 +404,18 @@ static bool typedefs_or_cplusplus; /* -T: create tags for C typedefs, level */
 static bool constantypedefs;    /* -d: create tags for C #define, enum */
                                 /* constants and variables. */
                                 /* -D: opposite of -d.  Default under ctags. */
-static bool globals;            /* create tags for global variables */
-static bool members;            /* create tags for C member variables */
-static bool declarations;       /* --declarations: tag them and extern in C&Co*/
-static bool no_line_directive;  /* ignore #line directives (undocumented) */
-static bool no_duplicates;      /* no duplicate tags for ctags (undocumented) */
+static int globals;             /* create tags for global variables */
+static int members;             /* create tags for C member variables */
+static int declarations;        /* --declarations: tag them and extern in C&Co*/
+static int no_line_directive;   /* ignore #line directives (undocumented) */
+static int no_duplicates;       /* no duplicate tags for ctags (undocumented) */
 static bool update;             /* -u: update tags */
 static bool vgrind_style;       /* -v: create vgrind style index output */
 static bool no_warnings;        /* -w: suppress warnings (undocumented) */
 static bool cxref_style;        /* -x: create cxref style output */
 static bool cplusplus;          /* .[hc] means C++, not C (undocumented) */
 static bool ignoreindent;       /* -I: ignore indentation in C */
-static bool packages_only;      /* --packages-only: in Ada, only tag packages*/
+static int packages_only;       /* --packages-only: in Ada, only tag packages*/
 
 /* STDIN is defined in LynxOS system headers */
 #ifdef STDIN
@@ -445,17 +431,17 @@ static bool need_filebuf;	/* some regexes are multi-line */
 static struct option longopts[] =
 {
   { "append",             no_argument,       NULL,               'a'   },
-  { "packages-only",      no_argument,       &packages_only,     TRUE  },
+  { "packages-only",      no_argument,       &packages_only,     1     },
   { "c++",                no_argument,       NULL,               'C'   },
-  { "declarations",       no_argument,       &declarations,      TRUE  },
-  { "no-line-directive",  no_argument,       &no_line_directive, TRUE  },
-  { "no-duplicates",      no_argument,       &no_duplicates,     TRUE  },
+  { "declarations",       no_argument,       &declarations,      1     },
+  { "no-line-directive",  no_argument,       &no_line_directive, 1     },
+  { "no-duplicates",      no_argument,       &no_duplicates,     1     },
   { "help",               no_argument,       NULL,               'h'   },
   { "help",               no_argument,       NULL,               'H'   },
   { "ignore-indentation", no_argument,       NULL,               'I'   },
   { "language",           required_argument, NULL,               'l'   },
-  { "members",            no_argument,       &members,           TRUE  },
-  { "no-members",         no_argument,       &members,           FALSE },
+  { "members",            no_argument,       &members,           1     },
+  { "no-members",         no_argument,       &members,           0     },
   { "output",             required_argument, NULL,               'o'   },
   { "regex",              required_argument, NULL,               'r'   },
   { "no-regex",           no_argument,       NULL,               'R'   },
@@ -467,7 +453,7 @@ static struct option longopts[] =
   { "backward-search",    no_argument,       NULL,               'B'   },
   { "cxref",              no_argument,       NULL,               'x'   },
   { "defines",            no_argument,       NULL,               'd'   },
-  { "globals",            no_argument,       &globals,           TRUE  },
+  { "globals",            no_argument,       &globals,           1     },
   { "typedefs",           no_argument,       NULL,               't'   },
   { "typedefs-and-c++",   no_argument,       NULL,               'T'   },
   { "update",             no_argument,       NULL,               'u'   },
@@ -476,7 +462,7 @@ static struct option longopts[] =
 
 #else /* Etags options */
   { "no-defines",         no_argument,       NULL,               'D'   },
-  { "no-globals",         no_argument,       &globals,           FALSE },
+  { "no-globals",         no_argument,       &globals,           0     },
   { "include",            required_argument, NULL,               'i'   },
 #endif
   { NULL }
@@ -770,7 +756,7 @@ static language lang_names [] =
   { "scheme",    Scheme_help,    Scheme_functions,  Scheme_suffixes    },
   { "tex",       TeX_help,       TeX_commands,      TeX_suffixes       },
   { "texinfo",   Texinfo_help,   Texinfo_nodes,     Texinfo_suffixes   },
-  { "yacc",      Yacc_help,Yacc_entries,Yacc_suffixes,NULL,NULL,TRUE},
+  { "yacc",      Yacc_help,Yacc_entries,Yacc_suffixes,NULL,NULL,true},
   { "auto",      auto_help },                      /* default guessing scheme */
   { "none",      none_help,      just_read_file }, /* regexp matching only */
   { NULL }                /* end of list */
@@ -816,7 +802,7 @@ etags --help --lang=ada.");
 #ifndef VERSION
 # define VERSION "17.38.1.4"
 #endif
-static void
+static _Noreturn void
 print_version (void)
 {
   char emacs_copyright[] = COPYRIGHT;
@@ -829,13 +815,13 @@ print_version (void)
 }
 
 #ifndef PRINT_UNDOCUMENTED_OPTIONS_HELP
-# define PRINT_UNDOCUMENTED_OPTIONS_HELP FALSE
+# define PRINT_UNDOCUMENTED_OPTIONS_HELP false
 #endif
 
-static void
+static _Noreturn void
 print_help (argument *argbuffer)
 {
-  bool help_for_lang = FALSE;
+  bool help_for_lang = false;
 
   for (; argbuffer->arg_type != at_end; argbuffer++)
     if (argbuffer->arg_type == at_language)
@@ -843,7 +829,7 @@ print_help (argument *argbuffer)
         if (help_for_lang)
           puts ("");
         puts (argbuffer->lang->help);
-        help_for_lang = TRUE;
+        help_for_lang = true;
       }
 
   if (help_for_lang)
@@ -1014,7 +1000,7 @@ main (int argc, char **argv)
   argument *argbuffer;
   int current_arg, file_count;
   linebuffer filename_lb;
-  bool help_asked = FALSE;
+  bool help_asked = false;
   ptrdiff_t len;
  char *optstring;
  int opt;
@@ -1039,8 +1025,8 @@ main (int argc, char **argv)
    * Also default to find macro constants, enum constants, struct
    * members and global variables.  Do it for both etags and ctags.
    */
-  typedefs = typedefs_or_cplusplus = constantypedefs = TRUE;
-  globals = members = TRUE;
+  typedefs = typedefs_or_cplusplus = constantypedefs = true;
+  globals = members = true;
 
   /* When the optstring begins with a '-' getopt_long does not rearrange the
      non-options arguments to be at the end, but leaves them alone. */
@@ -1078,12 +1064,12 @@ main (int argc, char **argv)
         ++file_count;
         if (parsing_stdin)
           fatal ("cannot parse standard input more than once", (char *)NULL);
-        parsing_stdin = TRUE;
+        parsing_stdin = true;
         break;
 
         /* Common options. */
-      case 'a': append_to_tagfile = TRUE;       break;
-      case 'C': cplusplus = TRUE;               break;
+      case 'a': append_to_tagfile = true;       break;
+      case 'C': cplusplus = true;               break;
       case 'f':         /* for compatibility with old makefiles */
       case 'o':
         if (tagfile)
@@ -1096,7 +1082,7 @@ main (int argc, char **argv)
         break;
       case 'I':
       case 'S':         /* for backward compatibility */
-        ignoreindent = TRUE;
+        ignoreindent = true;
         break;
       case 'l':
         {
@@ -1131,22 +1117,22 @@ main (int argc, char **argv)
         break;
       case 'h':
       case 'H':
-        help_asked = TRUE;
+        help_asked = true;
         break;
 
         /* Etags options */
-      case 'D': constantypedefs = FALSE;                        break;
+      case 'D': constantypedefs = false;                        break;
       case 'i': included_files[nincluded_files++] = optarg;     break;
 
         /* Ctags options. */
       case 'B': searchar = '?';                                 break;
-      case 'd': constantypedefs = TRUE;                         break;
-      case 't': typedefs = TRUE;                                break;
-      case 'T': typedefs = typedefs_or_cplusplus = TRUE;        break;
-      case 'u': update = TRUE;                                  break;
-      case 'v': vgrind_style = TRUE;                      /*FALLTHRU*/
-      case 'x': cxref_style = TRUE;                             break;
-      case 'w': no_warnings = TRUE;                             break;
+      case 'd': constantypedefs = true;                         break;
+      case 't': typedefs = true;                                break;
+      case 'T': typedefs = typedefs_or_cplusplus = true;        break;
+      case 'u': update = true;                                  break;
+      case 'v': vgrind_style = true;                      /*FALLTHRU*/
+      case 'x': cxref_style = true;                             break;
+      case 'w': no_warnings = true;                             break;
       default:
         suggest_asking_for_help ();
         /* NOTREACHED */
@@ -1317,7 +1303,7 @@ main (int argc, char **argv)
             fatal ("failed to execute shell command", (char *)NULL);
         }
       free (cmd);
-      append_to_tagfile = TRUE;
+      append_to_tagfile = true;
     }
 
   tagf = fopen (tagfile, append_to_tagfile ? "a" : "w");
@@ -1614,9 +1600,9 @@ process_file (FILE *fh, char *fn, language *lang)
          to the directory of the tags file. */
       fdp->taggedfname = relative_filename (fn, tagfiledir);
     }
-  fdp->usecharno = TRUE;        /* use char position when making tags */
+  fdp->usecharno = true;        /* use char position when making tags */
   fdp->prop = NULL;
-  fdp->written = FALSE;         /* not written on tags file yet */
+  fdp->written = false;         /* not written on tags file yet */
 
   fdhead = fdp;
   curfdp = fdhead;              /* the current file description */
@@ -1662,26 +1648,27 @@ process_file (FILE *fh, char *fn, language *lang)
  * This routine sets up the boolean pseudo-functions which work
  * by setting boolean flags dependent upon the corresponding character.
  * Every char which is NOT in that string is not a white char.  Therefore,
- * all of the array "_wht" is set to FALSE, and then the elements
- * subscripted by the chars in "white" are set to TRUE.  Thus "_wht"
- * of a char is TRUE if it is the string "white", else FALSE.
+ * all of the array "_wht" is set to false, and then the elements
+ * subscripted by the chars in "white" are set to true.  Thus "_wht"
+ * of a char is true if it is the string "white", else false.
  */
 static void
 init (void)
 {
-  register const char *sp;
-  register int i;
+  const char *sp;
+  int i;
 
   for (i = 0; i < CHARS; i++)
-    iswhite (i) = notinname (i) = begtoken (i) = intoken (i) = endtoken (i) = FALSE;
-  for (sp = white; *sp != '\0'; sp++) iswhite (*sp) = TRUE;
-  for (sp = nonam; *sp != '\0'; sp++) notinname (*sp) = TRUE;
+    iswhite (i) = notinname (i) = begtoken (i) = intoken (i) = endtoken (i)
+      = false;
+  for (sp = white; *sp != '\0'; sp++) iswhite (*sp) = true;
+  for (sp = nonam; *sp != '\0'; sp++) notinname (*sp) = true;
   notinname ('\0') = notinname ('\n');
-  for (sp = begtk; *sp != '\0'; sp++) begtoken (*sp) = TRUE;
+  for (sp = begtk; *sp != '\0'; sp++) begtoken (*sp) = true;
   begtoken ('\0') = begtoken ('\n');
-  for (sp = midtk; *sp != '\0'; sp++) intoken (*sp) = TRUE;
+  for (sp = midtk; *sp != '\0'; sp++) intoken (*sp) = true;
   intoken ('\0') = intoken ('\n');
-  for (sp = endtk; *sp != '\0'; sp++) endtoken (*sp) = TRUE;
+  for (sp = endtk; *sp != '\0'; sp++) endtoken (*sp) = true;
   endtoken ('\0') = endtoken ('\n');
 }
 
@@ -1705,7 +1692,7 @@ find_entries (FILE *inf)
   /* Else try to guess the language given the file name. */
   if (parser == NULL)
     {
-      lang = get_language_from_filename (curfdp->infname, TRUE);
+      lang = get_language_from_filename (curfdp->infname, true);
       if (lang != NULL && lang->function != NULL)
         {
           curfdp->lang = lang;
@@ -1752,7 +1739,7 @@ find_entries (FILE *inf)
   /* Else try to guess the language given the case insensitive file name. */
   if (parser == NULL)
     {
-      lang = get_language_from_filename (curfdp->infname, FALSE);
+      lang = get_language_from_filename (curfdp->infname, false);
       if (lang != NULL && lang->function != NULL)
         {
           curfdp->lang = lang;
@@ -1850,7 +1837,7 @@ find_entries (FILE *inf)
 static void
 make_tag (const char *name,     /* tag name, or NULL if unnamed */
           int namelen,          /* tag length */
-          int is_func,          /* tag is a function */
+          bool is_func,         /* tag is a function */
           char *linestart,      /* start of the line where tag is */
           int linelen,          /* length of the line where tag is */
           int lno,              /* line number */
@@ -1878,7 +1865,7 @@ make_tag (const char *name, 	/* tag name, or NULL if unnamed */
               && (cp == linestart
                   || notinname (cp[-1]))        /* rule #3 */
               && strneq (name, cp, namelen))    /* rule #2 */
-            named = FALSE;      /* use implicit tag name */
+            named = false;      /* use implicit tag name */
         }
     }
 
@@ -1890,7 +1877,8 @@ make_tag (const char *name, 	/* tag name, or NULL if unnamed */
 
 /* Record a tag. */
 static void
-pfnote (char *name, int is_func, char *linestart, int linelen, int lno, long int cno)
+pfnote (char *name, bool is_func, char *linestart, int linelen, int lno,
+        long int cno)
                                 /* tag name, or NULL if unnamed */
                                 /* tag is a function */
                                 /* start of the line where tag is */
@@ -1917,8 +1905,8 @@ pfnote (char *name, int is_func, char *linestart, int linelen, int lno, long int
     }
   else
     np->name = name;
-  np->valid = TRUE;
-  np->been_warned = FALSE;
+  np->valid = true;
+  np->been_warned = false;
   np->fdp = curfdp;
   np->is_func = is_func;
   np->lno = lno;
@@ -2052,7 +2040,7 @@ add_node (node *np, node **cur_node_p)
                 (stderr,
                  "Duplicate entry in files %s and %s: %s (Warning only)\n",
                  np->fdp->infname, cur_node->fdp->infname, np->name);
-              cur_node->been_warned = TRUE;
+              cur_node->been_warned = true;
             }
           return;
         }
@@ -2080,7 +2068,7 @@ invalidate_nodes (fdesc *badfdp, node **npp)
       if (np->left != NULL)
         invalidate_nodes (badfdp, &np->left);
       if (np->fdp == badfdp)
-        np->valid = FALSE;
+        np->valid = false;
       if (np->right != NULL)
         invalidate_nodes (badfdp, &np->right);
     }
@@ -2163,7 +2151,7 @@ put_entries (register node *np)
               fdp = np->fdp;
               fprintf (tagf, "\f\n%s,%d\n",
                        fdp->taggedfname, total_size_of_entries (np));
-              fdp->written = TRUE;
+              fdp->written = true;
             }
           fputs (np->regex, tagf);
           fputc ('\177', tagf);
@@ -2249,10 +2237,6 @@ enum sym_type
   st_C_struct, st_C_extern, st_C_enum, st_C_define, st_C_typedef
 };
 
-static unsigned int hash (const char *, unsigned int);
-static struct C_stab_entry * in_word_set (const char *, unsigned int);
-static enum sym_type C_symtype (char *, int, int);
-
 /* Feed stuff between (but not including) %[ and %] lines to:
      gperf -m 5
 %[
@@ -2311,10 +2295,10 @@ and replace lines between %< and %> with its output, then:
 struct C_stab_entry { const char *name; int c_ext; enum sym_type type; };
 /* maximum key range = 33, duplicates = 0 */
 
-static inline unsigned int
-hash (register const char *str, register unsigned int len)
+static int
+hash (const char *str, int len)
 {
-  static unsigned char asso_values[] =
+  static char const asso_values[] =
     {
       35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
       35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
@@ -2343,15 +2327,15 @@ hash (register const char *str, register unsigned int len)
       35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
       35, 35, 35, 35, 35, 35
     };
-  register int hval = len;
+  int hval = len;
 
   switch (hval)
     {
       default:
-        hval += asso_values[(unsigned char)str[2]];
+        hval += asso_values[(unsigned char) str[2]];
       /*FALLTHROUGH*/
       case 2:
-        hval += asso_values[(unsigned char)str[1]];
+        hval += asso_values[(unsigned char) str[1]];
         break;
     }
   return hval;
@@ -2409,11 +2393,11 @@ in_word_set (register const char *str, register unsigned int len)
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
     {
-      register int key = hash (str, len);
+      int key = hash (str, len);
 
       if (key <= MAX_HASH_VALUE && key >= 0)
         {
-          register const char *s = wordlist[key].name;
+          const char *s = wordlist[key].name;
 
           if (*str == *s && !strncmp (str + 1, s + 1, len - 1) && s[len] == '\0')
             return &wordlist[key];
@@ -2638,7 +2622,7 @@ static void make_C_tag (bool);
  *      function or variable, or corresponds to a typedef, or
  *      is a struct/union/enum tag, or #define, or an enum constant.
  *
- *      *IS_FUNC gets TRUE if the token is a function or #define macro
+ *      *IS_FUNC_OR_VAR gets true if the token is a function or #define macro
  *      with args.  C_EXTP points to which language we are looking at.
  *
  * Globals
@@ -2650,7 +2634,8 @@ static void make_C_tag (bool);
  */
 
 static bool
-consider_token (register char *str, register int len, register int c, int *c_extp, int bracelev, int parlev, int *is_func_or_var)
+consider_token (char *str, int len, int c, int *c_extp,
+                int bracelev, int parlev, bool *is_func_or_var)
                                 /* IN: token pointer */
                                 /* IN: token length */
                                 /* IN: first char after the token */
@@ -2674,8 +2659,8 @@ consider_token (register char *str, register int len, register int c, int *c_ext
    */
   if (toktype == st_C_attribute)
     {
-      inattribute = TRUE;
-      return FALSE;
+      inattribute = true;
+      return false;
      }
 
    /*
@@ -2688,7 +2673,7 @@ consider_token (register char *str, register int len, register int c, int *c_ext
        if (toktype == st_C_gnumacro)
          {
            fvdef = fdefunkey;
-           return FALSE;
+           return false;
          }
        break;
      case dsharpseen:
@@ -2700,20 +2685,20 @@ consider_token (register char *str, register int len, register int c, int *c_ext
          {
            definedef = dignorerest;
          }
-       return FALSE;
+       return false;
      case ddefineseen:
        /*
         * Make a tag for any macro, unless it is a constant
-        * and constantypedefs is FALSE.
+        * and constantypedefs is false.
         */
        definedef = dignorerest;
        *is_func_or_var = (c == '(');
        if (!*is_func_or_var && !constantypedefs)
-         return FALSE;
+         return false;
        else
-         return TRUE;
+         return true;
      case dignorerest:
-       return FALSE;
+       return false;
      default:
        error ("internal error: definedef value.");
      }
@@ -2728,9 +2713,9 @@ consider_token (register char *str, register int len, register int c, int *c_ext
          {
            if (typedefs)
              typdef = tkeyseen;
-           fvextern = FALSE;
+           fvextern = false;
            fvdef = fvnone;
-           return FALSE;
+           return false;
          }
        break;
      case tkeyseen:
@@ -2747,7 +2732,7 @@ consider_token (register char *str, register int len, register int c, int *c_ext
        if (structdef == snone && fvdef == fvnone)
          {
            fvdef = fvnameseen;
-           return TRUE;
+           return true;
          }
        break;
      case tend:
@@ -2756,9 +2741,9 @@ consider_token (register char *str, register int len, register int c, int *c_ext
          case st_C_class:
          case st_C_struct:
          case st_C_enum:
-           return FALSE;
+           return false;
          }
-       return TRUE;
+       return true;
      }
 
    switch (toktype)
@@ -2766,7 +2751,7 @@ consider_token (register char *str, register int len, register int c, int *c_ext
      case st_C_javastruct:
        if (structdef == stagseen)
          structdef = scolonseen;
-       return FALSE;
+       return false;
      case st_C_template:
      case st_C_class:
        if ((*c_extp & C_AUTO)   /* automatic detection of C++ language */
@@ -2790,13 +2775,13 @@ consider_token (register char *str, register int len, register int c, int *c_ext
            if (fvdef == fvnameseen)
              fvdef = fvnone;
          }
-       return FALSE;
+       return false;
      }
 
    if (structdef == skeyseen)
      {
        structdef = stagseen;
-       return TRUE;
+       return true;
      }
 
    if (typdef != tnone)
@@ -2810,27 +2795,27 @@ consider_token (register char *str, register int len, register int c, int *c_ext
          {
          case st_C_objprot:
            objdef = oprotocol;
-           return FALSE;
+           return false;
          case st_C_objimpl:
            objdef = oimplementation;
-           return FALSE;
+           return false;
          }
        break;
      case oimplementation:
        /* Save the class tag for functions or variables defined inside. */
        objtag = savenstr (str, len);
        objdef = oinbody;
-       return FALSE;
+       return false;
      case oprotocol:
        /* Save the class tag for categories. */
        objtag = savenstr (str, len);
        objdef = otagseen;
-       *is_func_or_var = TRUE;
-       return TRUE;
+       *is_func_or_var = true;
+       return true;
      case oparenseen:
        objdef = ocatseen;
-       *is_func_or_var = TRUE;
-       return TRUE;
+       *is_func_or_var = true;
+       return true;
      case oinbody:
        break;
      case omethodsign:
@@ -2841,13 +2826,13 @@ consider_token (register char *str, register int len, register int c, int *c_ext
            linebuffer_setlen (&token_name, len);
            memcpy (token_name.buffer, str, len);
            token_name.buffer[len] = '\0';
-           return TRUE;
+           return true;
          }
-       return FALSE;
+       return false;
      case omethodcolon:
        if (parlev == 0)
          objdef = omethodparm;
-       return FALSE;
+       return false;
      case omethodparm:
        if (parlev == 0)
          {
@@ -2857,9 +2842,9 @@ consider_token (register char *str, register int len, register int c, int *c_ext
            linebuffer_setlen (&token_name, oldlen + len);
            memcpy (token_name.buffer + oldlen, str, len);
            token_name.buffer[oldlen + len] = '\0';
-           return TRUE;
+           return true;
          }
-       return FALSE;
+       return false;
      case oignore:
        if (toktype == st_C_objend)
          {
@@ -2871,14 +2856,14 @@ consider_token (register char *str, register int len, register int c, int *c_ext
            free (objtag); */
            objdef = onone;
          }
-       return FALSE;
+       return false;
      }
 
    /* A function, variable or enum constant? */
    switch (toktype)
      {
      case st_C_extern:
-       fvextern = TRUE;
+       fvextern = true;
        switch  (fvdef)
          {
          case finlist:
@@ -2889,39 +2874,39 @@ consider_token (register char *str, register int len, register int c, int *c_ext
          default:
            fvdef = fvnone;
          }
-       return FALSE;
+       return false;
      case st_C_ignore:
-       fvextern = FALSE;
+       fvextern = false;
        fvdef = vignore;
-       return FALSE;
+       return false;
      case st_C_operator:
        fvdef = foperator;
-       *is_func_or_var = TRUE;
-       return TRUE;
+       *is_func_or_var = true;
+       return true;
      case st_none:
        if (constantypedefs
            && structdef == snone
            && structtype == st_C_enum && bracelev > structbracelev)
-         return TRUE;           /* enum constant */
+         return true;           /* enum constant */
        switch (fvdef)
          {
          case fdefunkey:
            if (bracelev > 0)
              break;
            fvdef = fdefunname;  /* GNU macro */
-           *is_func_or_var = TRUE;
-           return TRUE;
+           *is_func_or_var = true;
+           return true;
          case fvnone:
            switch (typdef)
              {
              case ttypeseen:
-               return FALSE;
+               return false;
              case tnone:
                if ((strneq (str, "asm", 3) && endtoken (str[3]))
                    || (strneq (str, "__asm__", 7) && endtoken (str[7])))
                  {
                    fvdef = vignore;
-                   return FALSE;
+                   return false;
                  }
                break;
              }
@@ -2932,19 +2917,19 @@ consider_token (register char *str, register int len, register int c, int *c_ext
               if (*c_extp & C_AUTO) /* automatic detection of C++ */
                 *c_extp = (*c_extp | C_PLPL) & ~C_AUTO;
               fvdef = foperator;
-              *is_func_or_var = TRUE;
-              return TRUE;
+              *is_func_or_var = true;
+              return true;
             }
           if (bracelev > 0 && !instruct)
             break;
           fvdef = fvnameseen;   /* function or variable */
-          *is_func_or_var = TRUE;
-          return TRUE;
+          *is_func_or_var = true;
+          return true;
         }
       break;
     }
 
-  return FALSE;
+  return false;
 }
 
 
@@ -2976,7 +2961,7 @@ do {									\
   curlinepos = charno;                                                  \
   readline (&curlb, inf);                                               \
   lp = curlb.buffer;                                                    \
-  quotednl = FALSE;                                                     \
+  quotednl = false;                                                     \
   newndx = curndx;                                                      \
 } while (0)
 
@@ -2986,16 +2971,16 @@ do {									\
   if (savetoken.valid)                                                  \
     {                                                                   \
       token = savetoken;                                                \
-      savetoken.valid = FALSE;                                          \
+      savetoken.valid = false;                                          \
     }                                                                   \
   definedef = dnone;                                                    \
 } while (0)
 
 
 static void
-make_C_tag (int isfun)
+make_C_tag (bool isfun)
 {
-  /* This function is never called when token.valid is FALSE, but
+  /* This function is never called when token.valid is false, but
      we must protect against invalid input or internal errors. */
   if (token.valid)
     make_tag (token_name.buffer, token_name.len, isfun, token.line,
@@ -3008,7 +2993,7 @@ make_C_tag (int isfun)
       error ("INVALID TOKEN");
     }
 
-  token.valid = FALSE;
+  token.valid = false;
 }
 
 
@@ -3056,11 +3041,11 @@ C_entries (int c_ext, FILE *inf)
   lp = curlb.buffer;
   *lp = 0;
 
-  fvdef = fvnone; fvextern = FALSE; typdef = tnone;
+  fvdef = fvnone; fvextern = false; typdef = tnone;
   structdef = snone; definedef = dnone; objdef = onone;
-  yacc_rules = FALSE;
-  midtoken = inquote = inchar = incomm = quotednl = FALSE;
-  token.valid = savetoken.valid = FALSE;
+  yacc_rules = false;
+  midtoken = inquote = inchar = incomm = quotednl = false;
+  token.valid = savetoken.valid = false;
   bracelev = bracketlev = parlev = attrparlev = templatelev = 0;
   if (cjava)
     { qualifier = "."; qlen = 1; }
@@ -3078,7 +3063,7 @@ C_entries (int c_ext, FILE *inf)
              to read the next line.  */
           if (*lp == '\0')
             {
-              quotednl = TRUE;
+              quotednl = true;
               continue;
             }
           lp++;
@@ -3092,7 +3077,7 @@ C_entries (int c_ext, FILE *inf)
               if (*lp == '/')
                 {
                   c = *lp++;
-                  incomm = FALSE;
+                  incomm = false;
                 }
               break;
             case '\0':
@@ -3108,7 +3093,7 @@ C_entries (int c_ext, FILE *inf)
           switch (c)
             {
             case '"':
-              inquote = FALSE;
+              inquote = false;
               break;
             case '\0':
               /* Newlines inside strings do not end macro definitions
@@ -3128,7 +3113,7 @@ C_entries (int c_ext, FILE *inf)
               CNL ();
               /* FALLTHRU */
             case '\'':
-              inchar = FALSE;
+              inchar = false;
               break;
             }
           continue;
@@ -3136,7 +3121,7 @@ C_entries (int c_ext, FILE *inf)
       else switch (c)
         {
         case '"':
-          inquote = TRUE;
+          inquote = true;
           if (bracketlev > 0)
             continue;
           if (inattribute)
@@ -3150,26 +3135,26 @@ C_entries (int c_ext, FILE *inf)
             case vignore:
               break;
             default:
-              fvextern = FALSE;
+              fvextern = false;
               fvdef = fvnone;
             }
           continue;
         case '\'':
-          inchar = TRUE;
+          inchar = true;
           if (bracketlev > 0)
             continue;
           if (inattribute)
             break;
           if (fvdef != finlist && fvdef != fignore && fvdef != vignore)
             {
-              fvextern = FALSE;
+              fvextern = false;
               fvdef = fvnone;
             }
           continue;
         case '/':
           if (*lp == '*')
             {
-              incomm = TRUE;
+              incomm = true;
               lp++;
               c = ' ';
               if (bracketlev > 0)
@@ -3185,9 +3170,9 @@ C_entries (int c_ext, FILE *inf)
             {
               /* Entering or exiting rules section in yacc file. */
               lp++;
-              definedef = dnone; fvdef = fvnone; fvextern = FALSE;
+              definedef = dnone; fvdef = fvnone; fvextern = false;
               typdef = tnone; structdef = snone;
-              midtoken = inquote = inchar = incomm = quotednl = FALSE;
+              midtoken = inquote = inchar = incomm = quotednl = false;
               bracelev = 0;
               yacc_rules = !yacc_rules;
               continue;
@@ -3198,7 +3183,7 @@ C_entries (int c_ext, FILE *inf)
           if (definedef == dnone)
             {
               char *cp;
-              bool cpptoken = TRUE;
+              bool cpptoken = true;
 
               /* Look back on this line.  If all blanks, or nonblanks
                  followed by an end of comment, this is a preprocessor
@@ -3209,10 +3194,10 @@ C_entries (int c_ext, FILE *inf)
                     if (*cp == '*' && cp[1] == '/')
                       {
                         cp++;
-                        cpptoken = TRUE;
+                        cpptoken = true;
                       }
                     else
-                      cpptoken = FALSE;
+                      cpptoken = false;
                   }
               if (cpptoken)
                 definedef = dsharpseen;
@@ -3261,7 +3246,7 @@ C_entries (int c_ext, FILE *inf)
                     }
                   else
                     {
-                      bool funorvar = FALSE;
+                      bool funorvar = false;
 
                       if (yacc_rules
                           || consider_token (newlb.buffer + tokoff, toklen, c,
@@ -3280,7 +3265,7 @@ C_entries (int c_ext, FILE *inf)
                               c = *lp++;
                               toklen += lp - oldlp;
                             }
-                          token.named = FALSE;
+                          token.named = false;
                           if (!plainc
                               && nestlev > 0 && definedef == dnone)
                             /* in struct body */
@@ -3291,7 +3276,7 @@ C_entries (int c_ext, FILE *inf)
                               linebuffer_setlen (&token_name, len+qlen+toklen);
                               sprintf (token_name.buffer + len, "%s%.*s",
                                        qualifier, toklen, newlb.buffer + tokoff);
-                              token.named = TRUE;
+                              token.named = true;
                             }
                           else if (objdef == ocatseen)
                             /* Objective C category */
@@ -3300,13 +3285,13 @@ C_entries (int c_ext, FILE *inf)
                               linebuffer_setlen (&token_name, len);
                               sprintf (token_name.buffer, "%s(%.*s)",
                                        objtag, toklen, newlb.buffer + tokoff);
-                              token.named = TRUE;
+                              token.named = true;
                             }
                           else if (objdef == omethodtag
                                    || objdef == omethodparm)
                             /* Objective C method */
                             {
-                              token.named = TRUE;
+                              token.named = true;
                             }
                           else if (fvdef == fdefunname)
                             /* GNU DEFUN and similar macros */
@@ -3354,7 +3339,7 @@ C_entries (int c_ext, FILE *inf)
                           token.length = toklen;
                           token.line = newlb.buffer;
                           token.linepos = newlinepos;
-                          token.valid = TRUE;
+                          token.valid = true;
 
                           if (definedef == dnone
                               && (fvdef == fvnameseen
@@ -3382,7 +3367,7 @@ C_entries (int c_ext, FILE *inf)
                               fvdef = fvnone;
                             }
                         }
-                      midtoken = FALSE;
+                      midtoken = false;
                     }
                 } /* if (endtoken (c)) */
               else if (intoken (c))
@@ -3408,7 +3393,7 @@ C_entries (int c_ext, FILE *inf)
                     case flistseen:
                       if (plainc || declarations)
                         {
-                          make_C_tag (TRUE); /* a function */
+                          make_C_tag (true); /* a function */
                           fvdef = fignore;
                         }
                       break;
@@ -3427,7 +3412,7 @@ C_entries (int c_ext, FILE *inf)
                 {
                   tokoff = lp - 1 - newlb.buffer;
                   toklen = 1;
-                  midtoken = TRUE;
+                  midtoken = true;
                 }
               continue;
             } /* if (begtoken) */
@@ -3443,7 +3428,7 @@ C_entries (int c_ext, FILE *inf)
             break;
           if (yacc_rules && token.offset == 0 && token.valid)
             {
-              make_C_tag (FALSE); /* a yacc function */
+              make_C_tag (false); /* a yacc function */
               break;
             }
           if (definedef != dnone)
@@ -3452,7 +3437,7 @@ C_entries (int c_ext, FILE *inf)
             {
             case  otagseen:
               objdef = oignore;
-              make_C_tag (TRUE); /* an Objective C class */
+              make_C_tag (true); /* an Objective C class */
               break;
             case omethodtag:
             case omethodparm:
@@ -3469,7 +3454,7 @@ C_entries (int c_ext, FILE *inf)
           /* Should be useless, but may be work as a safety net. */
           if (cplpl && fvdef == flistseen)
             {
-              make_C_tag (TRUE); /* a function */
+              make_C_tag (true); /* a function */
               fvdef = fignore;
               break;
             }
@@ -3481,7 +3466,7 @@ C_entries (int c_ext, FILE *inf)
             {
             case tend:
             case ttypeseen:
-              make_C_tag (FALSE); /* a typedef */
+              make_C_tag (false); /* a typedef */
               typdef = tnone;
               fvdef = fvnone;
               break;
@@ -3497,10 +3482,10 @@ C_entries (int c_ext, FILE *inf)
                 case fvnameseen:
                   if ((globals && bracelev == 0 && (!fvextern || declarations))
                       || (members && instruct))
-                    make_C_tag (FALSE); /* a variable */
-                  fvextern = FALSE;
+                    make_C_tag (false); /* a variable */
+                  fvextern = false;
                   fvdef = fvnone;
-                  token.valid = FALSE;
+                  token.valid = false;
                   break;
                 case flistseen:
                   if ((declarations
@@ -3508,16 +3493,16 @@ C_entries (int c_ext, FILE *inf)
                        && (typdef == tnone || (typdef != tignore && instruct)))
                       || (members
                           && plainc && instruct))
-                    make_C_tag (TRUE);  /* a function */
+                    make_C_tag (true);  /* a function */
                   /* FALLTHRU */
                 default:
-                  fvextern = FALSE;
+                  fvextern = false;
                   fvdef = fvnone;
                   if (declarations
                        && cplpl && structdef == stagseen)
-                    make_C_tag (FALSE); /* forward declaration */
+                    make_C_tag (false); /* forward declaration */
                   else
-                    token.valid = FALSE;
+                    token.valid = false;
                 } /* switch (fvdef) */
               /* FALLTHRU */
             default:
@@ -3534,7 +3519,7 @@ C_entries (int c_ext, FILE *inf)
             {
             case omethodtag:
             case omethodparm:
-              make_C_tag (TRUE); /* an Objective C method */
+              make_C_tag (true); /* an Objective C method */
               objdef = oinbody;
               break;
             }
@@ -3557,18 +3542,18 @@ C_entries (int c_ext, FILE *inf)
                        && templatelev == 0
                        && (!fvextern || declarations))
                       || (members && instruct)))
-                  make_C_tag (FALSE); /* a variable */
+                  make_C_tag (false); /* a variable */
               break;
             case flistseen:
               if ((declarations && typdef == tnone && !instruct)
                   || (members && typdef != tignore && instruct))
                 {
-                  make_C_tag (TRUE); /* a function */
+                  make_C_tag (true); /* a function */
                   fvdef = fvnameseen;
                 }
               else if (!declarations)
                 fvdef = fvnone;
-              token.valid = FALSE;
+              token.valid = false;
               break;
             default:
               fvdef = fvnone;
@@ -3586,7 +3571,7 @@ C_entries (int c_ext, FILE *inf)
             case ttypeseen:
             case tend:
               typdef = tignore;
-              make_C_tag (FALSE);       /* a typedef */
+              make_C_tag (false);       /* a typedef */
               break;
             case tnone:
             case tinbody:
@@ -3601,7 +3586,7 @@ C_entries (int c_ext, FILE *inf)
                   if ((members && bracelev == 1)
                       || (globals && bracelev == 0
                           && (!fvextern || declarations)))
-                    make_C_tag (FALSE); /* a variable */
+                    make_C_tag (false); /* a variable */
                   /* FALLTHRU */
                 default:
                   fvdef = fvnone;
@@ -3628,7 +3613,7 @@ C_entries (int c_ext, FILE *inf)
                 {
                   /* This handles constructs like:
                      typedef void OperatorFun (int fun); */
-                  make_C_tag (FALSE);
+                  make_C_tag (false);
                   typdef = tignore;
                   fvdef = fignore;
                   break;
@@ -3647,14 +3632,14 @@ C_entries (int c_ext, FILE *inf)
           if (inattribute)
             {
               if (--attrparlev == 0)
-                inattribute = FALSE;
+                inattribute = false;
               break;
             }
           if (definedef != dnone)
             break;
           if (objdef == ocatseen && parlev == 1)
             {
-              make_C_tag (TRUE); /* an Objective C category */
+              make_C_tag (true); /* an Objective C category */
               objdef = oignore;
             }
           if (--parlev == 0)
@@ -3671,7 +3656,7 @@ C_entries (int c_ext, FILE *inf)
                       || typdef == ttypeseen))
                 {
                   typdef = tignore;
-                  make_C_tag (FALSE); /* a typedef */
+                  make_C_tag (false); /* a typedef */
                 }
             }
           else if (parlev < 0)  /* can happen due to ill-conceived #if's. */
@@ -3690,7 +3675,7 @@ C_entries (int c_ext, FILE *inf)
           switch (fvdef)
             {
             case flistseen:
-              make_C_tag (TRUE);    /* a function */
+              make_C_tag (true);    /* a function */
               /* FALLTHRU */
             case fignore:
               fvdef = fvnone;
@@ -3699,12 +3684,12 @@ C_entries (int c_ext, FILE *inf)
               switch (objdef)
                 {
                 case otagseen:
-                  make_C_tag (TRUE); /* an Objective C class */
+                  make_C_tag (true); /* an Objective C class */
                   objdef = oignore;
                   break;
                 case omethodtag:
                 case omethodparm:
-                  make_C_tag (TRUE); /* an Objective C method */
+                  make_C_tag (true); /* an Objective C method */
                   objdef = oinbody;
                   break;
                 default:
@@ -3725,7 +3710,7 @@ C_entries (int c_ext, FILE *inf)
             case scolonseen:       /* a class */
               pushclass_above (bracelev,token.line+token.offset, token.length);
               structdef = snone;
-              make_C_tag (FALSE);  /* a struct or enum */
+              make_C_tag (false);  /* a struct or enum */
               break;
             }
           bracelev += 1;
@@ -3736,7 +3721,7 @@ C_entries (int c_ext, FILE *inf)
           if (fvdef == fstartlist)
             {
               fvdef = fvnone;   /* avoid tagging `foo' in `foo (*bar()) ()' */
-              token.valid = FALSE;
+              token.valid = false;
             }
           break;
         case '}':
@@ -3746,13 +3731,13 @@ C_entries (int c_ext, FILE *inf)
           if (!ignoreindent && lp == newlb.buffer + 1)
             {
               if (bracelev != 0)
-                token.valid = FALSE; /* unexpected value, token unreliable */
+                token.valid = false; /* unexpected value, token unreliable */
               bracelev = 0;     /* reset brace level if first column */
               parlev = 0;       /* also reset paren level, just in case... */
             }
           else if (bracelev < 0)
             {
-              token.valid = FALSE; /* something gone amiss, token unreliable */
+              token.valid = false; /* something gone amiss, token unreliable */
               bracelev = 0;
             }
           if (bracelev == 0 && fvdef == vignore)
@@ -3779,7 +3764,7 @@ C_entries (int c_ext, FILE *inf)
             case fvnameseen:
               if ((members && bracelev == 1)
                   || (globals && bracelev == 0 && (!fvextern || declarations)))
-                make_C_tag (FALSE); /* a variable */
+                make_C_tag (false); /* a variable */
               /* FALLTHRU */
             default:
               fvdef = vignore;
@@ -3828,7 +3813,7 @@ C_entries (int c_ext, FILE *inf)
         case '\0':
           if (objdef == otagseen)
             {
-              make_C_tag (TRUE); /* an Objective C class */
+              make_C_tag (true); /* an Objective C class */
               objdef = oignore;
             }
           /* If a macro spans multiple lines don't reset its state. */
@@ -3898,18 +3883,18 @@ Yacc_entries (FILE *inf)
        &&                       /* instructions at start of loop */     \
           (readline (&line_buffer, file_pointer),                       \
            char_pointer = line_buffer.buffer,                           \
-           TRUE);                                                       \
+           true);                                                       \
       )
 
 #define LOOKING_AT(cp, kw)  /* kw is the keyword, a literal string */   \
-  ((assert ("" kw), TRUE)   /* syntax error if not a literal string */  \
+  ((assert ("" kw), true)   /* syntax error if not a literal string */  \
    && strneq ((cp), kw, sizeof (kw)-1)          /* cp points at kw */   \
    && notinname ((cp)[sizeof (kw)-1])           /* end of kw */         \
    && ((cp) = skip_spaces ((cp)+sizeof (kw)-1))) /* skip spaces */
 
 /* Similar to LOOKING_AT but does not use notinname, does not skip */
 #define LOOKING_AT_NOCASE(cp, kw) /* the keyword is a literal string */ \
-  ((assert ("" kw), TRUE) /* syntax error if not a literal string */    \
+  ((assert ("" kw), true) /* syntax error if not a literal string */    \
    && strncaseeq ((cp), kw, sizeof (kw)-1)      /* cp points at kw */   \
    && ((cp) += sizeof (kw)-1))                  /* skip spaces */
 
@@ -3972,7 +3957,7 @@ F_getit (FILE *inf)
     return;
   for (cp = dbp + 1; *cp != '\0' && intoken (*cp); cp++)
     continue;
-  make_tag (dbp, cp-dbp, TRUE,
+  make_tag (dbp, cp-dbp, true,
             lb.buffer, cp - lb.buffer + 1, lineno, linecharno);
 }
 
@@ -4049,7 +4034,7 @@ Fortran_functions (FILE *inf)
             {
               dbp = skip_spaces (dbp);
               if (*dbp == '\0') /* assume un-named */
-                make_tag ("blockdata", 9, TRUE,
+                make_tag ("blockdata", 9, true,
                           lb.buffer, dbp - lb.buffer, lineno, linecharno);
               else
                 F_getit (inf);  /* look for name */
@@ -4122,7 +4107,7 @@ Ada_getit (FILE *inf, const char *name_qualifier)
       *cp = '\0';
       name = concat (dbp, name_qualifier, "");
       *cp = c;
-      make_tag (name, strlen (name), TRUE,
+      make_tag (name, strlen (name), true,
                 lb.buffer, cp - lb.buffer + 1, lineno, linecharno);
       free (name);
       if (c == '"')
@@ -4134,8 +4119,8 @@ Ada_getit (FILE *inf, const char *name_qualifier)
 static void
 Ada_funcs (FILE *inf)
 {
-  bool inquote = FALSE;
-  bool skip_till_semicolumn = FALSE;
+  bool inquote = false;
+  bool skip_till_semicolumn = false;
 
   LOOP_ON_INPUT_LINES (inf, lb, dbp)
     {
@@ -4147,13 +4132,13 @@ Ada_funcs (FILE *inf)
               dbp = etags_strchr (dbp + !inquote, '"');
               if (dbp != NULL)
                 {
-                  inquote = FALSE;
+                  inquote = false;
                   dbp += 1;
                   continue;     /* advance char */
                 }
               else
                 {
-                  inquote = TRUE;
+                  inquote = true;
                   break;        /* advance line */
                 }
             }
@@ -4175,7 +4160,7 @@ Ada_funcs (FILE *inf)
           if (skip_till_semicolumn)
             {
               if (*dbp == ';')
-                skip_till_semicolumn = FALSE;
+                skip_till_semicolumn = false;
               dbp++;
               continue;         /* advance char */
             }
@@ -4212,7 +4197,7 @@ Ada_funcs (FILE *inf)
                 {
                   /* when tagging types, avoid tagging  use type Pack.Typename;
                      for this, we will skip everything till a ; */
-                  skip_till_semicolumn = TRUE;
+                  skip_till_semicolumn = true;
                   continue;     /* advance char */
                 }
 
@@ -4261,7 +4246,7 @@ Asm_labels (FILE *inf)
             cp++;
           if (*cp == ':' || iswhite (*cp))
             /* Found end of label, so copy it and add it to the table. */
-            make_tag (lb.buffer, cp - lb.buffer, TRUE,
+            make_tag (lb.buffer, cp - lb.buffer, true,
                       lb.buffer, cp - lb.buffer + 1, lineno, linecharno);
         }
     }
@@ -4275,7 +4260,7 @@ Asm_labels (FILE *inf)
  * Perl variable names: /^(my|local).../
  * Original code by Bart Robinson <lomew@cs.utah.edu> (1995)
  * Additions by Michael Ernst <mernst@alum.mit.edu> (1997)
- * Ideas by Kai Großjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE> (2001)
+ * Ideas by Kai Großjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE> (2001)
  */
 static void
 Perl_functions (FILE *inf)
@@ -4305,7 +4290,7 @@ Perl_functions (FILE *inf)
           if ((pos = etags_strchr (sp, ':')) != NULL
               && pos < cp && pos[1] == ':')
             /* The name is already qualified. */
-            make_tag (sp, cp - sp, TRUE,
+            make_tag (sp, cp - sp, true,
                       lb.buffer, cp - lb.buffer + 1, lineno, linecharno);
           else
             /* Qualify it. */
@@ -4316,7 +4301,7 @@ Perl_functions (FILE *inf)
               *cp = '\0';
               name = concat (package, "::", sp);
               *cp = savechar;
-              make_tag (name, strlen (name), TRUE,
+              make_tag (name, strlen (name), true,
                         lb.buffer, cp - lb.buffer + 1, lineno, linecharno);
               free (name);
             }
@@ -4359,7 +4344,7 @@ Perl_functions (FILE *inf)
           else
             continue;
 
-          make_tag (varstart, cp - varstart, FALSE,
+          make_tag (varstart, cp - varstart, false,
                     lb.buffer, cp - lb.buffer + 1, lineno, linecharno);
         }
     }
@@ -4386,7 +4371,7 @@ Python_functions (FILE *inf)
           char *name = cp;
           while (!notinname (*cp) && *cp != ':')
             cp++;
-          make_tag (name, cp - name, TRUE,
+          make_tag (name, cp - name, true,
                     lb.buffer, cp - lb.buffer + 1, lineno, linecharno);
         }
     }
@@ -4406,8 +4391,8 @@ Python_functions (FILE *inf)
 static void
 PHP_functions (FILE *inf)
 {
-  register char *cp, *name;
-  bool search_identifier = FALSE;
+  char *cp, *name;
+  bool search_identifier = false;
 
   LOOP_ON_INPUT_LINES (inf, lb, cp)
     {
@@ -4418,9 +4403,9 @@ PHP_functions (FILE *inf)
         {
           while (!notinname (*cp))
             cp++;
-          make_tag (name, cp - name, TRUE,
+          make_tag (name, cp - name, true,
                     lb.buffer, cp - lb.buffer + 1, lineno, linecharno);
-          search_identifier = FALSE;
+          search_identifier = false;
         }
       else if (LOOKING_AT (cp, "function"))
         {
@@ -4431,11 +4416,11 @@ PHP_functions (FILE *inf)
               name = cp;
               while (!notinname (*cp))
                 cp++;
-              make_tag (name, cp - name, TRUE,
+              make_tag (name, cp - name, true,
                         lb.buffer, cp - lb.buffer + 1, lineno, linecharno);
             }
           else
-            search_identifier = TRUE;
+            search_identifier = true;
         }
       else if (LOOKING_AT (cp, "class"))
         {
@@ -4444,11 +4429,11 @@ PHP_functions (FILE *inf)
               name = cp;
               while (*cp != '\0' && !iswhite (*cp))
                 cp++;
-              make_tag (name, cp - name, FALSE,
+              make_tag (name, cp - name, false,
                         lb.buffer, cp - lb.buffer + 1, lineno, linecharno);
             }
           else
-            search_identifier = TRUE;
+            search_identifier = true;
         }
       else if (strneq (cp, "define", 6)
                && (cp = skip_spaces (cp+6))
@@ -4459,7 +4444,7 @@ PHP_functions (FILE *inf)
           name = cp;
           while (*cp != quote && *cp != '\0')
             cp++;
-          make_tag (name, cp - name, FALSE,
+          make_tag (name, cp - name, false,
                     lb.buffer, cp - lb.buffer + 1, lineno, linecharno);
         }
       else if (members
@@ -4469,7 +4454,7 @@ PHP_functions (FILE *inf)
           name = cp;
           while (!notinname (*cp))
             cp++;
-          make_tag (name, cp - name, FALSE,
+          make_tag (name, cp - name, false,
                     lb.buffer, cp - lb.buffer + 1, lineno, linecharno);
         }
     }
@@ -4500,7 +4485,7 @@ Cobol_paragraphs (FILE *inf)
       for (ep = bp; ISALNUM (*ep) || *ep == '-'; ep++)
         continue;
       if (*ep++ == '.')
-        make_tag (bp, ep - bp, TRUE,
+        make_tag (bp, ep - bp, true,
                   lb.buffer, ep - lb.buffer + 1, lineno, linecharno);
     }
 }
@@ -4529,7 +4514,7 @@ Makefile_targets (FILE *inf)
           while (--bp > namestart)
             if (!notinname (*bp))
               break;
-          make_tag (namestart, bp - namestart + 1, TRUE,
+          make_tag (namestart, bp - namestart + 1, true,
                     lb.buffer, bp - lb.buffer + 2, lineno, linecharno);
         }
     }
@@ -4553,7 +4538,7 @@ Pascal_functions (FILE *inf)
   int save_lineno, namelen, taglen;
   char c, *name;
 
-  bool                          /* each of these flags is TRUE if: */
+  bool                          /* each of these flags is true if: */
     incomment,                  /* point is inside a comment */
     inquote,                    /* point is inside '..' string */
     get_tagname,                /* point is after PROCEDURE/FUNCTION
@@ -4571,11 +4556,11 @@ Pascal_functions (FILE *inf)
   *dbp = '\0';
   linebuffer_init (&tline);
 
-  incomment = inquote = FALSE;
-  found_tag = FALSE;            /* have a proc name; check if extern */
-  get_tagname = FALSE;          /* found "procedure" keyword         */
-  inparms = FALSE;              /* found '(' after "proc"            */
-  verify_tag = FALSE;           /* check if "extern" is ahead        */
+  incomment = inquote = false;
+  found_tag = false;            /* have a proc name; check if extern */
+  get_tagname = false;          /* found "procedure" keyword         */
+  inparms = false;              /* found '(' after "proc"            */
+  verify_tag = false;           /* check if "extern" is ahead        */
 
 
   while (!feof (inf))           /* long main loop to get next char */
@@ -4596,46 +4581,46 @@ Pascal_functions (FILE *inf)
       if (incomment)
         {
           if (c == '}')         /* within { } comments */
-            incomment = FALSE;
+            incomment = false;
           else if (c == '*' && *dbp == ')') /* within (* *) comments */
             {
               dbp++;
-              incomment = FALSE;
+              incomment = false;
             }
           continue;
         }
       else if (inquote)
         {
           if (c == '\'')
-            inquote = FALSE;
+            inquote = false;
           continue;
         }
       else
         switch (c)
           {
           case '\'':
-            inquote = TRUE;     /* found first quote */
+            inquote = true;     /* found first quote */
             continue;
           case '{':             /* found open { comment */
-            incomment = TRUE;
+            incomment = true;
             continue;
           case '(':
             if (*dbp == '*')    /* found open (* comment */
               {
-                incomment = TRUE;
+                incomment = true;
                 dbp++;
               }
             else if (found_tag) /* found '(' after tag, i.e., parm-list */
-              inparms = TRUE;
+              inparms = true;
             continue;
           case ')':             /* end of parms list */
             if (inparms)
-              inparms = FALSE;
+              inparms = false;
             continue;
           case ';':
             if (found_tag && !inparms) /* end of proc or fn stmt */
               {
-                verify_tag = TRUE;
+                verify_tag = true;
                 break;
               }
             continue;
@@ -4649,23 +4634,23 @@ Pascal_functions (FILE *inf)
             {
               if (nocase_tail ("extern")) /* superfluous, really! */
                 {
-                  found_tag = FALSE;
-                  verify_tag = FALSE;
+                  found_tag = false;
+                  verify_tag = false;
                 }
             }
           else if (lowcase (*dbp) == 'f')
             {
               if (nocase_tail ("forward")) /* check for forward reference */
                 {
-                  found_tag = FALSE;
-                  verify_tag = FALSE;
+                  found_tag = false;
+                  verify_tag = false;
                 }
             }
           if (found_tag && verify_tag) /* not external proc, so make tag */
             {
-              found_tag = FALSE;
-              verify_tag = FALSE;
-              make_tag (name, namelen, TRUE,
+              found_tag = false;
+              verify_tag = false;
+              make_tag (name, namelen, true,
                         tline.buffer, taglen, save_lineno, save_lcno);
               continue;
             }
@@ -4691,8 +4676,8 @@ Pascal_functions (FILE *inf)
           taglen = cp - lb.buffer + 1;
 
           dbp = cp;             /* set dbp to e-o-token */
-          get_tagname = FALSE;
-          found_tag = TRUE;
+          get_tagname = false;
+          found_tag = true;
           continue;
 
           /* And proceed to check for "extern". */
@@ -4704,11 +4689,11 @@ Pascal_functions (FILE *inf)
             {
             case 'p':
               if (nocase_tail ("rocedure")) /* c = 'p', dbp has advanced */
-                get_tagname = TRUE;
+                get_tagname = true;
               continue;
             case 'f':
               if (nocase_tail ("unction"))
-                get_tagname = TRUE;
+                get_tagname = true;
               continue;
             }
         }
@@ -4837,7 +4822,7 @@ PS_functions (FILE *inf)
                *ep != '\0' && *ep != ' ' && *ep != '{';
                ep++)
             continue;
-          make_tag (bp, ep - bp, TRUE,
+          make_tag (bp, ep - bp, true,
                     lb.buffer, ep - lb.buffer + 1, lineno, linecharno);
         }
       else if (LOOKING_AT (bp, "defineps"))
@@ -4967,14 +4952,14 @@ TeX_commands (FILE *inf)
           for (key = TEX_toktab; key->buffer != NULL; key++)
             if (strneq (cp, key->buffer, key->len))
               {
-                register char *p;
+                char *p;
                 int namelen, linelen;
-                bool opgrp = FALSE;
+                bool opgrp = false;
 
                 cp = skip_spaces (cp + key->len);
                 if (*cp == TEX_opgrp)
                   {
-                    opgrp = TRUE;
+                    opgrp = true;
                     cp++;
                   }
                 for (p = cp;
@@ -4990,7 +4975,7 @@ TeX_commands (FILE *inf)
                       p++;
                     linelen = p - lb.buffer + 1;
                   }
-                make_tag (cp, namelen, TRUE,
+                make_tag (cp, namelen, true,
                           lb.buffer, linelen, lineno, linecharno);
                 goto tex_next_line; /* We only tag a line once */
               }
@@ -5094,7 +5079,7 @@ Texinfo_nodes (FILE *inf)
         start = cp;
         while (*cp != '\0' && *cp != ',')
           cp++;
-        make_tag (start, cp - start, TRUE,
+        make_tag (start, cp - start, true,
                   lb.buffer, cp - lb.buffer + 1, lineno, linecharno);
       }
 }
@@ -5105,15 +5090,15 @@ Texinfo_nodes (FILE *inf)
  * Contents of <title>, <h1>, <h2>, <h3> are tags.
  * Contents of <a name=xxx> are tags with name xxx.
  *
- * Francesco Potortì, 2002.
+ * Francesco Potortì, 2002.
  */
 static void
 HTML_labels (FILE *inf)
 {
-  bool getnext = FALSE;         /* next text outside of HTML tags is a tag */
-  bool skiptag = FALSE;         /* skip to the end of the current HTML tag */
-  bool intag = FALSE;           /* inside an html tag, looking for ID= */
-  bool inanchor = FALSE;        /* when INTAG, is an anchor, look for NAME= */
+  bool getnext = false;         /* next text outside of HTML tags is a tag */
+  bool skiptag = false;         /* skip to the end of the current HTML tag */
+  bool intag = false;           /* inside an html tag, looking for ID= */
+  bool inanchor = false;        /* when INTAG, is an anchor, look for NAME= */
   char *end;
 
 
@@ -5129,7 +5114,7 @@ HTML_labels (FILE *inf)
             if (*dbp == '>')
               {
                 dbp += 1;
-                skiptag = FALSE;
+                skiptag = false;
                 continue;       /* look on the same line */
               }
             break;              /* go to next line */
@@ -5145,7 +5130,7 @@ HTML_labels (FILE *inf)
             if (*dbp == '>')
               {
                 dbp += 1;
-                intag = FALSE;
+                intag = false;
                 continue;       /* look on the same line */
               }
             if ((inanchor && LOOKING_AT_NOCASE (dbp, "name="))
@@ -5164,9 +5149,9 @@ HTML_labels (FILE *inf)
                 token_name.buffer[end - dbp] = '\0';
 
                 dbp = end;
-                intag = FALSE;  /* we found what we looked for */
-                skiptag = TRUE; /* skip to the end of the tag */
-                getnext = TRUE; /* then grab the text */
+                intag = false;  /* we found what we looked for */
+                skiptag = true; /* skip to the end of the tag */
+                getnext = true; /* then grab the text */
                 continue;       /* look on the same line */
               }
             dbp += 1;
@@ -5179,17 +5164,17 @@ HTML_labels (FILE *inf)
               break;            /* go to next line */
             if (*dbp == '<')
               {
-                intag = TRUE;
+                intag = true;
                 inanchor = (lowcase (dbp[1]) == 'a' && !intoken (dbp[2]));
                 continue;       /* look on the same line */
               }
 
             for (end = dbp + 1; *end != '\0' && *end != '<'; end++)
               continue;
-            make_tag (token_name.buffer, token_name.len, TRUE,
+            make_tag (token_name.buffer, token_name.len, true,
                       dbp, end - dbp, lineno, linecharno);
             linebuffer_setlen (&token_name, 0); /* no name in buffer */
-            getnext = FALSE;
+            getnext = false;
             break;              /* go to next line */
           }
 
@@ -5199,10 +5184,10 @@ HTML_labels (FILE *inf)
               dbp++;
             if (*dbp == '\0')
               break;            /* go to next line */
-            intag = TRUE;
+            intag = true;
             if (lowcase (dbp[1]) == 'a' && !intoken (dbp[2]))
               {
-                inanchor = TRUE;
+                inanchor = true;
                 continue;       /* look on the same line */
               }
             else if (LOOKING_AT_NOCASE (dbp, "<title>")
@@ -5210,8 +5195,8 @@ HTML_labels (FILE *inf)
                      || LOOKING_AT_NOCASE (dbp, "<h2>")
                      || LOOKING_AT_NOCASE (dbp, "<h3>"))
               {
-                intag = FALSE;
-                getnext = TRUE;
+                intag = false;
+                getnext = true;
                 continue;       /* look on the same line */
               }
             dbp += 1;
@@ -5316,7 +5301,7 @@ prolog_pr (char *s, char *last)
           || len != strlen (last)
           || !strneq (s, last, len)))
         {
-          make_tag (s, len, TRUE, s, pos, lineno, linecharno);
+          make_tag (s, len, true, s, pos, lineno, linecharno);
           return len;
         }
   else
@@ -5472,7 +5457,7 @@ erlang_func (char *s, char *last)
           || len != (int)strlen (last)
           || !strneq (s, last, len)))
         {
-          make_tag (s, len, TRUE, s, pos, lineno, linecharno);
+          make_tag (s, len, true, s, pos, lineno, linecharno);
           return len;
         }
 
@@ -5499,7 +5484,7 @@ erlang_attribute (char *s)
     {
       int len = erlang_atom (skip_spaces (cp));
       if (len > 0)
-        make_tag (cp, len, TRUE, s, cp + len - s, lineno, linecharno);
+        make_tag (cp, len, true, s, cp + len - s, lineno, linecharno);
     }
   return;
 }
@@ -5552,7 +5537,7 @@ scan_separators (char *name)
 {
   char sep = name[0];
   char *copyto = name;
-  bool quoted = FALSE;
+  bool quoted = false;
 
   for (++name; *name != '\0'; ++name)
     {
@@ -5580,10 +5565,10 @@ scan_separators (char *name)
                 }
               break;
             }
-          quoted = FALSE;
+          quoted = false;
         }
       else if (*name == '\\')
-        quoted = TRUE;
+        quoted = true;
       else if (*name == sep)
         break;
       else
@@ -5628,10 +5613,7 @@ analyse_regex (char *regex_arg)
         /* regexfile is a file containing regexps, one per line. */
         regexfp = fopen (regexfile, "r");
         if (regexfp == NULL)
-          {
-            pfatal (regexfile);
-            return;
-          }
+          pfatal (regexfile);
         linebuffer_init (&regexbuf);
         while (readline_internal (&regexbuf, regexfp) > 0)
           analyse_regex (regexbuf.buffer);
@@ -5680,10 +5662,10 @@ add_regex (char *regexp_pattern, language *lang)
   struct re_pattern_buffer *patbuf;
   regexp *rp;
   bool
-    force_explicit_name = TRUE, /* do not use implicit tag names */
-    ignore_case = FALSE,        /* case is significant */
-    multi_line = FALSE,         /* matches are done one line at a time */
-    single_line = FALSE;        /* dot does not match newline */
+    force_explicit_name = true, /* do not use implicit tag names */
+    ignore_case = false,        /* case is significant */
+    multi_line = false,         /* matches are done one line at a time */
+    single_line = false;        /* dot does not match newline */
 
 
   if (strlen (regexp_pattern) < 3)
@@ -5719,17 +5701,17 @@ add_regex (char *regexp_pattern, language *lang)
       case 'N':
         if (modifiers == name)
           error ("forcing explicit tag name but no name, ignoring");
-        force_explicit_name = TRUE;
+        force_explicit_name = true;
         break;
       case 'i':
-        ignore_case = TRUE;
+        ignore_case = true;
         break;
       case 's':
-        single_line = TRUE;
+        single_line = true;
         /* FALLTHRU */
       case 'm':
-        multi_line = TRUE;
-        need_filebuf = TRUE;
+        multi_line = true;
+        need_filebuf = true;
         break;
       default:
         error ("invalid regexp modifier `%c', ignoring", modifiers[0]);
@@ -5773,7 +5755,7 @@ add_regex (char *regexp_pattern, language *lang)
   p_head->lang = lang;
   p_head->pat = patbuf;
   p_head->name = savestr (name);
-  p_head->error_signaled = FALSE;
+  p_head->error_signaled = false;
   p_head->force_explicit_name = force_explicit_name;
   p_head->ignore_case = ignore_case;
   p_head->multi_line = multi_line;
@@ -5887,7 +5869,7 @@ regex_tag_multiline (void)
                 {
                   error ("regexp stack overflow while matching \"%s\"",
                          rp->pattern);
-                  rp->error_signaled = TRUE;
+                  rp->error_signaled = true;
                 }
               break;
             case -1:
@@ -5900,7 +5882,7 @@ regex_tag_multiline (void)
                     {
                       error ("regexp matches the empty string: \"%s\"",
                              rp->pattern);
-                      rp->error_signaled = TRUE;
+                      rp->error_signaled = true;
                     }
                   match = -3;   /* exit from while loop */
                   break;
@@ -5917,10 +5899,10 @@ regex_tag_multiline (void)
                 name = substitute (buffer, rp->name, &rp->regs);
               if (rp->force_explicit_name)
                 /* Force explicit tag name, if a name is there. */
-                pfnote (name, TRUE, buffer + linecharno,
+                pfnote (name, true, buffer + linecharno,
                         charno - linecharno + 1, lineno, linecharno);
               else
-                make_tag (name, strlen (name), TRUE, buffer + linecharno,
+                make_tag (name, strlen (name), true, buffer + linecharno,
                           charno - linecharno + 1, lineno, linecharno);
               break;
             }
@@ -5939,9 +5921,9 @@ nocase_tail (const char *cp)
   if (*cp == '\0' && !intoken (dbp[len]))
     {
       dbp += len;
-      return TRUE;
+      return true;
     }
-  return FALSE;
+  return false;
 }
 
 static void
@@ -5954,7 +5936,7 @@ get_tag (register char *bp, char **namepp)
       /* Go till you get to white space or a syntactic break */
       for (cp = bp + 1; !notinname (*cp); cp++)
         continue;
-      make_tag (bp, cp - bp, TRUE,
+      make_tag (bp, cp - bp, true,
                 lb.buffer, cp - lb.buffer + 1, lineno, linecharno);
     }
 
@@ -6089,7 +6071,7 @@ readline (linebuffer *lbp, FILE *stream)
                   char *taggedfname;    /* name of original file as given */
                   char *name;           /* temp var */
 
-                  discard_until_line_directive = FALSE; /* found it */
+                  discard_until_line_directive = false; /* found it */
                   name = lbp->buffer + start;
                   *endp = '\0';
                   canonicalize_filename (name);
@@ -6137,7 +6119,7 @@ readline (linebuffer *lbp, FILE *stream)
                         for (fdp = fdhead; fdp != NULL; fdp = fdp->next)
                           if (streq (fdp->infabsname, taggedabsname))
                             {
-                              discard_until_line_directive = TRUE;
+                              discard_until_line_directive = true;
                               free (taggedfname);
                               break;
                             }
@@ -6153,9 +6135,9 @@ readline (linebuffer *lbp, FILE *stream)
                           fdhead->infabsname = savestr (curfdp->infabsname);
                           fdhead->infabsdir = savestr (curfdp->infabsdir);
                           fdhead->taggedfname = taggedfname;
-                          fdhead->usecharno = FALSE;
+                          fdhead->usecharno = false;
                           fdhead->prop = NULL;
-                          fdhead->written = FALSE;
+                          fdhead->written = false;
                           curfdp = fdhead;
                         }
                     }
@@ -6178,7 +6160,7 @@ readline (linebuffer *lbp, FILE *stream)
               return;
             }
           /* End of file. */
-          discard_until_line_directive = FALSE;
+          discard_until_line_directive = false;
           return;
         }
     } /* if #line directives should be considered */
@@ -6208,7 +6190,7 @@ readline (linebuffer *lbp, FILE *stream)
                 {
                   error ("regexp stack overflow while matching \"%s\"",
                          rp->pattern);
-                  rp->error_signaled = TRUE;
+                  rp->error_signaled = true;
                 }
               break;
             case -1:
@@ -6219,7 +6201,7 @@ readline (linebuffer *lbp, FILE *stream)
               if (!rp->error_signaled)
                 {
                   error ("regexp matches the empty string: \"%s\"", rp->pattern);
-                  rp->error_signaled = TRUE;
+                  rp->error_signaled = true;
                 }
               break;
             default:
@@ -6231,9 +6213,9 @@ readline (linebuffer *lbp, FILE *stream)
                 name = substitute (lbp->buffer, rp->name, &rp->regs);
               if (rp->force_explicit_name)
                 /* Force explicit tag name, if a name is there. */
-                pfnote (name, TRUE, lbp->buffer, match, lineno, linecharno);
+                pfnote (name, true, lbp->buffer, match, lineno, linecharno);
               else
-                make_tag (name, strlen (name), TRUE,
+                make_tag (name, strlen (name), true,
                           lbp->buffer, match, lineno, linecharno);
               break;
             }
@@ -6259,12 +6241,9 @@ savestr (const char *cp)
 static char *
 savenstr (const char *cp, int len)
 {
-  register char *dp;
-
-  dp = xnew (len + 1, char);
-  memcpy (dp, cp, len);
+  char *dp = xnew (len + 1, char);
   dp[len] = '\0';
-  return dp;
+  return memcpy (dp, cp, len);
 }
 
 /*
@@ -6378,7 +6357,6 @@ concat (const char *s1, const char *s2, const char *s3)
   strcpy (result, s1);
   strcpy (result + len1, s2);
   strcpy (result + len1 + len2, s3);
-  result[len1 + len2 + len3] = '\0';
 
   return result;
 }
diff --git a/lib-src/grep-changelog b/lib-src/grep-changelog
index ace4d48df3e..ab8c5e38618 100755
--- a/lib-src/grep-changelog
+++ b/lib-src/grep-changelog
@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 
diff --git a/lib-src/hexl.c b/lib-src/hexl.c
index 3208a895aa2..9e21ddf9de6 100644
--- a/lib-src/hexl.c
+++ b/lib-src/hexl.c
@@ -1,5 +1,5 @@
 /* Convert files for Emacs Hexl mode.
-   Copyright (C) 1989, 2001-2013 Free Software Foundation, Inc.
+   Copyright (C) 1989, 2001-2014 Free Software Foundation, Inc.
 
 Author: Keith Gabryelski
 (according to authors.el)
@@ -37,12 +37,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #define DEFAULT_GROUPING        0x01
 #define DEFAULT_BASE            16
 
-#undef TRUE
-#undef FALSE
-#define TRUE  (1)
-#define FALSE (0)
-
-int base = DEFAULT_BASE, un_flag = FALSE, iso_flag = FALSE, endian = 1;
+int base = DEFAULT_BASE;
+bool un_flag = false, iso_flag = false, endian = true;
 int group_by = DEFAULT_GROUPING;
 char *progname;
 
@@ -83,7 +79,7 @@ main (int argc, char **argv)
         }
       else if (!strcmp (*argv, "-un") || !strcmp (*argv, "-de"))
         {
-          un_flag = TRUE;
+          un_flag = true;
           --argc; argv++;
         }
       else if (!strcmp (*argv, "-hex"))
@@ -93,7 +89,7 @@ main (int argc, char **argv)
         }
       else if (!strcmp (*argv, "-iso"))
         {
-          iso_flag = TRUE;
+          iso_flag = true;
           --argc; argv++;
         }
       else if (!strcmp (*argv, "-oct"))
@@ -103,12 +99,12 @@ main (int argc, char **argv)
         }
       else if (!strcmp (*argv, "-big-endian"))
         {
-          endian = 1;
+          endian = true;
           --argc; argv++;
         }
       else if (!strcmp (*argv, "-little-endian"))
         {
-          endian = 0;
+          endian = false;
           --argc; argv++;
         }
       else if (!strcmp (*argv, "-group-by-8-bits"))
@@ -129,7 +125,7 @@ main (int argc, char **argv)
       else if (!strcmp (*argv, "-group-by-64-bits"))
         {
           group_by = 0x07;
-          endian = 0;
+          endian = false;
           --argc; argv++;
         }
       else
diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index 68e5279fd15..2eb2413815e 100644
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -1,6 +1,6 @@
 /* Generate doc-string file for GNU Emacs from source files.
 
-Copyright (C) 1985-1986, 1992-1994, 1997, 1999-2013 Free Software
+Copyright (C) 1985-1986, 1992-1994, 1997, 1999-2014 Free Software
 Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -276,7 +276,7 @@ struct rcsoc_state
 /* Output CH to the file or buffer in STATE.  Any pending newlines or
    spaces are output first.  */
 
-static inline void
+static void
 put_char (int ch, struct rcsoc_state *state)
 {
   int out_ch;
@@ -555,7 +555,7 @@ enum global_type
   LISP_OBJECT,
   EMACS_INTEGER,
   BOOLEAN,
-  FUNCTION,
+  FUNCTION
 };
 
 /* A single global.  */
@@ -1075,7 +1075,7 @@ read_lisp_symbol (FILE *infile, char *buffer)
 static int
 search_lisp_doc_at_eol (FILE *infile)
 {
-  char c = 0, c1 = 0, c2 = 0;
+  int c = 0, c1 = 0, c2 = 0;
 
   /* Skip until the end of line; remember two previous chars.  */
   while (c != '\n' && c != '\r' && c != EOF)
@@ -1090,8 +1090,7 @@ search_lisp_doc_at_eol (FILE *infile)
   if (c2 != '"' || c1 != '\\')
     {
 #ifdef DEBUG
-      fprintf (stderr, "## non-docstring in %s (%s)\n",
-               buffer, filename);
+      fprintf (stderr, "## non-docstring found\n");
 #endif
       if (c != EOF)
         ungetc (c, infile);
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 8d016bc16be..773c89745e5 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -1,5 +1,5 @@
 #  -*- Makefile -*- for GNU Emacs on the Microsoft Windows API.
-# Copyright (C) 2000-2013 Free Software Foundation, Inc.
+# Copyright (C) 2000-2014 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -27,6 +27,7 @@ LOCAL_FLAGS	= -DNO_LDAV=1 -DNO_ARCHIVES=1 -I../lib \
                   -I../nt/inc -I../src $(EMACS_EXTRA_C_FLAGS)
 
 LIBS            = $(BASE_LIBS) $(ADVAPI32)
+LIB_SRC         = .
 
 # The following target is used by makefile.w32-in files in other directories.
 make-docfile:   $(BLD)/make-docfile.exe
@@ -250,6 +251,7 @@ lisp2 = \
         $(lispsource)register.elc \
         $(lispsource)replace.elc \
         $(lispsource)simple.elc \
+        $(lispsource)emacs-lisp/nadvice.elc \
         $(lispsource)minibuffer.elc \
         $(lispsource)startup.elc \
         $(lispsource)subr.elc \
@@ -291,10 +293,10 @@ $(DOC):		stamp_BLD $(BLD)/make-docfile.exe ../src/$(BLD)/temacs.exe $(lisp1) $(l
                 "$(THISDIR)/$(BLD)/make-docfile" -a $(DOC) -d ../src $(lisp1)
                 "$(THISDIR)/$(BLD)/make-docfile" -a $(DOC) -d ../src $(lisp2)
                 "$(THISDIR)/$(BLD)/make-docfile" -a $(DOC) -d ../src $(OTHER_PLATFORM_SUPPORT)
-                $(CP) $(DOC) ../etc/DOC-X
+                $(CP) $(DOC) ../etc/DOC
                 - mkdir "../src/$(OBJDIR)"
                 - mkdir "../src/$(OBJDIR)/etc"
-                $(CP) $(DOC) ../src/$(OBJDIR)/etc/DOC-X
+                $(CP) $(DOC) ../src/$(OBJDIR)/etc/DOC
 
 {$(BLD)}.$(O){$(BLD)}.exe:
                 $(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $*.$(O) $(LIBS)
@@ -360,7 +362,6 @@ TAGS: $(BLD)/etags.exe *.c *.h
 ### DEPENDENCIES ###
 
 EMACS_ROOT      = ..
-LIB_SRC         = .
 SRC             = $(EMACS_ROOT)/src
 NT_INC          = $(EMACS_ROOT)/nt/inc
 GNU_LIB         = $(EMACS_ROOT)/lib
diff --git a/lib-src/movemail.c b/lib-src/movemail.c
index cf93fb78d98..d0d00fcf4cc 100644
--- a/lib-src/movemail.c
+++ b/lib-src/movemail.c
@@ -1,7 +1,7 @@
 /* movemail foo bar -- move file foo to file bar,
    locking file foo the way /bin/mail respects.
 
-Copyright (C) 1986, 1992-1994, 1996, 1999, 2001-2013 Free Software
+Copyright (C) 1986, 1992-1994, 1996, 1999, 2001-2014 Free Software
 Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -304,24 +304,13 @@ main (int argc, char **argv)
 
           memcpy (tempname, inname, inname_dirlen);
           strcpy (tempname + inname_dirlen, "EXXXXXX");
-#ifdef HAVE_MKSTEMP
-          desc = mkstemp (tempname);
-#else
-          mktemp (tempname);
-          if (!*tempname)
-            desc = -1;
-          else
-            {
-              unlink (tempname);
-              desc = open (tempname, O_WRONLY | O_CREAT | O_EXCL, 0600);
-            }
-#endif
+          desc = mkostemp (tempname, 0);
           if (desc < 0)
             {
-              int mkstemp_errno = errno;
+              int mkostemp_errno = errno;
               error ("error while creating what would become the lock file",
                      0, 0);
-              errno = mkstemp_errno;
+              errno = mkostemp_errno;
               pfatal_with_name (tempname);
             }
           close (desc);
@@ -380,13 +369,9 @@ main (int argc, char **argv)
       if (indesc < 0)
         pfatal_with_name (inname);
 
-#ifdef BSD_SYSTEM
-      /* In case movemail is setuid to root, make sure the user can
-         read the output file.  */
-      /* This is desirable for all systems
-         but I don't want to assume all have the umask system call */
-      umask (umask (0) & 0333);
-#endif /* BSD_SYSTEM */
+      /* Make sure the user can read the output file.  */
+      umask (umask (0) & 0377);
+
       outdesc = open (outname, O_WRONLY | O_CREAT | O_EXCL, 0666);
       if (outdesc < 0)
         pfatal_with_name (outname);
@@ -470,10 +455,8 @@ main (int argc, char **argv)
           }
       }
 
-#ifdef BSD_SYSTEM
-      if (fsync (outdesc) < 0)
+      if (fsync (outdesc) != 0 && errno != EINVAL)
         pfatal_and_delete (outname);
-#endif
 
       /* Prevent symlink attacks truncating other users' mailboxes */
       if (setregid (-1, real_gid) < 0)
@@ -754,21 +737,14 @@ popmail (char *mailbox, char *outfile, int preserve, char *password, int reverse
         }
     }
 
-  /* On AFS, a call to write only modifies the file in the local
-   *     workstation's AFS cache.  The changes are not written to the server
-   *      until a call to fsync or close is made.  Users with AFS home
-   *      directories have lost mail when over quota because these checks were
-   *      not made in previous versions of movemail. */
-
-#ifdef BSD_SYSTEM
-  if (fsync (mbfi) < 0)
+  if (fsync (mbfi) != 0 && errno != EINVAL)
     {
       error ("Error in fsync: %s", strerror (errno), 0);
+      close (mbfi);
       return EXIT_FAILURE;
     }
-#endif
 
-  if (close (mbfi) == -1)
+  if (close (mbfi) != 0)
     {
       error ("Error in close: %s", strerror (errno), 0);
       return EXIT_FAILURE;
diff --git a/lib-src/ntlib.c b/lib-src/ntlib.c
index f43117457cb..23d7ba77b8e 100644
--- a/lib-src/ntlib.c
+++ b/lib-src/ntlib.c
@@ -1,6 +1,6 @@
 /* Utility and Unix shadow routines for GNU Emacs support programs on NT.
 
-Copyright (C) 1994, 2001-2013 Free Software Foundation, Inc.
+Copyright (C) 1994, 2001-2014 Free Software Foundation, Inc.
 
 Author: Geoff Voelker (voelker@cs.washington.edu)
 Created: 10-8-94
@@ -34,21 +34,26 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "ntlib.h"
 
+/* MinGW64 defines _TIMEZONE_DEFINED and defines 'struct timespec' in
+   its system headers.  */
+#ifndef _TIMEZONE_DEFINED
 struct timezone
 {
   int           tz_minuteswest; /* minutes west of Greenwich */
   int           tz_dsttime;     /* type of dst correction */
 };
+#endif
 
 #define MAXPATHLEN _MAX_PATH
 
 /* Emulate sleep...we could have done this with a define, but that
    would necessitate including windows.h in the files that used it.
    This is much easier.  */
-void
-sleep (unsigned long seconds)
+unsigned
+sleep (unsigned seconds)
 {
   Sleep (seconds * 1000);
+  return 0;
 }
 
 /* Get the current working directory.  */
@@ -134,6 +139,12 @@ getuid (void)
 }
 
 unsigned
+geteuid (void)
+{
+  return getuid ();
+}
+
+unsigned
 getgid (void)
 {
   return 0;
@@ -412,3 +423,71 @@ lstat (const char * path, struct stat * buf)
   return stat (path, buf);
 }
 
+/* Implementation of mkostemp for MS-Windows, to avoid race conditions
+   when using mktemp.  Copied from w32.c.
+
+   This is used only in update-game-score.c.  It is overkill for that
+   use case, since update-game-score renames the temporary file into
+   the game score file, which isn't atomic on MS-Windows anyway, when
+   the game score already existed before running the program, which it
+   almost always does.  But using a simpler implementation just to
+   make a point is uneconomical...  */
+
+int
+mkostemp (char * template, int flags)
+{
+  char * p;
+  int i, fd = -1;
+  unsigned uid = GetCurrentThreadId ();
+  int save_errno = errno;
+  static char first_char[] = "abcdefghijklmnopqrstuvwyz0123456789!%-_@#";
+
+  errno = EINVAL;
+  if (template == NULL)
+    return -1;
+
+  p = template + strlen (template);
+  i = 5;
+  /* replace up to the last 5 X's with uid in decimal */
+  while (--p >= template && p[0] == 'X' && --i >= 0)
+    {
+      p[0] = '0' + uid % 10;
+      uid /= 10;
+    }
+
+  if (i < 0 && p[0] == 'X')
+    {
+      i = 0;
+      do
+        {
+          p[0] = first_char[i];
+          if ((fd = open (template,
+                          flags | _O_CREAT | _O_EXCL | _O_RDWR,
+                          S_IRUSR | S_IWUSR)) >= 0
+              || errno != EEXIST)
+            {
+              if (fd >= 0)
+                errno = save_errno;
+              return fd;
+            }
+        }
+      while (++i < sizeof (first_char));
+    }
+
+  /* Template is badly formed or else we can't generate a unique name.  */
+  return -1;
+}
+
+/* On Windows, you cannot rename into an existing file.  */
+int
+sys_rename (const char *from, const char *to)
+{
+  int retval = rename (from, to);
+
+  if (retval < 0 && errno == EEXIST)
+    {
+      if (unlink (to) == 0)
+        retval = rename (from, to);
+    }
+  return retval;
+}
diff --git a/lib-src/ntlib.h b/lib-src/ntlib.h
index 1b2f57f35e5..dbb0195a30b 100644
--- a/lib-src/ntlib.h
+++ b/lib-src/ntlib.h
@@ -1,5 +1,5 @@
 /* Utility and Unix shadow routines for GNU Emacs support programs on NT.
-   Copyright (C) 1994, 2002-2013 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2002-2014 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -16,31 +16,33 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-
 #include <pwd.h>
 #include <malloc.h>
 
 /* Include these headers now so we don't have to worry about include
    order dependencies in common source files.  */
 #include <direct.h>
+#include <fcntl.h>
 #include <io.h>
 #include <stdio.h>
 
 #ifdef sleep
 #undef sleep
 #endif
-void sleep (unsigned long seconds);
+unsigned sleep (unsigned seconds);
 char *getwd (char *dir);
 int getppid (void);
 char * getlogin (void);
 char * cuserid (char * s);
 unsigned getuid (void);
+unsigned geteuid (void);
 unsigned getegid (void);
 unsigned getgid (void);
 int setuid (unsigned uid);
 int setregid (unsigned rgid, unsigned gid);
 char * getpass (const char * prompt);
 int fchown (int fd, unsigned uid, unsigned gid);
+int mkostemp (char * template, int flags);
 
 /* redirect or undo interceptions created by config.h */
 #undef access
@@ -61,15 +63,12 @@ int fchown (int fd, unsigned uid, unsigned gid);
 #undef fopen
 #undef mkdir
 #define mkdir   _mkdir
-#undef mktemp
-#define mktemp  _mktemp
 #undef open
 #define open    _open
 #undef pipe
 #define pipe    _pipe
 #undef read
 #define read    _read
-#undef rename
 #undef rmdir
 #define rmdir   _rmdir
 #undef unlink
diff --git a/lib-src/pop.c b/lib-src/pop.c
index ba384db3d19..ffe16c5f911 100644
--- a/lib-src/pop.c
+++ b/lib-src/pop.c
@@ -1,6 +1,6 @@
 /* pop.c: client routines for talking to a POP3-protocol post-office server
 
-Copyright (C) 1991, 1993, 1996-1997, 1999, 2001-2013 Free Software
+Copyright (C) 1991, 1993, 1996-1997, 1999, 2001-2014 Free Software
 Foundation, Inc.
 
 Author: Jonathan Kamens <jik@security.ov.com>
@@ -124,7 +124,7 @@ static char *find_crlf (char *, int);
 #endif
 
 char pop_error[ERROR_MAX];
-int pop_debug = 0;
+bool pop_debug = false;
 
 /*
  * Function: pop_open (char *host, char *username, char *password,
@@ -269,8 +269,8 @@ pop_open (char *host, char *username, char *password, int flags)
   server->data = 0;
   server->buffer_index = 0;
   server->buffer_size = GETLINE_MIN;
-  server->in_multi = 0;
-  server->trash_started = 0;
+  server->in_multi = false;
+  server->trash_started = false;
 
   if (getok (server))
     return (0);
@@ -686,7 +686,7 @@ pop_multi_first (popserver server, const char *command, char **response)
   else if (0 == strncmp (*response, "+OK", 3))
     {
       for (*response += 3; **response == ' '; (*response)++) /* empty */;
-      server->in_multi = 1;
+      server->in_multi = true;
       return (0);
     }
   else
@@ -728,7 +728,7 @@ pop_multi_next (popserver server, char **line)
       if (! fromserver[1])
         {
           *line = 0;
-          server->in_multi = 0;
+          server->in_multi = false;
           return (0);
         }
       else
@@ -1075,28 +1075,22 @@ socket_connection (char *host, int flags)
         }
     } while (ret != 0);
 
-  if (ret == 0)
-    {
-      it = res;
-      while (it)
-        {
-          if (it->ai_addrlen == sizeof (addr))
-            {
-              struct sockaddr_in *in_a = (struct sockaddr_in *) it->ai_addr;
-              addr.sin_addr = in_a->sin_addr;
-              if (! connect (sock, (struct sockaddr *) &addr, sizeof (addr)))
-                break;
-            }
-          it = it->ai_next;
-        }
-      connect_ok = it != NULL;
-      if (connect_ok)
-        {
-          realhost = alloca (strlen (it->ai_canonname) + 1);
-          strcpy (realhost, it->ai_canonname);
-        }
-      freeaddrinfo (res);
+  for (it = res; it; it = it->ai_next)
+    if (it->ai_addrlen == sizeof addr)
+      {
+        struct sockaddr_in *in_a = (struct sockaddr_in *) it->ai_addr;
+        addr.sin_addr = in_a->sin_addr;
+        if (! connect (sock, (struct sockaddr *) &addr, sizeof addr))
+          break;
+      }
+  connect_ok = it != NULL;
+  if (connect_ok)
+    {
+      realhost = alloca (strlen (it->ai_canonname) + 1);
+      strcpy (realhost, it->ai_canonname);
     }
+  freeaddrinfo (res);
+
 #else /* !HAVE_GETADDRINFO */
   do
     {
@@ -1198,7 +1192,7 @@ socket_connection (char *host, int flags)
             }
 #elif defined HAVE_KRB5_ERROR_E_TEXT
           if (err_ret && err_ret->e_text && **err_ret->e_text)
-            snprintf (pop_error + pop_error_len, ERRMAX - pop_error_len,
+            snprintf (pop_error + pop_error_len, ERROR_MAX - pop_error_len,
                       " [server says '%s']", *err_ret->e_text);
 #endif
           if (err_ret)
@@ -1552,7 +1546,7 @@ pop_trash (popserver server)
       /* avoid recursion; sendline can call pop_trash */
       if (server->trash_started)
         return;
-      server->trash_started = 1;
+      server->trash_started = true;
 
       sendline (server, "RSET");
       sendline (server, "QUIT");
diff --git a/lib-src/pop.h b/lib-src/pop.h
index dbc7c8dbe64..51eaa8158af 100644
--- a/lib-src/pop.h
+++ b/lib-src/pop.h
@@ -1,5 +1,5 @@
 /* pop.h: Header file for the "pop.c" client POP3 protocol.
-   Copyright (C) 1991, 1993, 2001-2013 Free Software Foundation, Inc.
+   Copyright (C) 1991, 1993, 2001-2014 Free Software Foundation, Inc.
 
 Author:  Jonathan Kamens <jik@security.ov.com>
 
@@ -27,15 +27,15 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
                                 /* size when it needs to grow */
 
 extern char pop_error[];
-extern int pop_debug;
+extern bool pop_debug;
 
 struct _popserver
 {
   int file, data;
   char *buffer;
   int buffer_size, buffer_index;
-  int in_multi;
-  int trash_started;
+  bool_bf in_multi : 1;
+  bool_bf trash_started : 1;
 };
 
 typedef struct _popserver *popserver;
@@ -73,4 +73,3 @@ extern int pop_last (popserver server);
 extern int pop_reset (popserver server);
 extern int pop_quit (popserver server);
 extern void pop_close (popserver);
-
diff --git a/lib-src/profile.c b/lib-src/profile.c
index ab17b52ca28..e159a92e86d 100644
--- a/lib-src/profile.c
+++ b/lib-src/profile.c
@@ -1,5 +1,5 @@
 /* profile.c --- generate periodic events for profiling of Emacs Lisp code.
-   Copyright (C) 1992, 1994, 1999, 2001-2013 Free Software Foundation,
+   Copyright (C) 1992, 1994, 1999, 2001-2014 Free Software Foundation,
    Inc.
 
 Author: Boaz Ben-Zvi <boaz@lcs.mit.edu>
@@ -29,9 +29,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
  **  abstraction : a stopwatch
  **  operations: reset_watch, get_time
  */
-#include <config.h>
 
-#define SYSTIME_INLINE EXTERN_INLINE
+#define INLINE EXTERN_INLINE
+#include <config.h>
 
 #include <inttypes.h>
 #include <stdio.h>
@@ -39,17 +39,17 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <intprops.h>
 #include <systime.h>
 
-static EMACS_TIME TV1;
+static struct timespec TV1;
 static int watch_not_started = 1; /* flag */
 static char time_string[INT_STRLEN_BOUND (uintmax_t) + sizeof "."
-                        + LOG10_EMACS_TIME_RESOLUTION];
+                        + LOG10_TIMESPEC_RESOLUTION];
 
 /* Reset the stopwatch to zero.  */
 
 static void
 reset_watch (void)
 {
-  TV1 = current_emacs_time ();
+  TV1 = current_timespec ();
   watch_not_started = 0;
 }
 
@@ -60,12 +60,12 @@ reset_watch (void)
 static char *
 get_time (void)
 {
-  EMACS_TIME TV2 = sub_emacs_time (current_emacs_time (), TV1);
-  uintmax_t s = EMACS_SECS (TV2);
-  int ns = EMACS_NSECS (TV2);
+  struct timespec TV2 = timespec_sub (current_timespec (), TV1);
+  uintmax_t s = TV2.tv_sec;
+  int ns = TV2.tv_nsec;
   if (watch_not_started)
     exit (EXIT_FAILURE);  /* call reset_watch first ! */
-  sprintf (time_string, "%"PRIuMAX".%0*d", s, LOG10_EMACS_TIME_RESOLUTION, ns);
+  sprintf (time_string, "%"PRIuMAX".%0*d", s, LOG10_TIMESPEC_RESOLUTION, ns);
   return time_string;
 }
 
diff --git a/lib-src/rcs2log b/lib-src/rcs2log
index 4f2bb3308fc..a0a75e390fb 100755
--- a/lib-src/rcs2log
+++ b/lib-src/rcs2log
@@ -2,7 +2,7 @@
 
 # RCS to ChangeLog generator
 
-# Copyright (C) 1992-1998, 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 1992-1998, 2001-2014 Free Software Foundation, Inc.
 
 # Author: Paul Eggert <eggert@twinsun.com>
 
@@ -20,7 +20,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-Copyright='Copyright (C) 2013 Free Software Foundation, Inc.
+Copyright='Copyright (C) 2014 Free Software Foundation, Inc.
 This program comes with NO WARRANTY, to the extent permitted by law.
 You may redistribute copies of this program
 under the terms of the GNU General Public License.
@@ -774,4 +774,3 @@ exec rm -fr $logdir
 # Local Variables:
 # tab-width:4
 # End:
-
diff --git a/lib-src/test-distrib.c b/lib-src/test-distrib.c
index 42aef07870f..88b95db9060 100644
--- a/lib-src/test-distrib.c
+++ b/lib-src/test-distrib.c
@@ -1,6 +1,6 @@
 /* test-distrib.c --- testing distribution of nonprinting chars
 
-Copyright (C) 1987, 1993-1995, 1999, 2001-2013 Free Software Foundation,
+Copyright (C) 1987, 1993-1995, 1999, 2001-2014 Free Software Foundation,
 Inc.
 
 This file is part of GNU Emacs.
diff --git a/lib-src/update-game-score.c b/lib-src/update-game-score.c
index 29c81a8936c..ad591cca87a 100644
--- a/lib-src/update-game-score.c
+++ b/lib-src/update-game-score.c
@@ -1,6 +1,6 @@
 /* update-game-score.c --- Update a score file
 
-Copyright (C) 2002-2013 Free Software Foundation, Inc.
+Copyright (C) 2002-2014 Free Software Foundation, Inc.
 
 Author: Colin Walters <walters@debian.org>
 
@@ -35,7 +35,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <unistd.h>
 #include <errno.h>
+#include <inttypes.h>
 #include <limits.h>
+#include <stdbool.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -46,15 +48,17 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <sys/stat.h>
 #include <getopt.h>
 
-#define MAX_ATTEMPTS 5
-#define MAX_SCORES 200
-#define MAX_DATA_LEN 1024
+#ifdef WINDOWSNT
+#include "ntlib.h"
+#endif
 
-#ifndef HAVE_DIFFTIME
-/* OK on POSIX (time_t is arithmetic type) modulo overflow in subtraction.  */
-#define difftime(t1, t0) (double)((t1) - (t0))
+#ifndef min
+# define min(a,b) ((a) < (b) ? (a) : (b))
 #endif
 
+#define MAX_ATTEMPTS 5
+#define MAX_DATA_LEN 1024
+
 static _Noreturn void
 usage (int err)
 {
@@ -72,18 +76,21 @@ static int unlock_file (const char *filename, void *state);
 
 struct score_entry
 {
-  long score;
+  intmax_t score;
   char *username;
   char *data;
 };
 
+#define MAX_SCORES min (PTRDIFF_MAX, SIZE_MAX / sizeof (struct score_entry))
+
 static int read_scores (const char *filename, struct score_entry **scores,
-                        int *count);
-static int push_score (struct score_entry **scores, int *count,
-                       int newscore, char *username, char *newdata);
-static void sort_scores (struct score_entry *scores, int count, int reverse);
+                        ptrdiff_t *count, ptrdiff_t *alloc);
+static int push_score (struct score_entry **scores, ptrdiff_t *count,
+                       ptrdiff_t *size, struct score_entry const *newscore);
+static void sort_scores (struct score_entry *scores, ptrdiff_t count,
+                         bool reverse);
 static int write_scores (const char *filename,
-                         const struct score_entry *scores, int count);
+                         const struct score_entry *scores, ptrdiff_t count);
 
 static _Noreturn void
 lose (const char *msg)
@@ -103,19 +110,19 @@ static char *
 get_user_id (void)
 {
   struct passwd *buf = getpwuid (getuid ());
-  if (!buf)
+  if (!buf || strchr (buf->pw_name, ' ') || strchr (buf->pw_name, '\n'))
     {
-      long uid = getuid ();
-      char *name = malloc (sizeof uid * CHAR_BIT / 3 + 1);
+      intmax_t uid = getuid ();
+      char *name = malloc (sizeof uid * CHAR_BIT / 3 + 4);
       if (name)
-        sprintf (name, "%ld", uid);
+        sprintf (name, "%"PRIdMAX, uid);
       return name;
     }
   return buf->pw_name;
 }
 
 static const char *
-get_prefix (int running_suid, const char *user_prefix)
+get_prefix (bool running_suid, const char *user_prefix)
 {
   if (!running_suid && user_prefix == NULL)
     lose ("Not using a shared game directory, and no prefix given.");
@@ -133,14 +140,18 @@ get_prefix (int running_suid, const char *user_prefix)
 int
 main (int argc, char **argv)
 {
-  int c, running_suid;
+  int c;
+  bool running_suid;
   void *lockstate;
-  char *user_id, *scorefile;
+  char *scorefile;
+  char *nl;
   const char *prefix, *user_prefix = NULL;
   struct stat buf;
   struct score_entry *scores;
-  int newscore, scorecount, reverse = 0, max = MAX_SCORES;
-  char *newdata;
+  struct score_entry newscore;
+  bool reverse = false;
+  ptrdiff_t scorecount, scorealloc;
+  ptrdiff_t max_scores = MAX_SCORES;
 
   srand (time (0));
 
@@ -157,15 +168,18 @@ main (int argc, char **argv)
         reverse = 1;
         break;
       case 'm':
-        max = atoi (optarg);
-        if (max > MAX_SCORES)
-          max = MAX_SCORES;
+        {
+          intmax_t m = strtoimax (optarg, 0, 10);
+          if (m < 0)
+            usage (EXIT_FAILURE);
+          max_scores = min (m, MAX_SCORES);
+        }
         break;
       default:
         usage (EXIT_FAILURE);
       }
 
-  if (optind+3 != argc)
+  if (argc - optind != 3)
     usage (EXIT_FAILURE);
 
   running_suid = (getuid () != geteuid ());
@@ -179,13 +193,18 @@ main (int argc, char **argv)
   strcpy (scorefile, prefix);
   strcat (scorefile, "/");
   strcat (scorefile, argv[optind]);
-  newscore = atoi (argv[optind+1]);
-  newdata = argv[optind+2];
-  if (strlen (newdata) > MAX_DATA_LEN)
-    newdata[MAX_DATA_LEN] = '\0';
 
-  user_id = get_user_id ();
-  if (user_id == NULL)
+  newscore.score = strtoimax (argv[optind + 1], 0, 10);
+
+  newscore.data = argv[optind + 2];
+  if (strlen (newscore.data) > MAX_DATA_LEN)
+    newscore.data[MAX_DATA_LEN] = '\0';
+  nl = strchr (newscore.data, '\n');
+  if (nl)
+    *nl = '\0';
+
+  newscore.username = get_user_id ();
+  if (! newscore.username)
     lose_syserr ("Couldn't determine user id");
 
   if (stat (scorefile, &buf) < 0)
@@ -194,29 +213,34 @@ main (int argc, char **argv)
   if (lock_file (scorefile, &lockstate) < 0)
     lose_syserr ("Failed to lock scores file");
 
-  if (read_scores (scorefile, &scores, &scorecount) < 0)
+  if (read_scores (scorefile, &scores, &scorecount, &scorealloc) < 0)
     {
       unlock_file (scorefile, lockstate);
       lose_syserr ("Failed to read scores file");
     }
-  push_score (&scores, &scorecount, newscore, user_id, newdata);
+  if (push_score (&scores, &scorecount, &scorealloc, &newscore) < 0)
+    {
+      unlock_file (scorefile, lockstate);
+      lose_syserr ("Failed to add score");
+    }
   sort_scores (scores, scorecount, reverse);
   /* Limit the number of scores.  If we're using reverse sorting, then
      also increment the beginning of the array, to skip over the
      *smallest* scores.  Otherwise, just decrementing the number of
      scores suffices, since the smallest is at the end. */
-  if (scorecount > MAX_SCORES)
+  if (scorecount > max_scores)
     {
       if (reverse)
-        scores += (scorecount - MAX_SCORES);
-      scorecount = MAX_SCORES;
+        scores += scorecount - max_scores;
+      scorecount = max_scores;
     }
   if (write_scores (scorefile, scores, scorecount) < 0)
     {
       unlock_file (scorefile, lockstate);
       lose_syserr ("Failed to write scores file");
     }
-  unlock_file (scorefile, lockstate);
+  if (unlock_file (scorefile, lockstate) < 0)
+    lose_syserr ("Failed to unlock scores file");
   exit (EXIT_SUCCESS);
 }
 
@@ -224,13 +248,18 @@ static int
 read_score (FILE *f, struct score_entry *score)
 {
   int c;
+  if ((c = getc (f)) != EOF)
+    ungetc (c, f);
   if (feof (f))
     return 1;
-  while ((c = getc (f)) != EOF
-         && isdigit (c))
+  for (score->score = 0; (c = getc (f)) != EOF && isdigit (c); )
     {
+      if (INTMAX_MAX / 10 < score->score)
+        return -1;
       score->score *= 10;
-      score->score += (c-48);
+      if (INTMAX_MAX - (c - '0') < score->score)
+        return -1;
+      score->score += c - '0';
     }
   while ((c = getc (f)) != EOF
          && isspace (c))
@@ -241,6 +270,7 @@ read_score (FILE *f, struct score_entry *score)
 #ifdef HAVE_GETDELIM
   {
     size_t count = 0;
+    score->username = 0;
     if (getdelim (&score->username, &count, ' ', f) < 1
         || score->username == NULL)
       return -1;
@@ -249,18 +279,30 @@ read_score (FILE *f, struct score_entry *score)
   }
 #else
   {
-    int unameread = 0;
-    int unamelen = 30;
+    ptrdiff_t unameread = 0;
+    ptrdiff_t unamelen = 30;
     char *username = malloc (unamelen);
     if (!username)
       return -1;
 
-    while ((c = getc (f)) != EOF
-           && !isspace (c))
+    while ((c = getc (f)) != EOF && c != ' ')
       {
-        if (unameread >= unamelen-1)
-          if (!(username = realloc (username, unamelen *= 2)))
-            return -1;
+        if (unameread >= unamelen - 1)
+          {
+            ptrdiff_t unamelen_max = min (PTRDIFF_MAX, SIZE_MAX);
+            if (unamelen <= unamelen_max / 2)
+              unamelen *= 2;
+            else if (unamelen < unamelen_max)
+              unamelen = unamelen_max;
+            else
+              {
+                errno = ENOMEM;
+                return -1;
+              }
+            username = realloc (username, unamelen);
+            if (!username)
+              return -1;
+          }
         username[unameread] = c;
         unameread++;
       }
@@ -281,8 +323,8 @@ read_score (FILE *f, struct score_entry *score)
   }
 #else
   {
-    int cur = 0;
-    int len = 16;
+    ptrdiff_t cur = 0;
+    ptrdiff_t len = 16;
     char *buf = malloc (len);
     if (!buf)
       return -1;
@@ -291,6 +333,11 @@ read_score (FILE *f, struct score_entry *score)
       {
         if (cur >= len-1)
           {
+            if (min (PTRDIFF_MAX, SIZE_MAX) / 2 < len)
+              {
+                errno = ENOMEM;
+                return -1;
+              }
             if (!(buf = realloc (buf, len *= 2)))
               return -1;
           }
@@ -305,36 +352,29 @@ read_score (FILE *f, struct score_entry *score)
 }
 
 static int
-read_scores (const char *filename, struct score_entry **scores, int *count)
+read_scores (const char *filename, struct score_entry **scores,
+             ptrdiff_t *count, ptrdiff_t *alloc)
 {
-  int readval, scorecount, cursize;
-  struct score_entry *ret;
+  int readval = -1;
+  ptrdiff_t scorecount = 0;
+  ptrdiff_t cursize = 0;
+  struct score_entry *ret = 0;
+  struct score_entry entry;
   FILE *f = fopen (filename, "r");
+  int retval = -1;
   if (!f)
     return -1;
-  scorecount = 0;
-  cursize = 16;
-  ret = (struct score_entry *) malloc (sizeof (struct score_entry) * cursize);
-  if (!ret)
-    return -1;
-  while ((readval = read_score (f, &ret[scorecount])) == 0)
+  while ((readval = read_score (f, &entry)) == 0)
+    if (push_score (&ret, &scorecount, &cursize, &entry) < 0)
+      return -1;
+  if (readval > 0 && fclose (f) == 0)
     {
-      /* We encountered an error.  */
-      if (readval < 0)
-        return -1;
-      scorecount++;
-      if (scorecount >= cursize)
-        {
-          cursize *= 2;
-          ret = (struct score_entry *)
-            realloc (ret, (sizeof (struct score_entry) * cursize));
-          if (!ret)
-            return -1;
-        }
+      *count = scorecount;
+      *alloc = cursize;
+      *scores = ret;
+      retval = 0;
     }
-  *count = scorecount;
-  *scores = ret;
-  return 0;
+  return retval;
 }
 
 static int
@@ -348,60 +388,81 @@ score_compare (const void *a, const void *b)
 static int
 score_compare_reverse (const void *a, const void *b)
 {
-  const struct score_entry *sa = (const struct score_entry *) a;
-  const struct score_entry *sb = (const struct score_entry *) b;
-  return (sa->score > sb->score) - (sa->score < sb->score);
+  return score_compare (b, a);
 }
 
 int
-push_score (struct score_entry **scores, int *count, int newscore, char *username, char *newdata)
+push_score (struct score_entry **scores, ptrdiff_t *count, ptrdiff_t *size,
+            struct score_entry const *newscore)
 {
- struct score_entry *newscores
-   = (struct score_entry *) realloc (*scores,
-                                     sizeof (struct score_entry) * ((*count) + 1));
-  if (!newscores)
-    return -1;
-  newscores[*count].score = newscore;
-  newscores[*count].username = username;
-  newscores[*count].data = newdata;
+  struct score_entry *newscores = *scores;
+  if (*count == *size)
+    {
+      ptrdiff_t newsize = *size;
+      if (newsize <= 0)
+        newsize = 1;
+      else if (newsize <= MAX_SCORES / 2)
+        newsize *= 2;
+      else if (newsize < MAX_SCORES)
+        newsize = MAX_SCORES;
+      else
+        {
+          errno = ENOMEM;
+          return -1;
+        }
+      newscores = realloc (newscores, sizeof *newscores * newsize);
+      if (!newscores)
+        return -1;
+      *scores = newscores;
+      *size = newsize;
+    }
+  newscores[*count] = *newscore;
   (*count) += 1;
-  *scores = newscores;
   return 0;
 }
 
 static void
-sort_scores (struct score_entry *scores, int count, int reverse)
+sort_scores (struct score_entry *scores, ptrdiff_t count, bool reverse)
 {
-  qsort (scores, count, sizeof (struct score_entry),
-        reverse ? score_compare_reverse : score_compare);
+  qsort (scores, count, sizeof *scores,
+         reverse ? score_compare_reverse : score_compare);
 }
 
 static int
-write_scores (const char *filename, const struct score_entry *scores, int count)
+write_scores (const char *filename, const struct score_entry *scores,
+              ptrdiff_t count)
 {
+  int fd;
   FILE *f;
-  int i;
+  ptrdiff_t i;
   char *tempfile = malloc (strlen (filename) + strlen (".tempXXXXXX") + 1);
   if (!tempfile)
     return -1;
   strcpy (tempfile, filename);
   strcat (tempfile, ".tempXXXXXX");
-#ifdef HAVE_MKSTEMP
-  if (mkstemp (tempfile) < 0
-#else
-  if (mktemp (tempfile) != tempfile
+  fd = mkostemp (tempfile, 0);
+  if (fd < 0)
+    return -1;
+#ifndef WINDOWSNT
+  if (fchmod (fd, 0644) != 0)
+    return -1;
 #endif
-      || !(f = fopen (tempfile, "w")))
+  f = fdopen (fd, "w");
+  if (! f)
     return -1;
   for (i = 0; i < count; i++)
-    if (fprintf (f, "%ld %s %s\n", scores[i].score, scores[i].username,
-                scores[i].data) < 0)
+    if (fprintf (f, "%"PRIdMAX" %s %s\n",
+                 scores[i].score, scores[i].username, scores[i].data)
+        < 0)
       return -1;
-  fclose (f);
-  if (rename (tempfile, filename) < 0)
+  if (fclose (f) != 0)
     return -1;
+  if (rename (tempfile, filename) != 0)
+    return -1;
+#ifdef WINDOWSNT
   if (chmod (filename, 0644) < 0)
     return -1;
+#endif
   return 0;
 }
 
@@ -420,9 +481,9 @@ lock_file (const char *filename, void **state)
   *state = lockpath;
  trylock:
   attempts++;
-  /* If the lock is over an hour old, delete it. */
+  /* If the lock is over an hour old, delete it.  */
   if (stat (lockpath, &buf) == 0
-      && (difftime (buf.st_ctime, time (NULL) > 60*60)))
+      && 60 * 60 < time (0) - buf.st_ctime)
     unlink (lockpath);
   fd = open (lockpath, O_CREAT | O_EXCL, 0600);
   if (fd < 0)
@@ -450,12 +511,12 @@ static int
 unlock_file (const char *filename, void *state)
 {
   char *lockpath = (char *) state;
-  int ret = unlink (lockpath);
   int saved_errno = errno;
+  int ret = unlink (lockpath);
+  int unlink_errno = errno;
   free (lockpath);
-  errno = saved_errno;
+  errno = ret < 0 ? unlink_errno : saved_errno;
   return ret;
 }
 
-
 /* update-game-score.c ends here */
diff --git a/lib-src/update-game-score.exe.manifest b/lib-src/update-game-score.exe.manifest
new file mode 100644
index 00000000000..1db836bec6b
--- /dev/null
+++ b/lib-src/update-game-score.exe.manifest
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>

+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">

+  <v3:trustInfo xmlns:v3="urn:schemas-microsoft-com:asm.v3">

+    <v3:security>

+      <v3:requestedPrivileges>

+        <v3:requestedExecutionLevel level="asInvoker" />

+      </v3:requestedPrivileges>

+    </v3:security>

+  </v3:trustInfo>

+</assembly>