15 files changed, 1030 insertions, 1324 deletions

diff --git a/lib-src/.gitignore b/lib-src/.gitignore
index e1693b13c5e..c931a15d7b6 100644
--- a/lib-src/.gitignore
+++ b/lib-src/.gitignore
@@ -1,6 +1,5 @@
 DOC
 ctags.c
-getopt.h
 stamp_BLD
 echolisp.tmp
 
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 3f4e4b1b9ff..ec123e85036 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,13 +1,298 @@
+2011-06-10  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * movemail.c: Fix race condition and related bugs (Bug#8836).
+        (main) [!MAIL_USE_SYSTEM_LOCK]: Prefer mkstemp to mktemp, as this
+        fixes some race conditions.  Report mkstemp/mktemp errno rather
+        than a possibly-garbage errno.  Reinitialize the template each
+        time through the loop, as earlier mkstemp/mktemp calls could have
+        trashed it.  Pass 0600 (not 0666) to mktemp, for consistency
+        with mkstemp; the permissions don't matter anyway.
+
+2011-06-01  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * emacsclient.c (socket_status): Use constant pointer.
+
+2011-05-28  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Use 'inline', not 'INLINE'.
+        * etags.c (hash): Now inline unconditionally.
+        * make-docfile.c (put_char): inline, not INLINE.
+
+2011-05-25  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (.c.o): Remove (every .o file has an explicit rule).
+        (insrcdir): New.
+        (stamp-rcs2log, stamp-rcs-checkin, stamp-grep-changelog, stamp-vcdiff):
+        Use $insrcdir to suppress unaesthetic ignored errors.
+        (clean): Simplify list of things to delete.
+        (all, clean): Use $EXE_FILES.
+
+        * Makefile.in (movemail${EXEEXT}): Build in one step, not via .o file.
+
+        * Makefile.in (REGEXPOBJ, REGEXPDEPS): Remove.  Replace by expansion.
+        (etags${EXEEXT}): Just depend on regex.o, not regex.h as well.
+
+2011-05-24  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (update-game-score${EXEEXT}): Use a single rule.
+
+2011-05-19  Glenn Morris  <rgm@gnu.org>
+
+        * makefile.w32-in (echolisp): Remove rule that is no longer needed.
+        (clean): No more echolisp.tmp.
+
+2011-05-18  Glenn Morris  <rgm@gnu.org>
+
+        * fakemail.c: Remove file.
+        * makefile.w32-in ($(BLD)/fakemail.exe, fakemail)
+        ($(BLD)/fakemail.$(O)): Remove.
+        * Makefile.in (UTILITIES): Remove fakemail${EXEEXT}.
+        (fakemail${EXEEXT}): Remove rule.
+
+2011-04-24  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * makefile.w32-in (obj): Add gnutls.o.
+
+2011-04-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Static checks with GCC 4.6.0 and non-default toolkits.
+
+        * movemail.c (mail_spool_name): Protoize.
+        (main): Remove unused var.  Mark var as initialized.
+        Move locals to avoid shadowing, and use time_t for times.
+
+        * fakemail.c (xmalloc, xreallc): Use standard C prototypes
+        with void *.  This avoids warnings about pointer casts.
+
+        * emacsclient.c (main): Don't use uninitialized var.
+        (IS_ANY_SEP): Remove; unused.
+        (get_current_dir_name): Add an extern decl.
+
+2011-04-06  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Fix more problems found by GCC 4.6.0's static checks.
+
+        * emacsclient.c (message): Mark it as a printf-like function.
+
+        * make-docfile.c (IF_LINT): New macro, copied from emacsclient.c.
+        (write_c_args): Use it to suppress GCC warning.
+
+2011-03-30  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Fix a problem found by GCC 4.6.0's static checks.
+        * etags.c (just_read_file): Remove dummy variable and simplify.
+
+2011-03-27  Glenn Morris  <rgm@gnu.org>
+
+        * emacsclient.c: Replace SIGTYPE with void.
+
+2011-03-23  Juanma Barranquero  <lekktu@gmail.com>
+
+        * ntlib.c: Include <ctype.h>.
+
+2011-03-23  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in ($(DESTDIR)${archlibdir}):
+        Use `install-sh -d' rather than mkinstalldirs.
+
+2011-03-23  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * ebrowse.c: Use size_t, not int, for sizes.
+        This avoids a warning with gcc -Wstrict-overflow, and works
+        better for very large objects.
+        (inbuffer_size): Now size_t.  All uses changed.
+        (xmalloc, xrealloc, operator_name, process_file): Use size_t for
+        sizes.  Don't bother testing whether a size_t value can be negative.
+
+        * etags.c (Ada_funcs): Redo slightly to avoid overflow warning.
+
+        etags: In Prolog functions, don't assume int fits in size_t.
+        This avoids a warning with gcc -Wstrict-overflow.
+        * etags.c (Prolog_functions, prolog_pr, prolog_atom): Use size_t,
+        not int, to store sizes.
+        (prolog_atom): Return 0, not -1, on error.  All callers changed.
+
+        update-game-score: fix bug with -r
+        * update-game-score.c (main): Don't set 'scores' to garbage when
+        -r is specified and scorecount != MAX_SCORES (Bug#8310).  This bug
+        was introduced in the 2002-04-10 change, and was found with gcc
+        -Wstrict-overflow (GCC 4.5.2, x86-64).
+
+        fakemail: Remove dependency on ignore-value.
+        This undoes some of the recent fakemail-related changes.
+        It is made possible due to recent changes to gnulib's stdio module.
+        * Makefile.in (fakemail${EXEEXT}): Do not depend on ignore-value.h.
+        * fakemail.c: Do not include ignore-value.h.
+        (put_line): Do not use ignore_value.
+
+2011-03-07  Chong Yidong  <cyd@stupidchicken.com>
+
+        * Version 23.3 released.
+
+2011-03-03  Drake Wilson  <drake@begriffli.ch>  (tiny change)
+
+        * emacsclient.c (longopts): Add quiet.
+        (decode_options): Handle q/quiet.
+        (print_help_and_exit): Add q/quiet.
+        (main): Suppress some messages if quiet option is used.
+
+2011-02-26  Eli Zaretskii  <eliz@gnu.org>
+
+        * Makefile.in (fakemail${EXEEXT}): Depend on lib/ignore-value.h.
+
+        * emacsclient.c (xstrdup) [WINDOWSNT]: Function added back.
+        (w32_getenv): Use xstrdup to return all values in malloc'ed
+        storage.
+
+2011-02-26  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * ebrowse.c (parse_qualified_param_ident_or_type): Make it clear
+        to reader (and to the compiler) that the loop always executes at
+        least once.  This prevents a warning with recent GCC.
+        (BROWSE_STRUCT): Remove unused macro.
+
+        * fakemail.c: Include <ignore-value.h>.
+        (put_line): Explicitly ignore fwrite return value, for benefit of
+        recent glibc + gcc.
+        (close_the_streams): Diagnose output errors instead of merely
+        exiting with nonzero status.
+        (my_fclose, main): Diagnose input errors, and exit with nonzero status.
+        Formerly, input errors were silently ignored.
+
+        * ebrowse.c (putstr): Rename from PUTSTR and turn into a function.
+        All callers changed.  This is cleaner, and avoids GCC warnings about
+        passing NULL to fputs.
+        (insert_keyword): Rename parameter to avoid shadowing diagnostic.
+
+2011-02-25  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * emacsclient.c (main): Avoid dangling 'if'.
+        (xstrdup): Remove; no longer needed.
+        (get_current_dir_name, w32_getenv, get_server_config, find_tty):
+        (set_local_socket, main):
+        Use const char *, not char *, for pointers that are not assigned
+        through.
+        (IF_LINT): New macro.
+        (set_local_socket, main): Use it to suppress warnings with
+        GCC -Wuninitialized.
+
+        * emacsclient.c: Redo local variables to avoid shadowing problems.
+        (message, socket_status, start_daemon_and_retry_set_socket):
+        Rename locals.
+        (main): Move decl of "i".
+
+        * etags.c (ISUPPER): Move to inside the only #ifdef where it's used.
+        This avoids an unused-macro warning with some GCC settings.
+
+        * make-docfile.c (write_globals): Change char * to char const *
+        to avoid a GCC "assignment discards qualifiers" diagnostic
+        in some configurations.
+        (scan_c_file): Refactor local variable decls to make their scope
+        more accurate and to avoid a GCC -Wuninitialized diagnostic.
+
+2011-02-22  Eli Zaretskii  <eliz@gnu.org>
+
+        * etags.c (canonicalize_filename, ISUPPER): Fix last change.
+
+        * makefile.w32-in ($(BLD)/ebrowse.$(O), $(BLD)/pop.$(O)): Depend
+        on ../lib/min-max.h.
+
+2011-02-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+        etags: Downcase drive letters, for consistency with Emacs proper.
+        * etags.c (upcase): Remove; no longer used.
+        (canonicalize_filename): Downcase drive letters.
+
+        Assume S_ISLNK etc. work, since gnulib supports this.
+        * etags.c (S_ISREG): Remove.
+
+2011-02-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Assume S_ISLNK etc. work, since gnulib supports this.
+        * etags.c (S_ISREG): Remove.
+
+2011-02-22  Juanma Barranquero  <lekktu@gmail.com>
+
+        * makefile.w32-in (obj): Remove filemode.o.
+
+2011-02-21  Paul Eggert  <eggert@cs.ucla.edu>
+
+        New file "lib/min-max.h".
+        * ebrowse.c (min, max): Define them by including <min-max.h>
+        instead of defining it ourselves.
+        * pop.c (min): Likewise.
+        * Makefile.in (ebrowse${EXEEXT}, pop.o): Depend on min-max.h.
+
+        * movemail.c (popmail): Report fchown failure instead of ignoring it.
+        But if the file already has the right ownership, don't worry about it.
+
+        * make-docfile.c (input_buffer): Rename variables to avoid shadowing.
+        * test-distrib.c (buf): Make this local, to avoid shadowing.
+
+        * movemail.c (main, pop_retr): Rename locals to avoid shadowing.
+        (progname, sfi, sfo, ibuffer, obuffer): Remove unused vars.
+        (DONE): Remove unused macro.
+        (DIRECTORY_SEP, IS_DIRECTORY_SEP, IS_FROM_LINE):
+        Define these macros only in the contexts that need them.
+        * pop.c (index): Remove unused macro.
+        (KPOP_PORT): Define only if KERBEROS is defined.
+
+        Declare file-scope functions and variables static if not exported.
+        This is more consistent, and is nicer with gcc -Wstrict-prototypes.
+        * ebrowse.c, emacsclient.c, fakemail.c, make-docfile.c, movemail.c:
+        * profile.c, test-distrib.c, update-game-score.c:
+        Declare non-'main' functions and variables to be static.
+        * ebrowse.c: Omit redundant function prototypes.
+
+2011-02-21  Eli Zaretskii  <eliz@gnu.org>
+
+        * makefile.w32-in ($(BLD)/ctags.$(O), $(BLD)/emacsclient.$(O))
+        ($(BLD)/etags.$(O), $(BLD)/movemail.$(O), $(BLD)/ntlib.$(O)):
+        Depend on $(EMACS_ROOT)/nt/inc/sys/stat.h.
+
+2011-02-21  Ben Key  <bkey76@gmail.com>
+
+        * make-docfile.c (scan_c_file): Adapt DEFVAR_PER_BUFFER case to
+        the new BVAR macro.
+
+2011-02-20  Juanma Barranquero  <lekktu@gmail.com>
+
+        * makefile.w32-in (obj): Remove md5.o.
+
+2011-02-18  Karl Chen  <Karl.Chen@quarl.org>
+
+        * emacsclient.c (main): Loop while `recv' return EINTR.
+
+2011-02-09  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * make-docfile.c (EMACS_INTEGER): Rename from EMACS_INT.
+        This avoids collision with config.h's EMACS_INT on some
+        configurations.  All uses changed.
+
+2011-02-08  Tom Tromey  <tromey@redhat.com>
+
+        * make-docfile.c: Unconditionally include stdlib.h.
+        (generate_globals): New global.
+        (xrealloc): New function.
+        (main): Handle '-g'.  Call start_globals, write_globals.
+        (scan_file): Conditionally call put_filename.
+        (start_globals): New function.
+        (struct global): New.
+        (num_globals, globals): New globals.
+        (add_global, compare_globals, write_globals): New functions.
+        (scan_c_file): Update for "-g".
+        (scan_lisp_file): Fail if "-g".
+
 2011-02-05  Paul Eggert  <eggert@cs.ucla.edu>
 
-        * emacsclient.c: conform to C89 pointer rules
+        * emacsclient.c: Conform to C89 pointer rules.
         (file_name_absolute_p): Accept const char *, not const unsigned
         char *, to satisfy C89 rules.
 
 2011-02-02  Eli Zaretskii  <eliz@gnu.org>
 
-        * makefile.w32-in (ETAGS_CFLAGS, CTAGS_CFLAGS): Add
-        ``-DEMACS_NAME="\"GNU Emacs\""''.
+        * makefile.w32-in (ETAGS_CFLAGS, CTAGS_CFLAGS):
+        Add ``-DEMACS_NAME="\"GNU Emacs\""''.
         (obj): Remove strftime.o.
 
 2011-01-31  Eli Zaretskii  <eliz@gnu.org>
@@ -158,7 +443,7 @@
         * test-distrib.c (cool_read):
         * movemail.c (main, concat):
         * make-docfile.c (scan_file, write_c_args):
-        * emacsclient.c (get_server_config): Fix -Wconversion warning.
+        * emacsclient.c (get_server_config): Fix -Wconversion warning.
         (egetenv): Move conditional definition earlier.
         (progname): Use const.
         * sorted-doc.c (xstrdup): Use const.
@@ -212,8 +497,8 @@
 
         * movemail.c (fatal, error, concat): Use const char *.
 
-        * make-docfile.c (error, fatal, scan_c_file, scan_lisp_file): Use
-        const char *.
+        * make-docfile.c (error, fatal, scan_c_file, scan_lisp_file):
+        Use const char *.
 
         * etags.c (compressor, language, Ada_suffix, Ada_help, Asm_suffixes)
         (Asm_help, default_C_suffixes, default_C_help, Cplusplus_suffixes)
@@ -518,7 +803,7 @@
         autoconf, not cpp.
         (ALL_CFLAGS): Use them as make variables.
 
-2010-04-07  Christoph  <cschol2112@googlemail.com>  (tiny change)
+2010-04-07  Christoph Scholtes  <cschol2112@googlemail.com>
 
         * makefile.w32-in (OTHER_PLATFORM_SUPPORT): Use parenthesis
         for macros for nmake compatibility.
@@ -531,8 +816,8 @@
 
 2010-04-02  Dan Rosenberg  <dan.j.rosenberg@gmail.com>  (tiny change)
 
-        * movemail.c (main): Check return values of setuid.  Avoid
-        possibility of symlink attack when movemail is setgid mail
+        * movemail.c (main): Check return values of setuid.
+        Avoid possibility of symlink attack when movemail is setgid mail
         (CVE-2010-0825).
 
 2010-04-02  Dan Nicolaescu  <dann@ics.uci.edu>
@@ -2238,7 +2523,7 @@
         (wchar.h): Include, maybe.
         (attribute_hidden): Define if not defined.
         (__getopt_initialized): Use attribute_hidden.
-        (__libc_argc, __libc_argv): Renamed from original_argc, etc.
+        (__libc_argc, __libc_argv): Rename from original_argc, etc.
         (__getopt_nonoption_flags, nonoption_flags_max_len)
         (nonoption_flags_len): Conditional on USE_NONOPTION_FLAGS.
         (SWAP_FLAGS): New definitions.
@@ -2341,7 +2626,7 @@
 2002-08-29  Francesco Potortì  <pot@gnu.org>
 
         * etags.c (C_entries): Correct a problem with const C++ funcs.
-        (ignoreindent): Renamed from noindentypedefs.
+        (ignoreindent): Rename from noindentypedefs.
         (cjava, cplpl): They are now macros instead of local vars.
 
 2002-08-28  Francesco Potortì  <pot@gnu.org>
@@ -2357,7 +2642,7 @@
         (strcaseeq): Make it into a macro.
 
         * etags.c (make_tag): Never generate null length tag names.
-        (linebuffer_init): Renamed from initbuffer.  All callers changed.
+        (linebuffer_init): Rename from initbuffer.  All callers changed.
         (pattern): Structure renamed to `regexp', member regex renamed to
         pattern.
         (node_st): Member pat renamed to regex.
@@ -2514,8 +2799,8 @@
 
 2002-05-30  Richard M. Stallman  <rms@gnu.org>
 
-        * Makefile.in (LIBS_MAIL): Renamed from LIB_MAIL.
-        (LIBS_MOVE): Renamed from MOVE_LIBS.
+        * Makefile.in (LIBS_MAIL): Rename from LIB_MAIL.
+        (LIBS_MOVE): Rename from MOVE_LIBS.
 
 2002-05-26  Paul Eggert  <eggert@twinsun.com>
 
@@ -2796,21 +3081,21 @@
         (get_tag): Return a pointer to the tag that is found.
 
         * etags.c (LOOKING_AT): Use !intoken instead of iswhite.
-        (F_takeprec): Renamed from takeprec.  All callers changed.
-        (F_getit): Renamed from getit.  All callers changed.
-        (nocase_tail): Renamed from tail.  All callers changed.
-        (Ada_getit): Renamed from adagetit.  All callers changed.
+        (F_takeprec): Rename from takeprec.  All callers changed.
+        (F_getit): Rename from getit.  All callers changed.
+        (nocase_tail): Rename from tail.  All callers changed.
+        (Ada_getit): Rename from adagetit.  All callers changed.
         (L_getit): Simplify by using get_tag.
         (Perl_functions, Postscript_functions, erlang_attribute): Use the
         modified LOOKING_AT.
-        (notinname): Removed '[' and added ')' to the recognised chars.
+        (notinname): Remove '[' and added ')' to the recognised chars.
         (LOOKING_AT, get_tag, PHP_functions): Use notinname.
         (Ada_getit, Ada_funcs, Python_functions, Scheme_functions):
         Clarified, using strneq or notinname.
         (L_isdef, L_isquote): Removed.
         (Lisp_functions, L_getit): Clarified.
 
-        * etags.c (P_): Renamed to __P for consistency with config.h.
+        * etags.c (P_): Rename to __P for consistency with config.h.
         [HAVE_CONFIG_H]: Let config.h deal with __P.
         [__STDC__] [!HAVE_CONFIG_H]: Define PTR as in config.h.
         [!__STDC__] [!HAVE_CONFIG_H]: Do not undefine static, because
@@ -2869,7 +3154,7 @@
         (Perl_functions, Python_functions, PHP_functions)
         (Scheme_functions, Texinfo_nodes): Use it.
         (Perl_functions): Use strneq.
-        (prolog_pred): Renamed to prolog_pr.
+        (prolog_pred): Rename to prolog_pr.
         (prolog_pr): Recognise Prolog rules in addition to predicates.
         [ETAGS_REGEXPS] [!HAVE_CONFIG_H] [__CYGWIN__]: Prevent
         unmodified compile, as Cygwin's regex.h is incompatible with us.
@@ -2968,7 +3253,7 @@
 
 2001-10-13  Gerd Moellmann  <gerd@gnu.org>
 
-        * make-docfile.c (read_c_string_or_comment): Renamed from
+        * make-docfile.c (read_c_string_or_comment): Rename from
         read_c_string.  Add parameter COMMENT.  Read C-style comments.
         (scan_c_file): Handle doc strings in C comments.
 
@@ -3227,12 +3512,12 @@
 
 2001-01-25  Francesco Potortì  <pot@gnu.org>
 
-        * etags.c (struct tok): Renamed from struct token.
-        (token): Renamed from tok.
+        * etags.c (struct tok): Rename from struct token.
+        (token): Rename from tok.
         (structtype): Make it a local variable.
         [DEBUG]: Use assert.
         (xrnew): Change the synopsis.
-        (typedefs_or_cplusplus): Renamed from typedefs_and_cplusplus.
+        (typedefs_or_cplusplus): Rename from typedefs_and_cplusplus.
         (grow_linebuffer): Don't call xrnew when not needed.
         (token): Buffer renamed to line.
         (C_entries): Three calls to inibuffer moved here from main.
@@ -3261,16 +3546,16 @@
 
 2001-01-14  Francesco Potortì  <pot@gnu.org>
 
-        * etags.c (get_language_from_langname): Renamed from
+        * etags.c (get_language_from_langname): Rename from
         get_language_from_name.
-        (get_language_from_filename): Renamed from get_language_from_suffix.
+        (get_language_from_filename): Rename from get_language_from_suffix.
         Now first looks for the complete file name.
         (language): New member char **filenames.
         (Makefile_filenames): List of possible filenames for makefiles.
         (lang_names): Add a NULL member for every entry, added an entry
         for makefiles.
         (Makefile_targets): New function.
-        (Texinfo_nodes): Renamed from Texinfo_fuctions and made
+        (Texinfo_nodes): Rename from Texinfo_fuctions and made
         it conformant to the style of the rest of the code.
 
 2001-01-13  Gerd Moellmann  <gerd@gnu.org>
@@ -3409,7 +3694,7 @@
 
 2000-07-14  Gerd Moellmann  <gerd@gnu.org>
 
-        * ebrowse.c (xrealloc, xmalloc): Renamed from yrealloc and ymalloc.
+        * ebrowse.c (xrealloc, xmalloc): Rename from yrealloc and ymalloc.
 
         * etags.c (xmalloc, xrealloc): Make externally visible, for use
         by alloca.o.
@@ -3446,8 +3731,8 @@
 
 2000-06-06  Gerd Moellmann  <gerd@gnu.org>
 
-        * ebrowse.c (ymalloc): Renamed from xmalloc.
-        (yrealloc): Renamed from xrealloc.
+        * ebrowse.c (ymalloc): Rename from xmalloc.
+        (yrealloc): Rename from xrealloc.
 
 2000-05-21  Dave Love  <fx@gnu.org>
 
@@ -3670,7 +3955,7 @@
         corrects a bug.  All callers changed.
         (canonicalize_filename): New function.
         (process_file, etags_getcwd, absolute_dirname): Use it.
-        (relative_filename, absolute_filename): Removed var shadowing.
+        (relative_filename, absolute_filename): Remove var shadowing.
         (C_entries, Pascal_functions): Add fake initializations to keep
         compilers quiet.
         (TeX_functions, Prolog_functions, Erlang_functions): Cleanup.
@@ -3960,8 +4245,8 @@
 
 1998-05-01  Andrew Innes  <andrewi@harlequin.co.uk>
 
-        * movemail.c [WINDOWSNT]: Undefine DISABLE_DIRECT_ACCESS.  Force
-        all file i/o to be in binary mode.  Include ntlib.h.
+        * movemail.c [WINDOWSNT]: Undefine DISABLE_DIRECT_ACCESS.
+        Force all file i/o to be in binary mode.  Include ntlib.h.
 
 1998-04-27  Andreas Schwab  <schwab@delysid.gnu.org>
 
@@ -3993,8 +4278,8 @@
         return types.  Add forward declarations.
         * emacsclient.c: Include <stdlib.h> and <unistd.h> if available.
         Don't declare geteuid.
-        (print_help_and_exit): Change return type to void.  Forward
-        declare it.
+        (print_help_and_exit): Change return type to void.
+        Forward declare it.
         * b2m.c: Include <stdlib.h> if available.
         (main): Explicitly declare return type.
 
@@ -4006,7 +4291,7 @@
 
 1998-03-26  Richard Stallman  <rms@psilocin.gnu.org>
 
-        * pop.c (pop_getline): Renamed from getline.
+        * pop.c (pop_getline): Rename from getline.
 
 1998-03-05  Richard Stallman  <rms@psilocin.gnu.org>
 
@@ -4031,8 +4316,8 @@
         with a '>' any lines starting with "From " read from the POP server,
         but leave the code in place, wrapped in #ifdef
         MOVEMAIL_QUOTE_POP_FROM_LINES, in case we have to restore it later
-        because it turns out that something is depending on it.  Change
-        suggested by Paul Eggert <eggert@twinsun.com>.
+        because it turns out that something is depending on it.
+        Change suggested by Paul Eggert <eggert@twinsun.com>.
         Convert the character \037 (^_) at the beginning of a line into
         the character '^' followed by the character '_', because otherwise
         Emacs can't parse the resulting file as a valid BABYL file.
@@ -4049,8 +4334,8 @@
         quotes with a '>' any lines starting with "From " read from the
         POP server, but leave the code in place, wrapped in #ifdef
         MOVEMAIL_QUOTE_POP_FROM_LINES, in case we have to restore it later
-        because it turns out that something is depending on it.  Change
-        suggested by Paul Eggert <eggert@twinsun.com>.
+        because it turns out that something is depending on it.
+        Change suggested by Paul Eggert <eggert@twinsun.com>.
 
         Convert the character \037 (^_) at the beginning of a line into
         the character '^' followed by the character '_', because otherwise
@@ -4066,8 +4351,8 @@
 
 1997-10-31  Jonathan I. Kamens  <jik@kamens.brookline.ma.us>
 
-        * pop.c (fullwrite): Get rid of an extra call to write.  Problem
-        pointed out by Chiaki Ishikawa.
+        * pop.c (fullwrite): Get rid of an extra call to write.
+        Problem pointed out by Chiaki Ishikawa.
 
 1997-10-16  Dave Love  <d.love@dl.ac.uk>
 
@@ -4207,8 +4492,8 @@
         (C_entries): Initialise tok.named.
         (sym_type, C_stab_entry, consider_token): st_C_ignore is used to
         get rid of "import", "package" and "friend".
-        (fvdef): Renamed from funcdef.  Also some constants renamed.  All
-        users changed.
+        (fvdef): Rename from funcdef.  Also some constants renamed.
+        All users changed.
         (C_entries): Make separate tags for variables separated by comma.
         (globals, members): New flags.
         (main, C_entries): Use them.
@@ -4222,7 +4507,7 @@
         (consider_token, C_entries): Set the len member of token_name.
         (prolog_pred): Cleanup according to GNU coding standards.
         (Cobol_suffixes, lang_names, Cobol_paragraphs): Cobol support.
-        (prolog_white, erlang_white): Renamed to eat_white, callers changed.
+        (prolog_white, erlang_white): Rename to eat_white, callers changed.
 
 1997-05-15  Francesco Potortì  <F.Potorti@cnuce.cnr.it>
 
@@ -4425,7 +4710,7 @@
 
         * etags.c (relative_filename): Bug corrected.
         (etags_getcwd): Avoid warning of unused variable.
-        (C_entries, consider_token): Added support for enum labels.
+        (C_entries, consider_token): Add support for enum labels.
 
 1996-11-03  Paul Eggert  <eggert@twinsun.com>
 
@@ -4668,14 +4953,14 @@
 
 1996-04-29  Richard Stallman  <rms@delasyd.gnu.ai.mit.edu>
 
-        * pop.c (SEND, RECV): Renamed from send, recv.
+        * pop.c (SEND, RECV): Rename from send, recv.
         (pop_open, pop_trash): Make the trash_started code unconditional.
         (socket_connection): Delete casts to void.
 
 1996-04-28  Richard Stallman  <rms@delasyd.gnu.ai.mit.edu>
 
-        * movemail.c (DIRECTORY_SEP, IS_DIRECTORY_SEP): Definitions
-        copied from lisp.h.
+        * movemail.c (DIRECTORY_SEP, IS_DIRECTORY_SEP):
+        Definitions copied from lisp.h.
 
 1996-04-22  Andrew Innes  <andrewi@harlequin.co.uk>
 
@@ -4785,7 +5070,7 @@
         (lang_names): Erlang entry added.
         (prolog_getit): Accepts headers spanning several lines.
         Always name tags.
-        (Prolog_functions): Removed incorrect compensation for
+        (Prolog_functions): Remove incorrect compensation for
         newline characters.
         (readline_internal): Zero-terminate last line.
 
@@ -4850,7 +5135,7 @@
 
 1995-12-01  Richard Stallman  <rms@whiz-bang.gnu.ai.mit.edu>
 
-        * Makefile.in (THIS_IS_MAKEFILE): Renamed from THIS_IS_YMAKEFILE.
+        * Makefile.in (THIS_IS_MAKEFILE): Rename from THIS_IS_YMAKEFILE.
 
 1995-12-07  Francesco Potortì  <pot@cnuce.cnr.it>
 
@@ -4867,11 +5152,11 @@
 1995-12-06  Francesco Potortì  <pot@cnuce.cnr.it>
 
         * etags.c (Cplusplus_suffixes): Add .M suffix for Objective C++.
-        (gperf): Added keywords for Objective C and GNU macros.
-        (sym_type): Added values to account for Objective C and GNU macros.
+        (gperf): Add keywords for Objective C and GNU macros.
+        (sym_type): Add values to account for Objective C and GNU macros.
         (begtk): The '@' character can start a token.
         (objdef, methodlen, objtag): New variables for Objective C.
-        (consider_token, C_entries): Added code for Objective C.
+        (consider_token, C_entries): Add code for Objective C.
         (plain_C_suffixes): Add .m and .lm for Objective C.
         (Yacc_suffixes): Add .ym for Objective yacc.
         (GROW_LINEBUFFER): New macro.
@@ -4912,8 +5197,8 @@
 
 1995-11-06  Francesco Potortì  (pot@cnuce.cnr.it)
 
-        * etags.c (get_lang_from_name, get_lang_from_interpreter,
-        get_lang_from_suffix): New functions.
+        * etags.c (get_lang_from_name, get_lang_from_interpreter)
+        (get_lang_from_suffix): New functions.
         (get_language): Function deleted.
         (lang_entry): Two members added to struct.
         (lang_names): Reflect the new layout of lang_entry.
@@ -4928,12 +5213,12 @@
         * etags.c (lowcase): Use the standard tolower function.
         (substitute): Remove some wrong and some useless code related with
         escape '\' character in regexp replacement string.
-        (TEX_defenv): Added part, appendix, entry, index.  Removed typeout.
+        (TEX_defenv): Add part, appendix, entry, index.  Remove typeout.
         (lang_suffixes): New suffixes: .hpp for C++; .f90 for Fortran;
         .bib, .ltx, .TeX for TeX (.bbl, .dtx removed); .ml for Lisp;
         .prolog for prolog (.pl removed).
         (massage_name, etags_getcwd): Use lowcase instead of tolower.
-        (C_entries, find_entries): Added comments about memory leakage.
+        (C_entries, find_entries): Add comments about memory leakage.
         (add_node): Dead code removed.
 
 1995-10-29  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
@@ -5175,7 +5460,7 @@
 
 1995-04-08  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
 
-        * Makefile.in.in (BASE_CFLAGS): Renamed from ALLOCA_CFLAGS.
+        * Makefile.in.in (BASE_CFLAGS): Rename from ALLOCA_CFLAGS.
         (alloca.o, regex.o): Use BASE_CFLAGS.
 
 1995-04-06  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
@@ -5185,7 +5470,7 @@
 1995-04-04  Karl Heuer  <kwzh@gnu.ai.mit.edu>
 
         * Makefile.in.in (aixcc, aixcc.c): Targets deleted.
-        (SOURCES, distclean): Removed obsolete references to aixcc.
+        (SOURCES, distclean): Remove obsolete references to aixcc.
 
 1995-04-02  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
 
@@ -5228,7 +5513,7 @@
         savetok.valid.  Mark token as valid when it is initialised.
         (make_tag): Make token only if token is valid and reset validity.
         (CNL_SAVE_DEFINEDEF): Test for savetok.valid instead of token_saved.
-        (TOKEN): Added a new member: valid.
+        (TOKEN): Add a new member: valid.
 
 1995-02-15  Francesco Potortì  (pot@cnuce.cnr.it)
 
@@ -5250,12 +5535,12 @@
 
 1995-02-07  Richard Stallman  <rms@pogo.gnu.ai.mit.edu>
 
-        * Makefile.in.in (maintainer-clean): Renamed from realclean.
+        * Makefile.in.in (maintainer-clean): Rename from realclean.
 
 1995-02-01  Francesco Potortì  (pot@cnuce.cnr.it)
 
         * etags.c (pfnote): Initialise been_warned in the node.
-        (C_entries): Removed a speed hack for the sake of clarity.
+        (C_entries): Remove a speed hack for the sake of clarity.
 
 1995-01-18  Francesco Potortì  (pot@cnuce.cnr.it)
 
@@ -5374,7 +5659,7 @@
         (print_help): Help strings updated.  Calls print_language_names.
         (argument_type, ARGUMENT): Typedefs for dealing with language and
         regex options intermixed with filenames.
-        (main): Changed the way of dealing with arguments on the command
+        (main): Change the way of dealing with arguments on the command
         line to deal with language and regex options intermixed with
         filenames.
         (get_language, default_C_entries, Cplusplus_entries,
@@ -5463,8 +5748,8 @@
 
         * pop.c: Don't include <string.h> and <strings.h>.
 
-        * pop.c: Include <des.h> before <krb.h>, rather than after.  They
-        should be interchangeable, and indeed the inclusion is done in
+        * pop.c: Include <des.h> before <krb.h>, rather than after.
+        They should be interchangeable, and indeed the inclusion is done in
         both orders in various files in the Kerberos 4 library sources,
         but djm@va.pubnix.com (David J. MacKenzie) reports that BSDI
         requires that <des.h> be included first, and I don't see any harm
@@ -5494,8 +5779,8 @@
 
 1994-10-17  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
 
-        * emacsserver.c [SYSV_IPC] (main): Catch SIGHUP as well.  Don't
-        call kill with pid 0.  Handle EINTR when receiving messages.
+        * emacsserver.c [SYSV_IPC] (main): Catch SIGHUP as well.
+        Don't call kill with pid 0.  Handle EINTR when receiving messages.
 
 1994-10-17  Karl Heuer  <kwzh@gnu.ai.mit.edu>
 
@@ -5526,7 +5811,7 @@
         * Makefile.in.in (clean): rm DOC* and *.tab.[ch].
         (distclean): Not here.
 
-        * Makefile.in.in (libexecdir): Renamed from libdir.
+        * Makefile.in.in (libexecdir): Rename from libdir.
 
 1994-10-11  Francesco Potortì  (pot@cnuce.cnr.it)
 
@@ -5756,7 +6041,7 @@
         print advice to run it, if it has anything significant to do.
         And only if MOVEMAIL_NEEDS_BLESSING.
         (blessmail): Use emacs, not temacs.
-        (configuration): Renamed from configname.
+        (configuration): Rename from configname.
 
 1994-04-30  Morten Welinder  (terra@diku.dk)
 
@@ -5840,15 +6125,15 @@
 
 1994-04-08  Francesco Potortì  (pot@fly.cnuce.cnr.it)
 
-        * etags.c (outf, outfiledir): Renamed to tagf, tagfiledir.
+        * etags.c (outf, outfiledir): Rename to tagf, tagfiledir.
         (PF_funcs, Asm_funcs, L_funcs, PAS_funcs, TEX_funcs)
-        (Scheme_funcs, prolog_funcs): Renamed to Fortran_functions,
+        (Scheme_funcs, prolog_funcs): Rename to Fortran_functions,
         Asm_labels, Lisp_functions, Pascal_functions, Scheme_functions,
         TeX_functions, Prolog_functions.
         (inf): No more a global variable.
         (C_entries): Take 2nd parameter `inf' instead of using the global one.
-        (find_entries): Added the cp1 var for optimisation.
-        (find_entries): Added more suffixes for assembler files.
+        (find_entries): Add the cp1 var for optimisation.
+        (find_entries): Add more suffixes for assembler files.
         (Asm_funcs): Now finds labels even without an ending colon.
 
 1994-03-30  Francesco Potortì  (pot@fly.cnuce.cnr.it)
@@ -5876,7 +6161,7 @@
         (process_file): Filenames in tags file are relative to the
         directory where the tags file is (useful with the -o option).
         (main): Initialise the outfiledir var.
-        (TYPEDST): Added the `tignore' value.
+        (TYPEDST): Add the `tignore' value.
         (C_entries): Corrected various small bugs.
 
 1994-03-19  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
@@ -5892,7 +6177,7 @@
 
 1994-03-14  Francesco Potortì  (pot@cnuce.cnr.it)
 
-        * etags.c (TYPEDST): Added the `tignore' value.
+        * etags.c (TYPEDST): Add the `tignore' value.
         (C_entries): Corrected various bugs, now correctly parses the
         `extern "C" {' construction (patch by Tom R.Hageman).
 
@@ -5946,7 +6231,7 @@
 
 1994-02-14  Francesco Potortì  (pot@fly)
 
-        * etags.c (absolute_pathnames, cwd): Added global vars.
+        * etags.c (absolute_pathnames, cwd): Add global vars.
         (longopts, print_help, main, process_file): Put absolute filenames
         in the tag file if the -A --absolute-pathnames option is used.
         (print_help): Alphabetically order the options.
@@ -5983,7 +6268,7 @@
         Use gperf generated hash table instead of linked list.
         (C_stab_entry, hash, in_word_set, get_C_stab, C_symtype): Added.
         Mostly code generated by gperf.
-        (consider_token): Removed unused parameter `lp'.
+        (consider_token): Remove unused parameter `lp'.
         (PF_funcs, getit): Allow subroutine and similar declarations
         to span multiple lines.
         (C_entries): Check for newline if inchar to avoid bus errors.
@@ -6130,7 +6415,7 @@
 
 1993-11-02  Francesco Potortì  (pot@cnuce.cnr.it)
 
-        * etags.c (consider_token): Removed unused variable firsttok.
+        * etags.c (consider_token): Remove unused variable firsttok.
         (prolog_getit): Call pfnote with the right number of arguments.
 
 1993-10-19  Paul Eggert  (eggert@twinsun.com)
@@ -6160,13 +6445,13 @@
         from current directory.  Only chmod and chgrp files that we
         installed, which excludes ${INSTALLABLE_SCRIPTS}.  They go in
         ${bindir}.
-        (INSTALLFLAGS): Deleted definition, since it is an unused variable
+        (INSTALLFLAGS): Delete definition, since it is an unused variable
         now.
 
 1993-09-27  Brian J. Fox  (bfox@ai.mit.edu)
 
-        * Makefile.in (INSTALL, INSTALL_PROGRAM, INSTALL_DATA): Let
-        configure figure out the correct values for these variables.
+        * Makefile.in (INSTALL, INSTALL_PROGRAM, INSTALL_DATA):
+        Let configure figure out the correct values for these variables.
 
 1993-09-14  Brian J. Fox  (bfox@ai.mit.edu)
 
@@ -6251,7 +6536,7 @@
 
 1993-07-30  Francesco Potortì  (pot@cnuce.cnr.it)
 
-        * etags.c (FINCST): Added the fignore status.  Means we are
+        * etags.c (FINCST): Add the fignore status.  Means we are
         after the parameter list and before the open curly brace.
         Allows correct parsing of C++ constructors.
         (C_entries, consider_token): Make use of fignore.
@@ -6290,7 +6575,7 @@
 
 1993-07-08  Francesco Potortì  (pot@cnuce.cnr.it)
 
-        * etags.c (alloca): Removed all references to it.
+        * etags.c (alloca): Remove all references to it.
         (main): Now calls xnew instead of alloca for portability.
         (../src/config.h): Included only if HAVE_CONFIG_H.
         (const): Void definition removed--config.h takes care of it.
@@ -6302,7 +6587,7 @@
 
         * etags.c (LEVEL_OK_FOR_FUNCDEF): Removed.
         (C_entries): Optimized the test that used LEVEL_OK_FOR_FUNCDEF.
-        (C_entries): Removed a piece of useless code.
+        (C_entries): Remove a piece of useless code.
         (C_entries): Making typedef tags is delayed until a semicolon
         is met.  This handles "typedef int X, Y, Z;" correctly.
 
@@ -6564,7 +6849,7 @@
 
 1993-04-09  Jim Blandy  (jimb@totoro.cs.oberlin.edu)
 
-        * Makefile.in (DEFS): Renamed from CONFIG_CFLAGS.
+        * Makefile.in (DEFS): Rename from CONFIG_CFLAGS.
 
 1993-04-07  Jim Blandy  (jimb@churchy.gnu.ai.mit.edu)
 
@@ -6586,7 +6871,7 @@
         (get_C_stab): c_ext becomes c_ext&C_PLPL.
         (C_entries): Logical cplpl means c_ext&C_PLPL.
         (C_entries): Logical yacc_rules means we are after the first %%.
-        (C_entries): Added logic for yacc files.
+        (C_entries): Add logic for yacc files.
 
 1993-03-16  Francesco Potortì  (pot@cnuce.cnr.it)
 
@@ -6604,7 +6889,7 @@
         (TOKEN): Member linestart removed.
         (linepos, prev_linepos, lb1): Deleted.
         (main): Call initbuffer on lbs array instead of lb1.
-        (init): Removed the initialisation of the logical _gd array.
+        (init): Remove the initialisation of the logical _gd array.
         (find_entries): A .sa suffix means assembler file.
         (C_create_stab): "auto", "void", "extern", "static" are st_C_typespec.
         All C state machines rewritten.
@@ -6614,7 +6899,7 @@
 
 1993-03-01  Francesco Potortì  (pot@fly.CNUCE.CNR.IT)
 
-        * etags.c (C_entries): Added the quotednl logical variable.
+        * etags.c (C_entries): Add the quotednl logical variable.
         Used for parsing of #define's spanning multiple lines.
 
 1993-02-23  Francesco Potortì  (pot@fly.CNUCE.CNR.IT)
@@ -6624,7 +6909,7 @@
 
 1993-03-19  Eric S. Raymond  (eric@geech.gnu.ai.mit.edu)
 
-        * Makefile.in (EXECUTABLES): Added rcs-checkin.
+        * Makefile.in (EXECUTABLES): Add rcs-checkin.
 
         * Makefile.in (unlock, relock): New productions.
 
@@ -6685,7 +6970,7 @@
         * Makefile.in (CFLAGS): #define HAVE_CONFIG_H, too.
 
         * Makefile.in (libdir): Default to ${prefix}/lib.
-        (archlibdir): Adjusted to match.
+        (archlibdir): Adjust to match.
 
         * Makefile.in (distclean): Don't delete backup or autosave files.
         (extraclean): Like realclean, but does delete backup and autosave
@@ -6720,7 +7005,7 @@
 
 1992-11-05  Jim Blandy  (jimb@totoro.cs.oberlin.edu)
 
-        * Makefile.in (getdate.o): Added explicit target for this, so we
+        * Makefile.in (getdate.o): Add explicit target for this, so we
         can indicate that it depends on ../src/config.h.
 
 1992-11-04  Jim Blandy  (jimb@totoro.cs.oberlin.edu)
@@ -6788,7 +7073,7 @@
         array.  When an event fires, move the last event in the array into
         its spot.  Use num_events to determine whether or not there are
         any pending events, not wait_for.
-        (getevent): Deleted unused variable `ep'.
+        (getevent): Delete unused variable `ep'.
         (sigcatch): It's now easier to find all the active events.
         (main): Initialize num_events.
 
@@ -6801,7 +7086,7 @@
         (process_file, find_entries, pfnote, TEX_funcs, TEX_decode_env,
         TEX_getit, substr): Use the etags_*index functions, rather than
         the native *index functions.
-        (rindex, index): Renamed to etags_rindex and tags_rindex, and
+        (rindex, index): Rename to etags_rindex and tags_rindex, and
         made them unconditionally defined, rather than having them depend
         on NEED_*INDEX.
 
@@ -6888,7 +7173,7 @@
 
 1992-05-10  Roland McGrath  (roland@albert.gnu.ai.mit.edu)
 
-        * etags.c (C_entries): Fixed reading of "..." strings.
+        * etags.c (C_entries): Fix reading of "..." strings.
         (consider_token): Recognize `SYSCALL' and `PSEUDO' macros, used in
         the C library source.
 
@@ -6916,7 +7201,7 @@
 
 1992-04-17  Jim Blandy  (jimb@pogo.cs.oberlin.edu)
 
-        * timer.c (getevent): Removed declaration of memcpy; since
+        * timer.c (getevent): Remove declaration of memcpy; since
         different systems have different return types, and we're not even
         using the return type anyway, it wasn't doing us any good.
 
@@ -6951,7 +7236,7 @@
 
 1992-04-06  Jim Blandy  (jimb@pogo.cs.oberlin.edu)
 
-        * etags.c (C_entries): Removed comment saying that \" in a string
+        * 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.
@@ -6961,8 +7246,8 @@
         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.
+        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.
@@ -7103,8 +7388,8 @@
 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
+        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.
 
@@ -7492,8 +7777,8 @@
 
 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.
+        * 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)
 
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 96975613104..f619febbb2b 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -117,8 +117,8 @@ STAMP_INST_SCRIPTS = stamp-rcs-checkin stamp-grep-changelog
 
 # Things that Emacs runs internally, or during the build process,
 #  which should not be installed in bindir.
-UTILITIES = profile${EXEEXT} movemail${EXEEXT} fakemail${EXEEXT} \
-            hexl${EXEEXT} update-game-score${EXEEXT}
+UTILITIES = profile${EXEEXT} movemail${EXEEXT} hexl${EXEEXT} \
+            update-game-score${EXEEXT}
 
 DONT_INSTALL= test-distrib${EXEEXT} make-docfile${EXEEXT}
 
@@ -178,33 +178,27 @@ CPP_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${CPPFLAGS} ${CFLAGS}
 LOADLIBES = ../lib/libgnu.a $(LIBS_SYSTEM)
 $(EXE_FILES): ../lib/libgnu.a
 
-## This is the default compilation command.
-## But we should never rely on it, because some make version failed to
-## find it for getopt.o.
-## Using an explicit command made it work.
-.c.o:
-        ${CC} -c ${CPP_CFLAGS} $<
-
-all: ${DONT_INSTALL} ${UTILITIES} ${INSTALLABLES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS}  ${STAMP_INST_SCRIPTS} ${STAMP_SCRIPTS}
+all: ${EXE_FILES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS} ${STAMP_INST_SCRIPTS} ${STAMP_SCRIPTS}
 
 ## These targets copy the scripts into the build directory so that
 ## they can be run from there in an uninstalled Emacs.
-## The "-" is prepended because some versions of cp barf when srcdir
-## is the current directory, and thus the file will be copied into itself.
+## Nothing to do if pwd = srcdir.
+insrcdir=[ "`/bin/pwd`" = "`(cd $(srcdir) && /bin/pwd)`" ]
+
 stamp-rcs2log: $(srcdir)/rcs2log
-        -cp -p $(srcdir)/rcs2log rcs2log
+        $(insrcdir) || cp -p $(srcdir)/rcs2log rcs2log
         touch $@
 
 stamp-rcs-checkin: $(srcdir)/rcs-checkin
-        -cp -p $(srcdir)/rcs-checkin rcs-checkin
+        $(insrcdir) || cp -p $(srcdir)/rcs-checkin rcs-checkin
         touch $@
 
 stamp-grep-changelog: $(srcdir)/grep-changelog
-        -cp -p $(srcdir)/grep-changelog grep-changelog
+        $(insrcdir) || cp -p $(srcdir)/grep-changelog grep-changelog
         touch $@
 
 stamp-vcdiff: $(srcdir)/vcdiff
-        -cp -p $(srcdir)/vcdiff vcdiff
+        $(insrcdir) || cp -p $(srcdir)/vcdiff vcdiff
         touch $@
 
 ## Only used if we need blessmail, but no harm in always defining.
@@ -235,13 +229,13 @@ maybe-blessmail: $(BLESSMAIL_TARGET)
 $(DESTDIR)${archlibdir}: all
         @echo
         @echo "Installing utilities run internally by Emacs."
-        umask 022; $(top_srcdir)/mkinstalldirs $(DESTDIR)${archlibdir}
+        umask 022; $(top_srcdir)/install-sh -d $(DESTDIR)${archlibdir}
         if [ `(cd $(DESTDIR)${archlibdir} && /bin/pwd)` != `/bin/pwd` ]; then \
           for file in ${UTILITIES}; do \
             $(INSTALL_PROGRAM) $(INSTALL_STRIP) $$file $(DESTDIR)${archlibdir}/$$file ; \
           done ; \
         fi
-        umask 022; $(top_srcdir)/mkinstalldirs $(DESTDIR)${gamedir}; \
+        umask 022; $(top_srcdir)/install-sh -d $(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 \
@@ -281,8 +275,8 @@ mostlyclean:
         -rm -f core *.o
 
 clean: mostlyclean
-        -rm -f ${INSTALLABLES} ${UTILITIES} ${DONT_INSTALL}
-        -rm -f fns*.el *.tab.c *.tab.h stamp-*
+        -rm -f ${EXE_FILES}
+        -rm -f ${STAMP_INST_SCRIPTS} ${STAMP_SCRIPTS}
 
 distclean: clean
         -rm -f TAGS
@@ -313,19 +307,16 @@ test-distrib${EXEEXT}: ${srcdir}/test-distrib.c
 ../lib/libgnu.a: ../src/config.h
         cd ../lib && $(MAKE) libgnu.a
 
-REGEXPOBJ = regex.o
-REGEXPDEPS = $(REGEXPOBJ) $(srcdir)/../src/regex.h
-
 regex.o: $(srcdir)/../src/regex.c $(srcdir)/../src/regex.h ../src/config.h
         ${CC} -c ${CPP_CFLAGS} -DCONFIG_BROKETS -DINHIBIT_STRING_HEADER \
           ${srcdir}/../src/regex.c
 
-etags${EXEEXT}: ${srcdir}/etags.c $(REGEXPDEPS) ../src/config.h
+etags${EXEEXT}: ${srcdir}/etags.c regex.o ../src/config.h
         $(CC) ${ALL_CFLAGS} -DEMACS_NAME="\"GNU Emacs\"" \
           -DVERSION="\"${version}\"" ${srcdir}/etags.c \
-          $(REGEXPOBJ) $(LOADLIBES) -o etags
+          regex.o $(LOADLIBES) -o etags
 
-ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ../src/config.h
+ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ${srcdir}/../lib/min-max.h ../src/config.h
         $(CC) ${ALL_CFLAGS} -DVERSION="\"${version}\"" \
           ${srcdir}/ebrowse.c $(LOADLIBES) -o ebrowse
 
@@ -334,7 +325,7 @@ ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ../src/config.h
 ctags${EXEEXT}: etags${EXEEXT}
         $(CC) ${ALL_CFLAGS} -DCTAGS -DEMACS_NAME="\"GNU Emacs\"" \
           -DVERSION="\"${version}\"" ${srcdir}/etags.c \
-          $(REGEXPOBJ) $(LOADLIBES) -o ctags
+          regex.o $(LOADLIBES) -o ctags
 
 profile${EXEEXT}: ${srcdir}/profile.c ../src/config.h
         $(CC) ${ALL_CFLAGS} ${srcdir}/profile.c $(LOADLIBES) -o profile
@@ -343,19 +334,13 @@ make-docfile${EXEEXT}: ${srcdir}/make-docfile.c ../src/config.h
         $(CC) ${ALL_CFLAGS} ${srcdir}/make-docfile.c $(LOADLIBES) \
           -o make-docfile
 
-movemail${EXEEXT}: movemail.o pop.o
-        $(CC) ${LINK_CFLAGS} ${MOVE_FLAGS} movemail.o pop.o \
+movemail${EXEEXT}: ${srcdir}/movemail.c pop.o ../src/config.h
+        $(CC) ${ALL_CFLAGS} ${MOVE_FLAGS} ${srcdir}/movemail.c pop.o \
           $(LOADLIBES) $(LIBS_MOVE) -o movemail
 
-movemail.o: ${srcdir}/movemail.c ../src/config.h
-        $(CC) -c ${CPP_CFLAGS} ${MOVE_FLAGS} ${srcdir}/movemail.c
-
-pop.o: ${srcdir}/pop.c  ../src/config.h
+pop.o: ${srcdir}/pop.c ${srcdir}/../lib/min-max.h ../src/config.h
         $(CC) -c ${CPP_CFLAGS} ${MOVE_FLAGS} ${srcdir}/pop.c
 
-fakemail${EXEEXT}: ${srcdir}/fakemail.c ../src/config.h
-        $(CC) ${ALL_CFLAGS} ${srcdir}/fakemail.c $(LOADLIBES) -o fakemail
-
 emacsclient${EXEEXT}: ${srcdir}/emacsclient.c ../src/config.h
         $(CC) ${ALL_CFLAGS} ${srcdir}/emacsclient.c \
            -DVERSION="\"${version}\"" \
@@ -364,12 +349,8 @@ emacsclient${EXEEXT}: ${srcdir}/emacsclient.c ../src/config.h
 hexl${EXEEXT}: ${srcdir}/hexl.c ../src/config.h
         $(CC) ${ALL_CFLAGS} ${srcdir}/hexl.c $(LOADLIBES) -o hexl
 
-update-game-score${EXEEXT}: update-game-score.o
-        $(CC) ${LINK_CFLAGS} update-game-score.o \
-          $(LOADLIBES) -o update-game-score
-
-update-game-score.o: ${srcdir}/update-game-score.c ../src/config.h
-        $(CC) -c ${CPP_CFLAGS} ${srcdir}/update-game-score.c \
-          -DHAVE_SHARED_GAME_DIR="\"$(gamedir)\""
+update-game-score${EXEEXT}: ${srcdir}/update-game-score.c ../src/config.h
+        $(CC) ${ALL_CFLAGS} -DHAVE_SHARED_GAME_DIR="\"$(gamedir)\"" \
+          ${srcdir}/update-game-score.c $(LOADLIBES) -o update-game-score
 
 ## Makefile ends here.
diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c
index 59a1dde7634..7871a804997 100644
--- a/lib-src/ebrowse.c
+++ b/lib-src/ebrowse.c
@@ -41,12 +41,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #define streq(X, Y) (*(X) == *(Y) && strcmp ((X) + 1, (Y) + 1) == 0)
 
-/* The ubiquitous `max' and `min' macros.  */
-
-#ifndef max
-#define max(X, Y)       ((X) > (Y) ? (X) : (Y))
-#define min(X, Y)       ((X) < (Y) ? (X) : (Y))
-#endif
+#include <min-max.h>
 
 /* Files are read in chunks of this number of bytes.  */
 
@@ -82,7 +77,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define TREE_HEADER_STRUCT      "[ebrowse-hs "
 #define TREE_STRUCT             "[ebrowse-ts "
 #define MEMBER_STRUCT           "[ebrowse-ms "
-#define BROWSE_STRUCT           "[ebrowse-bs "
 #define CLASS_STRUCT            "[ebrowse-cs "
 
 /* The name of the symbol table entry for global functions, variables,
@@ -384,7 +378,7 @@ int max_regexp = 50;
 
 char *inbuffer;
 char *in;
-int inbuffer_size;
+size_t inbuffer_size;
 
 /* Return the current buffer position in the input file.  */
 
@@ -465,59 +459,16 @@ struct search_path *search_path_tail;
 
 /* Function prototypes.  */
 
-int yylex (void);
-void yyparse (void);
-void re_init_parser (void);
-const char *token_string (int);
-char *matching_regexp (void);
-void init_sym (void);
-struct sym *add_sym (const char *, struct sym *);
-void add_link (struct sym *, struct sym *);
-void add_member_defn (struct sym *, char *, char *,
-                      int, unsigned, int, int, int);
-void add_member_decl (struct sym *, char *, char *, int,
-                      unsigned, int, int, int, int);
-void dump_roots (FILE *);
-void *xmalloc (int);
-void xfree (void *);
-void add_global_defn (char *, char *, int, unsigned, int, int, int);
-void add_global_decl (char *, char *, int, unsigned, int, int, int);
-void add_define (char *, char *, int);
-void mark_inherited_virtual (void);
-void leave_namespace (void);
-void enter_namespace (char *);
-void register_namespace_alias (char *, struct link *);
-void insert_keyword (const char *, int);
-void re_init_scanner (void);
-void init_scanner (void);
-void process_file (char *);
-void add_search_path (char *);
-FILE *open_file (char *);
-int process_pp_line (void);
-int dump_members (FILE *, struct member *);
-void dump_sym (FILE *, struct sym *);
-int dump_tree (FILE *, struct sym *);
-struct member *find_member (struct sym *, char *, int, int, unsigned);
-struct member *add_member (struct sym *, char *, int, int, unsigned);
-void mark_virtual (struct sym *);
-struct sym *make_namespace (char *, struct sym *);
-char *sym_scope (struct sym *);
-char *sym_scope_1 (struct sym *);
-int skip_to (int);
-void skip_matching (void);
-void member (struct sym *, int);
-void class_body (struct sym *, int);
-void class_definition (struct sym *, int, int, int);
-void declaration (int);
-unsigned parm_list (int *);
-char *operator_name (int *);
-struct sym *parse_classname (void);
-struct sym *parse_qualified_ident_or_type (char **);
-void parse_qualified_param_ident_or_type (char **);
-int globals (int);
-void yyerror (const char *, const char *);
-void usage (int) NO_RETURN;
-void version (void) NO_RETURN;
+static char *matching_regexp (void);
+static struct sym *add_sym (const char *, struct sym *);
+static void add_global_defn (char *, char *, int, unsigned, int, int, int);
+static void add_global_decl (char *, char *, int, unsigned, int, int, int);
+static struct member *add_member (struct sym *, char *, int, int, unsigned);
+static void class_definition (struct sym *, int, int, int);
+static char *operator_name (int *);
+static void parse_qualified_param_ident_or_type (char **);
+static void usage (int) NO_RETURN;
+static void version (void) NO_RETURN;
 
 
 
@@ -528,7 +479,7 @@ void version (void) NO_RETURN;
 /* Print an error in a printf-like style with the current input file
    name and line number.  */
 
-void
+static void
 yyerror (const char *format, const char *s)
 {
   fprintf (stderr, "%s:%d: ", filename, yyline);
@@ -540,8 +491,8 @@ yyerror (const char *format, const char *s)
 /* Like malloc but print an error and exit if not enough memory is
    available.  */
 
-void *
-xmalloc (int nbytes)
+static void *
+xmalloc (size_t nbytes)
 {
   void *p = malloc (nbytes);
   if (p == NULL)
@@ -555,8 +506,8 @@ xmalloc (int nbytes)
 
 /* Like realloc but print an error and exit if out of memory.  */
 
-void *
-xrealloc (void *p, int sz)
+static void *
+xrealloc (void *p, size_t sz)
 {
   p = realloc (p, sz);
   if (p == NULL)
@@ -571,7 +522,7 @@ xrealloc (void *p, int sz)
 /* Like strdup, but print an error and exit if not enough memory is
    available..  If S is null, return null.  */
 
-char *
+static char *
 xstrdup (char *s)
 {
   if (s)
@@ -588,7 +539,7 @@ xstrdup (char *s)
 /* Initialize the symbol table.  This currently only sets up the
    special symbol for globals (`*Globals*').  */
 
-void
+static void
 init_sym (void)
 {
   global_symbols = add_sym (GLOBALS_NAME, NULL);
@@ -602,7 +553,7 @@ init_sym (void)
    If a symbol for NAME already exists, return that.  Otherwise
    create a new symbol and set it to default values.  */
 
-struct sym *
+static struct sym *
 add_sym (const char *name, struct sym *nested_in_class)
 {
   struct sym *sym;
@@ -643,7 +594,7 @@ add_sym (const char *name, struct sym *nested_in_class)
 
 /* Add links between superclass SUPER and subclass SUB.  */
 
-void
+static void
 add_link (struct sym *super, struct sym *sub)
 {
   struct link *lnk, *lnk2, *p, *prev;
@@ -683,7 +634,7 @@ add_link (struct sym *super, struct sym *sub)
    parameter types of functions.  Value is a pointer to the member
    found or null if not found.  */
 
-struct member *
+static struct member *
 find_member (struct sym *cls, char *name, int var, int sc, unsigned int hash)
 {
   struct member **list;
@@ -733,7 +684,7 @@ find_member (struct sym *cls, char *name, int var, int sc, unsigned int hash)
    a bit set giving additional information about the member (see the
    F_* defines).  */
 
-void
+static void
 add_member_decl (struct sym *cls, char *name, char *regexp, int pos, unsigned int hash, int var, int sc, int vis, int flags)
 {
   struct member *m;
@@ -781,7 +732,7 @@ add_member_decl (struct sym *cls, char *name, char *regexp, int pos, unsigned in
    a bit set giving additional information about the member (see the
    F_* defines).  */
 
-void
+static void
 add_member_defn (struct sym *cls, char *name, char *regexp, int pos, unsigned int hash, int var, int sc, int flags)
 {
   struct member *m;
@@ -823,7 +774,7 @@ add_member_defn (struct sym *cls, char *name, char *regexp, int pos, unsigned in
    REGEXP is a regular expression matching the define in the source,
    if it is non-null.  POS is the position in the file.  */
 
-void
+static void
 add_define (char *name, char *regexp, int pos)
 {
   add_global_defn (name, regexp, pos, 0, 1, SC_FRIEND, F_DEFINE);
@@ -841,7 +792,7 @@ add_define (char *name, char *regexp, int pos)
    a bit set giving additional information about the member (see the
    F_* defines).  */
 
-void
+static void
 add_global_defn (char *name, char *regexp, int pos, unsigned int hash, int var, int sc, int flags)
 {
   int i;
@@ -872,7 +823,7 @@ add_global_defn (char *name, char *regexp, int pos, unsigned int hash, int var,
    a bit set giving additional information about the member (see the
    F_* defines).  */
 
-void
+static void
 add_global_decl (char *name, char *regexp, int pos, unsigned int hash, int var, int sc, int flags)
 {
   /* Add declaration only if not already declared.  Header files must
@@ -911,7 +862,7 @@ add_global_decl (char *name, char *regexp, int pos, unsigned int hash, int var,
    member.  HASH is a hash code for the parameter types of a function.
    Value is a pointer to the member's structure.  */
 
-struct member *
+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));
@@ -982,7 +933,7 @@ add_member (struct sym *cls, char *name, int var, int sc, unsigned int hash)
    recursively, marking functions as virtual that are declared virtual
    in base classes.  */
 
-void
+static void
 mark_virtual (struct sym *r)
 {
   struct link *p;
@@ -1006,7 +957,7 @@ mark_virtual (struct sym *r)
 /* For all roots of the class tree, mark functions as virtual that
    are virtual because of a virtual declaration in a base class.  */
 
-void
+static void
 mark_inherited_virtual (void)
 {
   struct sym *r;
@@ -1021,7 +972,7 @@ mark_inherited_virtual (void)
 
 /* Create and return a symbol for a namespace with name NAME.  */
 
-struct sym *
+static struct sym *
 make_namespace (char *name, struct sym *context)
 {
   struct sym *s = (struct sym *) xmalloc (sizeof *s + strlen (name));
@@ -1036,7 +987,7 @@ make_namespace (char *name, struct sym *context)
 
 /* Find the symbol for namespace NAME.  If not found, retrun NULL */
 
-struct sym *
+static struct sym *
 check_namespace (char *name, struct sym *context)
 {
   struct sym *p = NULL;
@@ -1053,7 +1004,7 @@ check_namespace (char *name, struct sym *context)
 /* Find the symbol for namespace NAME.  If not found, add a new symbol
    for NAME to all_namespaces.  */
 
-struct sym *
+static struct sym *
 find_namespace (char *name, struct sym *context)
 {
   struct sym *p = check_namespace (name, context);
@@ -1067,7 +1018,7 @@ find_namespace (char *name, struct sym *context)
 
 /* Find namespace alias with name NAME. If not found return NULL. */
 
-struct link *
+static struct link *
 check_namespace_alias (char *name)
 {
   struct link *p = NULL;
@@ -1091,7 +1042,7 @@ check_namespace_alias (char *name)
 
 /* Register the name NEW_NAME as an alias for namespace list OLD_NAME.  */
 
-void
+static void
 register_namespace_alias (char *new_name, struct link *old_name)
 {
   unsigned h;
@@ -1119,7 +1070,7 @@ register_namespace_alias (char *new_name, struct link *old_name)
 
 /* Enter namespace with name NAME.  */
 
-void
+static void
 enter_namespace (char *name)
 {
   struct sym *p = find_namespace (name, current_namespace);
@@ -1140,7 +1091,7 @@ enter_namespace (char *name)
 
 /* Leave the current namespace.  */
 
-void
+static void
 leave_namespace (void)
 {
   assert (namespace_sp > 0);
@@ -1156,22 +1107,23 @@ leave_namespace (void)
 /* Write string S to the output file FP in a Lisp-readable form.
    If S is null, write out `()'.  */
 
-#define PUTSTR(s, fp)                           \
-  do {                                          \
-    if (!s)                                     \
-      {                                         \
-        putc ('(', fp);                         \
-        putc (')', fp);                         \
-        putc (' ', fp);                         \
-      }                                         \
-    else                                        \
-      {                                         \
-        putc ('"', fp);                         \
-        fputs (s, fp);                          \
-        putc ('"', fp);                         \
-        putc (' ', fp);                         \
-      }                                         \
-   } while (0)
+static inline void
+putstr (const char *s, FILE *fp)
+{
+  if (!s)
+    {
+      putc ('(', fp);
+      putc (')', fp);
+      putc (' ', fp);
+    }
+  else
+    {
+      putc ('"', fp);
+      fputs (s, fp);
+      putc ('"', fp);
+      putc (' ', fp);
+    }
+}
 
 /* A dynamically allocated buffer for constructing a scope name.  */
 
@@ -1182,7 +1134,7 @@ int scope_buffer_len;
 
 /* Make sure scope_buffer has enough room to add LEN chars to it.  */
 
-void
+static void
 ensure_scope_buffer_room (int len)
 {
   if (scope_buffer_len + len >= scope_buffer_size)
@@ -1198,7 +1150,7 @@ ensure_scope_buffer_room (int len)
    namespaces to scope_buffer.  Value is a pointer to the complete
    scope name constructed.  */
 
-char *
+static char *
 sym_scope_1 (struct sym *p)
 {
   int len;
@@ -1232,7 +1184,7 @@ sym_scope_1 (struct sym *p)
 /* Return the scope of symbol P in printed representation, i.e.
    as it would appear in a C*+ source file.  */
 
-char *
+static char *
 sym_scope (struct sym *p)
 {
   if (!scope_buffer)
@@ -1254,7 +1206,7 @@ sym_scope (struct sym *p)
 /* Dump the list of members M to file FP.  Value is the length of the
    list.  */
 
-int
+static int
 dump_members (FILE *fp, struct member *m)
 {
   int n;
@@ -1264,16 +1216,16 @@ dump_members (FILE *fp, struct member *m)
   for (n = 0; m; m = m->next, ++n)
     {
       fputs (MEMBER_STRUCT, fp);
-      PUTSTR (m->name, fp);
-      PUTSTR (NULL, fp);                /* FIXME? scope for globals */
+      putstr (m->name, fp);
+      putstr (NULL, fp);                /* FIXME? scope for globals */
       fprintf (fp, "%u ", (unsigned) m->flags);
-      PUTSTR (m->filename, fp);
-      PUTSTR (m->regexp, fp);
+      putstr (m->filename, fp);
+      putstr (m->regexp, fp);
       fprintf (fp, "%u ", (unsigned) m->pos);
       fprintf (fp, "%u ", (unsigned) m->vis);
       putc (' ', fp);
-      PUTSTR (m->def_filename, fp);
-      PUTSTR (m->def_regexp, fp);
+      putstr (m->def_filename, fp);
+      putstr (m->def_regexp, fp);
       fprintf (fp, "%u", (unsigned) m->def_pos);
       putc (']', fp);
       putc ('\n', fp);
@@ -1287,24 +1239,24 @@ dump_members (FILE *fp, struct member *m)
 
 /* Dump class ROOT to stream FP.  */
 
-void
+static void
 dump_sym (FILE *fp, struct sym *root)
 {
   fputs (CLASS_STRUCT, fp);
-  PUTSTR (root->name, fp);
+  putstr (root->name, fp);
 
   /* Print scope, if any.  */
   if (root->namesp)
-    PUTSTR (sym_scope (root), fp);
+    putstr (sym_scope (root), fp);
   else
-    PUTSTR (NULL, fp);
+    putstr (NULL, fp);
 
   /* Print flags.  */
   fprintf (fp, "%u", root->flags);
-  PUTSTR (root->filename, fp);
-  PUTSTR (root->regexp, fp);
+  putstr (root->filename, fp);
+  putstr (root->regexp, fp);
   fprintf (fp, "%u", (unsigned) root->pos);
-  PUTSTR (root->sfilename, fp);
+  putstr (root->sfilename, fp);
   putc (']', fp);
   putc ('\n', fp);
 }
@@ -1313,7 +1265,7 @@ dump_sym (FILE *fp, struct sym *root)
 /* Dump class ROOT and its subclasses to file FP.  Value is the
    number of classes written.  */
 
-int
+static int
 dump_tree (FILE *fp, struct sym *root)
 {
   struct link *lk;
@@ -1360,7 +1312,7 @@ dump_tree (FILE *fp, struct sym *root)
 
 /* Dump the entire class tree to file FP.  */
 
-void
+static void
 dump_roots (FILE *fp)
 {
   int i, n = 0;
@@ -1371,7 +1323,7 @@ dump_roots (FILE *fp)
   if (!f_append)
     {
       fputs (TREE_HEADER_STRUCT, fp);
-      PUTSTR (EBROWSE_FILE_VERSION, fp);
+      putstr (EBROWSE_FILE_VERSION, fp);
 
       putc ('\"', fp);
       if (!f_structs)
@@ -1434,7 +1386,7 @@ do {						\
 /* Process a preprocessor line.  Value is the next character from the
    input buffer not consumed.  */
 
-int
+static int
 process_pp_line (void)
 {
   int in_comment = 0, in_string = 0;
@@ -1505,7 +1457,7 @@ process_pp_line (void)
 
 /* Value is the next token from the input buffer.  */
 
-int
+static int
 yylex (void)
 {
   int c;
@@ -1927,7 +1879,7 @@ static char *matching_regexp_buffer, *matching_regexp_end_buf;
    position in the input buffer, or maybe a bit more if that string is
    shorter than min_regexp.  */
 
-char *
+static char *
 matching_regexp (void)
 {
   char *p;
@@ -1978,7 +1930,7 @@ matching_regexp (void)
 
 /* Return a printable representation of token T.  */
 
-const char *
+static const char *
 token_string (int t)
 {
   static char b[3];
@@ -2095,7 +2047,7 @@ token_string (int t)
 
 /* Reinitialize the scanner for a new input file.  */
 
-void
+static void
 re_init_scanner (void)
 {
   in = inbuffer;
@@ -2110,11 +2062,11 @@ re_init_scanner (void)
 }
 
 
-/* Insert a keyword NAME with token value TK into the keyword hash
+/* Insert a keyword NAME with token value TKV into the keyword hash
    table.  */
 
-void
-insert_keyword (const char *name, int tk)
+static void
+insert_keyword (const char *name, int tkv)
 {
   const char *s;
   unsigned h = 0;
@@ -2125,7 +2077,7 @@ insert_keyword (const char *name, int tk)
 
   h %= KEYWORD_TABLE_SIZE;
   k->name = name;
-  k->tk = tk;
+  k->tk = tkv;
   k->next = keyword_table[h];
   keyword_table[h] = k;
 }
@@ -2134,7 +2086,7 @@ insert_keyword (const char *name, int tk)
 /* Initialize the scanner for the first file.  This sets up the
    character class vectors and fills the keyword hash table.  */
 
-void
+static void
 init_scanner (void)
 {
   int i;
@@ -2278,7 +2230,7 @@ init_scanner (void)
 /* Skip forward until a given token TOKEN or YYEOF is seen and return
    the current lookahead token after skipping.  */
 
-int
+static int
 skip_to (int token)
 {
   while (!LOOKING_AT2 (YYEOF, token))
@@ -2289,7 +2241,7 @@ skip_to (int token)
 /* Skip over pairs of tokens (parentheses, square brackets,
    angle brackets, curly brackets) matching the current lookahead.  */
 
-void
+static void
 skip_matching (void)
 {
   int open, close, n;
@@ -2332,7 +2284,7 @@ skip_matching (void)
     }
 }
 
-void
+static void
 skip_initializer (void)
 {
   for (;;)
@@ -2359,7 +2311,7 @@ skip_initializer (void)
 
 /* Build qualified namespace alias (A::B::c) and return it. */
 
-struct link *
+static struct link *
 match_qualified_namespace_alias (void)
 {
   struct link *head = NULL;
@@ -2396,7 +2348,7 @@ match_qualified_namespace_alias (void)
 
 /* Re-initialize the parser by resetting the lookahead token.  */
 
-void
+static void
 re_init_parser (void)
 {
   tk = -1;
@@ -2409,7 +2361,7 @@ re_init_parser (void)
    Returns a hash code for the parameter types.  This value is used to
    distinguish between overloaded functions.  */
 
-unsigned
+static unsigned
 parm_list (int *flags)
 {
   unsigned hash = 0;
@@ -2522,7 +2474,7 @@ parm_list (int *flags)
 
 /* Print position info to stdout.  */
 
-void
+static void
 print_info (void)
 {
   if (info_position >= 0 && BUFFER_POS () <= info_position)
@@ -2537,7 +2489,7 @@ print_info (void)
    the access specifier for the member (private, protected,
    public).  */
 
-void
+static void
 member (struct sym *cls, int vis)
 {
   char *id = NULL;
@@ -2746,7 +2698,7 @@ member (struct sym *cls, int vis)
 /* Parse the body of class CLS.  TAG is the tag of the class (struct,
    union, class).  */
 
-void
+static void
 class_body (struct sym *cls, int tag)
 {
   int vis = tag == CLASS ? PRIVATE : PUBLIC;
@@ -2807,7 +2759,7 @@ class_body (struct sym *cls, int tag)
    qualified ident has the form `X<..>::Y<...>::T<...>.  Returns a
    symbol for that class.  */
 
-struct sym *
+static struct sym *
 parse_classname (void)
 {
   struct sym *last_class = NULL;
@@ -2837,13 +2789,13 @@ parse_classname (void)
    implicitly static operator has been parsed.  Value is a pointer to
    a static buffer holding the constructed operator name string.  */
 
-char *
+static char *
 operator_name (int *sc)
 {
-  static int id_size = 0;
+  static size_t id_size = 0;
   static char *id = NULL;
   const char *s;
-  int len;
+  size_t len;
 
   MATCH ();
 
@@ -2859,7 +2811,7 @@ operator_name (int *sc)
       len = strlen (s) + 10;
       if (len > id_size)
         {
-          int new_size = max (len, 2 * id_size);
+          size_t new_size = max (len, 2 * id_size);
           id = (char *) xrealloc (id, new_size);
           id_size = new_size;
         }
@@ -2880,7 +2832,7 @@ operator_name (int *sc)
     }
   else
     {
-      int tokens_matched = 0;
+      size_t tokens_matched = 0;
 
       len = 20;
       if (len > id_size)
@@ -2901,7 +2853,7 @@ operator_name (int *sc)
           len += strlen (s) + 2;
           if (len > id_size)
             {
-              int new_size = max (len, 2 * id_size);
+              size_t new_size = max (len, 2 * id_size);
               id = (char *) xrealloc (id, new_size);
               id_size = new_size;
             }
@@ -2927,7 +2879,7 @@ operator_name (int *sc)
    `X::Y::z'.  This IDENT is returned in LAST_ID.  Value is the
    symbol structure for the ident.  */
 
-struct sym *
+static struct sym *
 parse_qualified_ident_or_type (char **last_id)
 {
   struct sym *cls = NULL;
@@ -2992,14 +2944,16 @@ parse_qualified_ident_or_type (char **last_id)
    `X::Y::z'.  This IDENT is returned in LAST_ID.  Value is the
    symbol structure for the ident.  */
 
-void
+static void
 parse_qualified_param_ident_or_type (char **last_id)
 {
   struct sym *cls = NULL;
   static char *id = NULL;
   static int id_size = 0;
 
-  while (LOOKING_AT (IDENT))
+  assert (LOOKING_AT (IDENT));
+
+  do
     {
       int len = strlen (yytext) + 1;
       if (len > id_size)
@@ -3022,6 +2976,7 @@ parse_qualified_param_ident_or_type (char **last_id)
       else
         break;
     }
+  while (LOOKING_AT (IDENT));
 }
 
 
@@ -3034,7 +2989,7 @@ parse_qualified_param_ident_or_type (char **last_id)
 
    Current lookahead is the class name.  */
 
-void
+static void
 class_definition (struct sym *containing, int tag, int flags, int nested)
 {
   struct sym *current;
@@ -3131,7 +3086,7 @@ class_definition (struct sym *containing, int tag, int flags, int nested)
    the storage class of *ID.  FLAGS is a bit set giving additional
    information about the member (see the F_* defines).  */
 
-void
+static void
 add_declarator (struct sym **cls, char **id, int flags, int sc)
 {
   if (LOOKING_AT2 (';', ','))
@@ -3174,7 +3129,7 @@ add_declarator (struct sym **cls, char **id, int flags, int sc)
 
 /* Parse a declaration.  */
 
-void
+static void
 declaration (int flags)
 {
   char *id = NULL;
@@ -3328,7 +3283,7 @@ declaration (int flags)
    parsing in an `extern "C"' block.  Value is 1 if EOF is reached, 0
    otherwise.  */
 
-int
+static int
 globals (int start_flags)
 {
   int anonymous;
@@ -3446,7 +3401,7 @@ globals (int start_flags)
 
 /* Parse the current input file.  */
 
-void
+static void
 yyparse (void)
 {
   while (globals (0) == 0)
@@ -3462,7 +3417,7 @@ yyparse (void)
 /* Add the list of paths PATH_LIST to the current search path for
    input files.  */
 
-void
+static void
 add_search_path (char *path_list)
 {
   while (*path_list)
@@ -3497,7 +3452,7 @@ add_search_path (char *path_list)
    opened.  Try to find FILE in search_path first, then try the
    unchanged file name.  */
 
-FILE *
+static FILE *
 open_file (char *file)
 {
   FILE *fp = NULL;
@@ -3556,7 +3511,7 @@ Usage: ebrowse [options] {files}\n\
       --version                 display version info\n\
 "
 
-void
+static void
 usage (int error)
 {
   puts (USAGE);
@@ -3571,7 +3526,7 @@ usage (int error)
 # define VERSION "21"
 #endif
 
-void
+static void
 version (void)
 {
   /* Makes it easier to update automatically. */
@@ -3587,7 +3542,7 @@ version (void)
 /* Parse one input file FILE, adding classes and members to the symbol
    table.  */
 
-void
+static void
 process_file (char *file)
 {
   FILE *fp;
@@ -3595,7 +3550,7 @@ process_file (char *file)
   fp = open_file (file);
   if (fp)
     {
-      int nread, nbytes;
+      size_t nread, nbytes;
 
       /* Give a progress indication if needed.  */
       if (f_very_verbose)
@@ -3619,12 +3574,10 @@ process_file (char *file)
             }
 
           nbytes = fread (inbuffer + nread, 1, READ_CHUNK_SIZE, fp);
-          if (nbytes <= 0)
+          if (nbytes == 0)
             break;
           nread += nbytes;
         }
-      if (nread < 0)
-        nread = 0;
       inbuffer[nread] = '\0';
 
       /* Reinitialize scanner and parser for the new input file.  */
@@ -3642,7 +3595,7 @@ process_file (char *file)
    containing its contents without the terminating newline.  Value
    is null when EOF is reached.  */
 
-char *
+static char *
 read_line (FILE *fp)
 {
   static char *buffer;
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index e5484b987e2..c334fb6a196 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -112,6 +112,13 @@ char *(getcwd) (char *, size_t);
 /* Additional space when allocating buffers for filenames, etc.  */
 #define EXTRA_SPACE 100
 
+/* Use this to suppress gcc's `...may be used before initialized' warnings. */
+#ifdef lint
+# define IF_LINT(Code) Code
+#else
+# define IF_LINT(Code) /* empty */
+#endif
+
 
 /* Name used to invoke this program.  */
 const char *progname;
@@ -122,6 +129,9 @@ char **main_argv;
 /* Nonzero means don't wait for a response from Emacs.  --no-wait.  */
 int nowait = 0;
 
+/* Nonzero means don't print messages for successful operations.  --quiet. */
+int quiet = 0;
+
 /* Nonzero means args are expressions to be evaluated.  --eval.  */
 int eval = 0;
 
@@ -150,13 +160,14 @@ const char *server_file = NULL;
 /* PID of the Emacs server process.  */
 int emacs_pid = 0;
 
-void print_help_and_exit (void) NO_RETURN;
-void fail (void) NO_RETURN;
+static void print_help_and_exit (void) NO_RETURN;
+static void fail (void) NO_RETURN;
 
 
 struct option longopts[] =
 {
   { "no-wait",  no_argument,       NULL, 'n' },
+  { "quiet",    no_argument,       NULL, 'q' },
   { "eval",     no_argument,       NULL, 'e' },
   { "help",     no_argument,       NULL, 'H' },
   { "version",  no_argument,       NULL, 'V' },
@@ -178,7 +189,7 @@ struct option longopts[] =
 
 /* Like malloc but get fatal error if memory is exhausted.  */
 
-long *
+static long *
 xmalloc (unsigned int size)
 {
   long *result = (long *) malloc (size);
@@ -190,20 +201,6 @@ xmalloc (unsigned int size)
   return result;
 }
 
-/* Like strdup but get a fatal error if memory is exhausted. */
-
-char *
-xstrdup (const char *s)
-{
-  char *result = strdup (s);
-  if (result == NULL)
-    {
-      perror ("strdup");
-      exit (EXIT_FAILURE);
-    }
-  return result;
-}
-
 /* From sysdep.c */
 #if !defined (HAVE_GET_CURRENT_DIR_NAME) || defined (BROKEN_GET_CURRENT_DIR_NAME)
 
@@ -221,10 +218,8 @@ xstrdup (const char *s)
 #define IS_DEVICE_SEP(_c_) ((_c_) == DEVICE_SEP)
 #endif
 #endif
-#ifndef IS_ANY_SEP
-#define IS_ANY_SEP(_c_) (IS_DIRECTORY_SEP (_c_))
-#endif
 
+char *get_current_dir_name (void);
 
 /* Return the current working directory.  Returns NULL on errors.
    Any other returned value must be freed with free.  This is used
@@ -233,7 +228,7 @@ char*
 get_current_dir_name (void)
 {
   char *buf;
-  char *pwd;
+  const char *pwd;
   struct stat dotstat, pwdstat;
   /* If PWD is accurate, use it instead of calling getwd.  PWD is
      sometimes a nicer name, and using it may avoid a fatal error if a
@@ -300,6 +295,20 @@ get_current_dir_name (void)
 
 #ifdef WINDOWSNT
 
+/* Like strdup but get a fatal error if memory is exhausted. */
+
+char *
+xstrdup (const char *s)
+{
+  char *result = strdup (s);
+  if (result == NULL)
+    {
+      perror ("strdup");
+      exit (EXIT_FAILURE);
+    }
+  return result;
+}
+
 #define REG_ROOT "SOFTWARE\\GNU\\Emacs"
 
 /* Retrieve an environment variable from the Emacs subkeys of the registry.
@@ -335,9 +344,11 @@ w32_get_resource (HKEY predefined, char *key, LPDWORD type)
 /*
   getenv wrapper for Windows
 
-  This is needed to duplicate Emacs's behavior, which is to look for environment
-  variables in the registry if they don't appear in the environment.
-*/
+  Value is allocated on the heap, and can be free'd.
+
+  This is needed to duplicate Emacs's behavior, which is to look for
+  environment variables in the registry if they don't appear in the
+  environment.  */
 char *
 w32_getenv (char *envvar)
 {
@@ -345,8 +356,9 @@ w32_getenv (char *envvar)
   DWORD dwType;
 
   if (value = getenv (envvar))
-    /* Found in the environment.  */
-    return value;
+    /* Found in the environment.  strdup it, because values returned
+       by getenv cannot be free'd.  */
+    return xstrdup (value);
 
   if (! (value = w32_get_resource (HKEY_CURRENT_USER, envvar, &dwType)) &&
       ! (value = w32_get_resource (HKEY_LOCAL_MACHINE, envvar, &dwType)))
@@ -473,14 +485,15 @@ ttyname (int fd)
 
 /* Display a normal or error message.
    On Windows, use a message box if compiled as a Windows app.  */
-void
-message (int is_error, const char *message, ...)
+static void message (int, const char *, ...) ATTRIBUTE_FORMAT_PRINTF (2, 3);
+static void
+message (int is_error, const char *format, ...)
 {
   char msg[2048];
   va_list args;
 
-  va_start (args, message);
-  vsprintf (msg, message, args);
+  va_start (args, format);
+  vsprintf (msg, format, args);
   va_end (args);
 
 #ifdef WINDOWSNT
@@ -504,7 +517,7 @@ message (int is_error, const char *message, ...)
 /* Decode the options from argv and argc.
    The global variable `optind' will say how many arguments we used up.  */
 
-void
+static void
 decode_options (int argc, char **argv)
 {
   alternate_editor = egetenv ("ALTERNATE_EDITOR");
@@ -513,9 +526,9 @@ decode_options (int argc, char **argv)
     {
       int opt = getopt_long_only (argc, argv,
 #ifndef NO_SOCKETS_IN_FILE_SYSTEM
-                             "VHnea:s:f:d:tc",
+                             "VHneqa:s:f:d:tc",
 #else
-                             "VHnea:f:d:tc",
+                             "VHneqa:f:d:tc",
 #endif
                              longopts, 0);
 
@@ -559,6 +572,10 @@ decode_options (int argc, char **argv)
           eval = 1;
           break;
 
+        case 'q':
+          quiet = 1;
+          break;
+
         case 'V':
           message (FALSE, "emacsclient %s\n", VERSION);
           exit (EXIT_SUCCESS);
@@ -630,7 +647,7 @@ an empty string");
 }
 
 
-void
+static void
 print_help_and_exit (void)
 {
   /* Spaces and tabs are significant in this message; they're chosen so the
@@ -650,6 +667,7 @@ The following OPTIONS are accepted:\n\
                         use the current Emacs frame\n\
 -e, --eval              Evaluate the FILE arguments as ELisp expressions\n\
 -n, --no-wait           Don't wait for the server to return\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"
@@ -675,7 +693,7 @@ Report bugs with M-x report-emacs-bug.\n", progname);
   defined-- exit with an errorcode.
   Uses argv, but gets it from the global variable main_argv.
 */
-void
+static void
 fail (void)
 {
   if (alternate_editor)
@@ -718,7 +736,7 @@ HSOCKET emacs_socket = 0;
 
 /* On Windows, the socket library was historically separate from the standard
    C library, so errors are handled differently.  */
-void
+static void
 sock_err_message (const char *function_name)
 {
 #ifdef WINDOWSNT
@@ -742,7 +760,7 @@ sock_err_message (const char *function_name)
    - the data ends in "\n", or
    - the buffer is full (but this shouldn't happen)
    Otherwise, we just accumulate it.  */
-void
+static void
 send_to_emacs (HSOCKET s, const char *data)
 {
   while (data)
@@ -781,7 +799,7 @@ send_to_emacs (HSOCKET s, const char *data)
    return value never contains a space.
 
    Does not change the string.  Outputs the result to S.  */
-void
+static void
 quote_argument (HSOCKET s, const char *str)
 {
   char *copy = (char *) xmalloc (strlen (str) * 2 + 1);
@@ -822,7 +840,7 @@ quote_argument (HSOCKET s, const char *str)
 /* The inverse of quote_argument.  Removes quoting in string STR by
    modifying the string in place.   Returns STR. */
 
-char *
+static char *
 unquote_argument (char *str)
 {
   char *p, *q;
@@ -853,7 +871,7 @@ unquote_argument (char *str)
 }
 
 
-int
+static int
 file_name_absolute_p (const char *filename)
 {
   /* Sanity check, it shouldn't happen.  */
@@ -907,7 +925,7 @@ initialize_sockets (void)
  * Read the information needed to set up a TCP comm channel with
  * the Emacs server: host, port, and authentication string.
  */
-int
+static int
 get_server_config (struct sockaddr_in *server, char *authentication)
 {
   char dotted[32];
@@ -918,7 +936,7 @@ get_server_config (struct sockaddr_in *server, char *authentication)
     config = fopen (server_file, "rb");
   else
     {
-      char *home = egetenv ("HOME");
+      const char *home = egetenv ("HOME");
 
       if (home)
         {
@@ -965,7 +983,7 @@ get_server_config (struct sockaddr_in *server, char *authentication)
   return TRUE;
 }
 
-HSOCKET
+static HSOCKET
 set_tcp_socket (void)
 {
   HSOCKET s;
@@ -976,7 +994,7 @@ set_tcp_socket (void)
   if (! get_server_config (&server, auth_string))
     return INVALID_SOCKET;
 
-  if (server.sin_addr.s_addr != inet_addr ("127.0.0.1"))
+  if (server.sin_addr.s_addr != inet_addr ("127.0.0.1") && !quiet)
     message (FALSE, "%s: connected to remote socket at %s\n",
              progname, inet_ntoa (server.sin_addr));
 
@@ -1024,11 +1042,11 @@ strprefix (const char *prefix, const char *string)
    and the name in TTY_NAME, and return 1.  Otherwise, fail if NOABORT
    is zero, or return 0 if NOABORT is non-zero.  */
 
-int
-find_tty (char **tty_type, char **tty_name, int noabort)
+static int
+find_tty (const char **tty_type, const char **tty_name, int noabort)
 {
-  char *type = egetenv ("TERM");
-  char *name = ttyname (fileno (stdout));
+  const char *type = egetenv ("TERM");
+  const char *name = ttyname (fileno (stdout));
 
   if (!name)
     {
@@ -1080,11 +1098,11 @@ find_tty (char **tty_type, char **tty_name, int noabort)
    0 - success: none of the above */
 
 static int
-socket_status (char *socket_name)
+socket_status (const char *name)
 {
   struct stat statbfr;
 
-  if (stat (socket_name, &statbfr) == -1)
+  if (stat (name, &statbfr) == -1)
     return 2;
 
   if (statbfr.st_uid != geteuid ())
@@ -1097,7 +1115,7 @@ socket_status (char *socket_name)
 /* A signal handler that passes the signal to the Emacs process.
    Useful for SIGWINCH.  */
 
-SIGTYPE
+static void
 pass_signal_to_emacs (int signalnum)
 {
   int old_errno = errno;
@@ -1112,7 +1130,7 @@ pass_signal_to_emacs (int signalnum)
 /* Signal handler for SIGCONT; notify the Emacs process that it can
    now resume our tty frame.  */
 
-SIGTYPE
+static void
 handle_sigcont (int signalnum)
 {
   int old_errno = errno;
@@ -1138,7 +1156,7 @@ handle_sigcont (int signalnum)
    reality, we may get a SIGTSTP on C-z.  Handling this signal and
    notifying Emacs about it should get things under control again. */
 
-SIGTYPE
+static void
 handle_sigtstp (int signalnum)
 {
   int old_errno = errno;
@@ -1162,7 +1180,7 @@ handle_sigtstp (int signalnum)
 
 /* Set up signal handlers before opening a frame on the current tty.  */
 
-void
+static void
 init_signals (void)
 {
   /* Set up signal handlers. */
@@ -1182,7 +1200,7 @@ init_signals (void)
 }
 
 
-HSOCKET
+static HSOCKET
 set_local_socket (void)
 {
   HSOCKET s;
@@ -1205,7 +1223,7 @@ set_local_socket (void)
     int default_sock = !socket_name;
     int saved_errno = 0;
     const char *server_name = "server";
-    const char *tmpdir;
+    const char *tmpdir IF_LINT ( = NULL);
 
     if (socket_name && !strchr (socket_name, '/')
         && !strchr (socket_name, '\\'))
@@ -1260,10 +1278,10 @@ set_local_socket (void)
            associated with the name.  This is reminiscent of the logic
            that init_editfns uses to set the global Vuser_full_name.  */
 
-        char *user_name = (char *) egetenv ("LOGNAME");
+        const char *user_name = egetenv ("LOGNAME");
 
         if (!user_name)
-          user_name = (char *) egetenv ("USER");
+          user_name = egetenv ("USER");
 
         if (user_name)
           {
@@ -1331,7 +1349,7 @@ To start the server in Emacs, type \"M-x server-start\".\n",
 }
 #endif /* ! NO_SOCKETS_IN_FILE_SYSTEM */
 
-HSOCKET
+static HSOCKET
 set_socket (int no_exit_if_error)
 {
   HSOCKET s;
@@ -1447,7 +1465,7 @@ w32_give_focus (void)
 
 /* Start the emacs daemon and try to connect to it.  */
 
-void
+static void
 start_daemon_and_retry_set_socket (void)
 {
 #ifndef WINDOWSNT
@@ -1483,8 +1501,8 @@ start_daemon_and_retry_set_socket (void)
   else
     {
       char emacs[] = "emacs";
-      char daemon[] = "--daemon";
-      char *d_argv[] = {emacs, daemon, 0 };
+      char daemon_option[] = "--daemon";
+      char *d_argv[] = {emacs, daemon_option, 0 };
       if (socket_name != NULL)
         {
           /* Pass  --daemon=socket_name as argument.  */
@@ -1504,10 +1522,12 @@ start_daemon_and_retry_set_socket (void)
 int
 main (int argc, char **argv)
 {
-  int i, rl, needlf = 0;
+  int rl = 0, needlf = 0;
   char *cwd, *str;
   char string[BUFSIZ+1];
-  int null_socket_name, null_server_file, start_daemon_if_needed;
+  int null_socket_name IF_LINT ( = 0);
+  int null_server_file IF_LINT ( = 0);
+  int start_daemon_if_needed;
   int exit_status = EXIT_SUCCESS;
 
   main_argv = argv;
@@ -1543,21 +1563,21 @@ main (int argc, char **argv)
       null_server_file = (server_file == NULL);
     }
 
-  if ((emacs_socket = set_socket (alternate_editor
-                                  || start_daemon_if_needed)) == INVALID_SOCKET)
-    if (start_daemon_if_needed)
-      {
-        /* Reset socket_name and server_file if they were NULL
-           before the set_socket call.  */
-        if (null_socket_name)
-          socket_name = NULL;
-        if (null_server_file)
-          server_file = NULL;
-
-        start_daemon_and_retry_set_socket ();
-      }
-    else
-      fail ();
+  emacs_socket = set_socket (alternate_editor || start_daemon_if_needed);
+  if (emacs_socket == INVALID_SOCKET)
+    {
+      if (! start_daemon_if_needed)
+        fail ();
+
+      /* Reset socket_name and server_file if they were NULL
+         before the set_socket call.  */
+      if (null_socket_name)
+        socket_name = NULL;
+      if (null_server_file)
+        server_file = NULL;
+
+      start_daemon_and_retry_set_socket ();
+    }
 
   cwd = get_current_dir_name ();
   if (cwd == 0)
@@ -1615,7 +1635,7 @@ main (int argc, char **argv)
      frame is available.  */
   if (tty || (current_frame && !eval))
     {
-      char *tty_type, *tty_name;
+      const char *tty_type, *tty_name;
 
       if (find_tty (&tty_type, &tty_name, !tty))
         {
@@ -1635,6 +1655,7 @@ main (int argc, char **argv)
 
   if ((argc - optind > 0))
     {
+      int i;
       for (i = optind; i < argc; i++)
         {
 
@@ -1699,7 +1720,7 @@ main (int argc, char **argv)
   send_to_emacs (emacs_socket, "\n");
 
   /* Wait for an answer. */
-  if (!eval && !tty && !nowait)
+  if (!eval && !tty && !nowait && !quiet)
     {
       printf ("Waiting for Emacs...");
       needlf = 2;
@@ -1708,10 +1729,21 @@ main (int argc, char **argv)
   fsync (1);
 
   /* Now, wait for an answer and print any messages.  */
-  while (exit_status == EXIT_SUCCESS
-         && (rl = recv (emacs_socket, string, BUFSIZ, 0)) > 0)
+  while (exit_status == EXIT_SUCCESS)
     {
       char *p;
+      do
+        {
+          errno = 0;
+          rl = recv (emacs_socket, string, BUFSIZ, 0);
+        }
+      /* If we receive a signal (e.g. SIGWINCH, which we pass
+         through to Emacs), on some OSes we get EINTR and must retry. */
+      while (rl < 0 && errno == EINTR);
+
+      if (rl <= 0)
+        break;
+
       string[rl] = '\0';
 
       p = string + strlen (string) - 1;
diff --git a/lib-src/etags.c b/lib-src/etags.c
index 9471c0fe29f..693c999047f 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -93,8 +93,11 @@ char pot_etags_version[] = "@(#) pot revision number is 17.38.1.4";
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
-  /* On some systems, Emacs defines static as nothing for the sake
-     of unexec.  We don't want that here since we don't use unexec. */
+  /* This is probably not necessary any more.  On some systems, config.h
+     used to define static as nothing for the sake of unexec.  We don't
+     want that here since we don't use unexec.  None of these systems
+     are supported any more, but the idea is still mentioned in
+     etc/PROBLEMS.  */
 # undef static
 # ifndef PTR                    /* for XEmacs */
 #   define PTR void *
@@ -190,10 +193,6 @@ char pot_etags_version[] = "@(#) pot revision number is 17.38.1.4";
 # define assert(x) ((void) 0)
 #endif
 
-#if !defined (S_ISREG) && defined (S_IFREG)
-# define S_ISREG(m)     (((m) & S_IFMT) == S_IFREG)
-#endif
-
 #ifdef NO_LONG_OPTIONS          /* define this if you don't have GNU getopt */
 # define NO_LONG_OPTIONS TRUE
 # define getopt_long(argc,argv,optstr,lopts,lind) getopt (argc, argv, optstr)
@@ -243,7 +242,6 @@ If you want regular expression support, you should delete this notice and
 #define ISLOWER(c)      islower (CHAR(c))
 
 #define lowcase(c)      tolower (CHAR(c))
-#define upcase(c)       toupper (CHAR(c))
 
 
 /*
@@ -2362,14 +2360,7 @@ 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 */
 
-#ifdef __GNUC__
-__inline
-#else
-#ifdef __cplusplus
-inline
-#endif
-#endif
-static unsigned int
+static inline unsigned int
 hash (register const char *str, register unsigned int len)
 {
   static unsigned char asso_values[] =
@@ -3983,10 +3974,8 @@ Yacc_entries (FILE *inf)
 static void
 just_read_file (FILE *inf)
 {
-  register char *dummy;
-
-  LOOP_ON_INPUT_LINES (inf, lb, dummy)
-    continue;
+  while (!feof (inf))
+    readline (&lb, inf);
 }
 
 
@@ -4203,7 +4192,7 @@ Ada_funcs (FILE *inf)
           /* Skip a string i.e. "abcd". */
           if (inquote || (*dbp == '"'))
             {
-              dbp = etags_strchr ((inquote) ? dbp : dbp+1, '"');
+              dbp = etags_strchr (dbp + !inquote, '"');
               if (dbp != NULL)
                 {
                   inquote = FALSE;
@@ -5259,16 +5248,16 @@ HTML_labels (FILE *inf)
  * Original code by Sunichirou Sugou (1989)
  * Rewritten by Anders Lindgren (1996)
  */
-static int prolog_pr (char *, char *);
+static size_t prolog_pr (char *, char *);
 static void prolog_skip_comment (linebuffer *, FILE *);
-static int prolog_atom (char *, int);
+static size_t prolog_atom (char *, size_t);
 
 static void
 Prolog_functions (FILE *inf)
 {
   char *cp, *last;
-  int len;
-  int allocated;
+  size_t len;
+  size_t allocated;
 
   allocated = 0;
   len = 0;
@@ -5325,16 +5314,16 @@ prolog_skip_comment (linebuffer *plb, FILE *inf)
  * Return the size of the name of the predicate or rule, or 0 if no
  * header was found.
  */
-static int
+static size_t
 prolog_pr (char *s, char *last)
-             
+
                                 /* Name of last clause. */
 {
-  int pos;
-  int len;
+  size_t pos;
+  size_t len;
 
   pos = prolog_atom (s, 0);
-  if (pos < 1)
+  if (! pos)
     return 0;
 
   len = pos;
@@ -5344,7 +5333,7 @@ prolog_pr (char *s, char *last)
        || (s[pos] == '(' && (pos += 1))
        || (s[pos] == ':' && s[pos + 1] == '-' && (pos += 2)))
       && (last == NULL          /* save only the first clause */
-          || len != (int)strlen (last)
+          || len != strlen (last)
           || !strneq (s, last, len)))
         {
           make_tag (s, len, TRUE, s, pos, lineno, linecharno);
@@ -5356,17 +5345,17 @@ prolog_pr (char *s, char *last)
 
 /*
  * Consume a Prolog atom.
- * Return the number of bytes consumed, or -1 if there was an error.
+ * Return the number of bytes consumed, or 0 if there was an error.
  *
  * A prolog atom, in this context, could be one of:
  * - An alphanumeric sequence, starting with a lower case letter.
  * - A quoted arbitrary string. Single quotes can escape themselves.
  *   Backslash quotes everything.
  */
-static int
-prolog_atom (char *s, int pos)
+static size_t
+prolog_atom (char *s, size_t pos)
 {
-  int origpos;
+  size_t origpos;
 
   origpos = pos;
 
@@ -5395,11 +5384,11 @@ prolog_atom (char *s, int pos)
             }
           else if (s[pos] == '\0')
             /* Multiline quoted atoms are ignored. */
-            return -1;
+            return 0;
           else if (s[pos] == '\\')
             {
               if (s[pos+1] == '\0')
-                return -1;
+                return 0;
               pos += 2;
             }
           else
@@ -5408,7 +5397,7 @@ prolog_atom (char *s, int pos)
       return pos - origpos;
     }
   else
-    return -1;
+    return 0;
 }
 
 
@@ -5484,7 +5473,7 @@ Erlang_functions (FILE *inf)
  */
 static int
 erlang_func (char *s, char *last)
-             
+
                                 /* Name of last clause. */
 {
   int pos;
@@ -6642,7 +6631,7 @@ filename_is_absolute (char *fn)
           );
 }
 
-/* Upcase DOS drive letter and collapse separators into single slashes.
+/* Downcase DOS drive letter and collapse separators into single slashes.
    Works in place. */
 static void
 canonicalize_filename (register char *fn)
@@ -6652,8 +6641,9 @@ canonicalize_filename (register char *fn)
 
 #ifdef DOS_NT
   /* Canonicalize drive letter case.  */
-  if (fn[0] != '\0' && fn[1] == ':' && ISLOWER (fn[0]))
-    fn[0] = upcase (fn[0]);
+# define ISUPPER(c)     isupper (CHAR(c))
+  if (fn[0] != '\0' && fn[1] == ':' && ISUPPER (fn[0]))
+    fn[0] = lowcase (fn[0]);
 
   sep = '\\';
 #endif
diff --git a/lib-src/fakemail.c b/lib-src/fakemail.c
deleted file mode 100644
index 4289e009e44..00000000000
--- a/lib-src/fakemail.c
+++ /dev/null
@@ -1,739 +0,0 @@
-/* sendmail-like interface to /bin/mail for system V,
-   Copyright (C) 1985, 1994, 1999, 2001-2011  Free Software Foundation, Inc.
-
-Author: Bill Rozas <jinx@martigny.ai.mit.edu>
-(according to ack.texi)
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-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/>.  */
-
-
-#define _XOPEN_SOURCE 500       /* for cuserid */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#if defined (BSD_SYSTEM) && !defined (USE_FAKEMAIL)
-/* This program isnot used in BSD, so just avoid loader complaints.  */
-int
-main (void)
-{
-  return 0;
-}
-#else /* not BSD 4.2 (or newer) */
-#ifdef MSDOS
-int
-main ()
-{
-  return 0;
-}
-#else /* not MSDOS */
-/* This conditional contains all the rest of the file.  */
-
-/* These are defined in config in some versions. */
-
-#ifdef static
-#undef static
-#endif
-
-#ifdef WINDOWSNT
-#include "ntlib.h"
-#endif
-
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-#include <time.h>
-#include <pwd.h>
-#include <stdlib.h>
-
-/* This is to declare cuserid.  */
-#include <unistd.h>
-
-/* Type definitions */
-
-#define boolean int
-#define true 1
-#define false 0
-
-#define TM_YEAR_BASE 1900
-
-/* Nonzero if TM_YEAR is a struct tm's tm_year value that causes
-   asctime to have well-defined behavior.  */
-#ifndef TM_YEAR_IN_ASCTIME_RANGE
-# define TM_YEAR_IN_ASCTIME_RANGE(tm_year) \
-    (1000 - TM_YEAR_BASE <= (tm_year) && (tm_year) <= 9999 - TM_YEAR_BASE)
-#endif
-
-/* Various lists */
-
-struct line_record
-{
-  char *string;
-  struct line_record *continuation;
-};
-typedef struct line_record *line_list;
-
-struct header_record
-{
-  line_list text;
-  struct header_record *next;
-  struct header_record *previous;
-};
-typedef struct header_record *header;
-
-struct stream_record
-{
-  FILE *handle;
-  int (*action)(FILE *);
-  struct stream_record *rest_streams;
-};
-typedef struct stream_record *stream_list;
-
-/* A `struct linebuffer' is a structure which holds a line of text.
- * `readline' reads a line from a stream into a linebuffer
- * and works regardless of the length of the line.
- */
-
-struct linebuffer
-{
-  long size;
-  char *buffer;
-};
-
-struct linebuffer lb;
-
-#define new_list()                                      \
-  ((line_list) xmalloc (sizeof (struct line_record)))
-#define new_header()                            \
-  ((header) xmalloc (sizeof (struct header_record)))
-#define new_stream()                            \
-  ((stream_list) xmalloc (sizeof (struct stream_record)))
-#define alloc_string(nchars)                            \
-  ((char *) xmalloc ((nchars) + 1))
-
-/* Global declarations */
-
-#define BUFLEN 1024
-#define KEYWORD_SIZE 256
-#define FROM_PREFIX "From"
-#define MY_NAME "fakemail"
-#define NIL ((line_list) NULL)
-#define INITIAL_LINE_SIZE 200
-
-#ifndef MAIL_PROGRAM_NAME
-#define MAIL_PROGRAM_NAME "/bin/mail"
-#endif
-
-static const char *my_name;
-static char *the_date;
-static char *the_user;
-static line_list file_preface;
-static stream_list the_streams;
-static boolean no_problems = true;
-
-static void fatal (const char *s1) NO_RETURN;
-
-#ifdef CURRENT_USER
-static struct passwd *my_entry;
-#define cuserid(s)                              \
-(my_entry = getpwuid (((int) geteuid ())),      \
- my_entry->pw_name)
-#endif
-
-/* Utilities */
-
-/* Print error message.  `s1' is printf control string, `s2' is arg for it. */
-
-static void
-error (const char *s1, const char *s2)
-{
-  printf ("%s: ", my_name);
-  printf (s1, s2);
-  printf ("\n");
-  no_problems = false;
-}
-
-/* Print error message and exit.  */
-
-static void
-fatal (const char *s1)
-{
-  error ("%s", s1);
-  exit (EXIT_FAILURE);
-}
-
-/* Like malloc but get fatal error if memory is exhausted.  */
-
-static long *
-xmalloc (int size)
-{
-  long *result = (long *) malloc (((unsigned) size));
-  if (result == ((long *) NULL))
-    fatal ("virtual memory exhausted");
-  return result;
-}
-
-static long *
-xrealloc (long int *ptr, int size)
-{
-  long *result = (long *) realloc (ptr, ((unsigned) size));
-  if (result == ((long *) NULL))
-    fatal ("virtual memory exhausted");
-  return result;
-}
-
-/* Initialize a linebuffer for use */
-
-void
-init_linebuffer (struct linebuffer *linebuffer)
-{
-  linebuffer->size = INITIAL_LINE_SIZE;
-  linebuffer->buffer = ((char *) xmalloc (INITIAL_LINE_SIZE));
-}
-
-/* Read a line of text from `stream' into `linebuffer'.
-   Return the length of the line.  */
-
-long
-readline (struct linebuffer *linebuffer, FILE *stream)
-{
-  char *buffer = linebuffer->buffer;
-  char *p = linebuffer->buffer;
-  char *end = p + linebuffer->size;
-
-  while (true)
-    {
-      int c = getc (stream);
-      if (p == end)
-        {
-          linebuffer->size *= 2;
-          buffer = ((char *) xrealloc ((long *)buffer, linebuffer->size));
-          p = buffer + (p - linebuffer->buffer);
-          end = buffer + linebuffer->size;
-          linebuffer->buffer = buffer;
-        }
-      if (c < 0 || c == '\n')
-        {
-          *p = 0;
-          break;
-        }
-      *p++ = c;
-    }
-
-  return p - buffer;
-}
-
-/* Extract a colon-terminated keyword from the string FIELD.
-   Return that keyword as a string stored in a static buffer.
-   Store the address of the rest of the string into *REST.
-
-   If there is no keyword, return NULL and don't alter *REST.  */
-
-char *
-get_keyword (register char *field, char **rest)
-{
-  static char keyword[KEYWORD_SIZE];
-  register char *ptr;
-  register int c;
-
-  ptr = &keyword[0];
-  c = (unsigned char) *field++;
-  if (isspace (c) || c == ':')
-    return ((char *) NULL);
-  *ptr++ = (islower (c) ? toupper (c) : c);
-  while (((c = (unsigned char) *field++) != ':') && ! isspace (c))
-    *ptr++ = (islower (c) ? toupper (c) : c);
-  *ptr++ = '\0';
-  while (isspace (c))
-    c = (unsigned char) *field++;
-  if (c != ':')
-    return ((char *) NULL);
-  *rest = field;
-  return &keyword[0];
-}
-
-/* Nonzero if the string FIELD starts with a colon-terminated keyword.  */
-
-boolean
-has_keyword (char *field)
-{
-  char *ignored;
-  return (get_keyword (field, &ignored) != ((char *) NULL));
-}
-
-/* Store the string FIELD, followed by any lines in THE_LIST,
-   into the buffer WHERE.
-   Concatenate lines, putting just a space between them.
-   Delete everything contained in parentheses.
-   When a recipient name contains <...>, we discard
-   everything except what is inside the <...>.
-
-   We don't pay attention to overflowing WHERE;
-   the caller has to make it big enough.  */
-
-char *
-add_field (line_list the_list, register char *field, register char *where)
-{
-  register char c;
-  while (true)
-    {
-      char *this_recipient_where;
-      int in_quotes = 0;
-
-      *where++ = ' ';
-      this_recipient_where = where;
-
-      while ((c = *field++) != '\0')
-        {
-          if (c == '\\')
-            *where++ = c;
-          else if (c == '"')
-            {
-              in_quotes = ! in_quotes;
-              *where++ = c;
-            }
-          else if (in_quotes)
-            *where++ = c;
-          else if (c == '(')
-            {
-              while (*field && *field != ')') ++field;
-              if (! (*field++)) break; /* no close */
-              continue;
-            }
-          else if (c == ',')
-            {
-              *where++ = ' ';
-              /* When we get to the end of one recipient,
-                 don't discard it if the next one has <...>.  */
-              this_recipient_where = where;
-            }
-          else if (c == '<')
-            /* Discard everything we got before the `<'.  */
-            where = this_recipient_where;
-          else if (c == '>')
-            /* Discard the rest of this name that follows the `>'.  */
-            {
-              while (*field && *field != ',') ++field;
-              if (! (*field++)) break; /* no comma */
-              continue;
-            }
-          else
-            *where++ = c;
-        }
-      if (the_list == NIL) break;
-      field = the_list->string;
-      the_list = the_list->continuation;
-    }
-  return where;
-}
-
-line_list
-make_file_preface (void)
-{
-  char *the_string, *temp;
-  long idiotic_interface;
-  struct tm *tm;
-  long prefix_length;
-  long user_length;
-  long date_length;
-  line_list result;
-
-  prefix_length = strlen (FROM_PREFIX);
-  time (&idiotic_interface);
-  /* Convert to a string, checking for out-of-range time stamps.
-     Don't use 'ctime', as that might dump core if the hardware clock
-     is set to a bizarre value.  */
-  tm = localtime (&idiotic_interface);
-  if (! (tm && TM_YEAR_IN_ASCTIME_RANGE (tm->tm_year)
-         && (the_date = asctime (tm))))
-    fatal ("current time is out of range");
-  /* the_date has an unwanted newline at the end */
-  date_length = strlen (the_date) - 1;
-  the_date[date_length] = '\0';
-  temp = cuserid ((char *) NULL);
-  user_length = strlen (temp);
-  the_user = alloc_string (user_length + 1);
-  strcpy (the_user, temp);
-  the_string = alloc_string (3 + prefix_length
-                             + user_length
-                             + date_length);
-  temp = the_string;
-  strcpy (temp, FROM_PREFIX);
-  temp = &temp[prefix_length];
-  *temp++ = ' ';
-  strcpy (temp, the_user);
-  temp = &temp[user_length];
-  *temp++ = ' ';
-  strcpy (temp, the_date);
-  result = new_list ();
-  result->string = the_string;
-  result->continuation = ((line_list) NULL);
-  return result;
-}
-
-void
-write_line_list (register line_list the_list, FILE *the_stream)
-{
-  for ( ;
-      the_list != ((line_list) NULL) ;
-      the_list = the_list->continuation)
-    {
-      fputs (the_list->string, the_stream);
-      putc ('\n', the_stream);
-    }
-  return;
-}
-
-int
-close_the_streams (void)
-{
-  register stream_list rem;
-  for (rem = the_streams;
-       rem != ((stream_list) NULL);
-       rem = rem->rest_streams)
-    no_problems = (no_problems &&
-                   ((*rem->action) (rem->handle) == 0));
-  the_streams = ((stream_list) NULL);
-  return (no_problems ? EXIT_SUCCESS : EXIT_FAILURE);
-}
-
-void
-add_a_stream (FILE *the_stream, int (*closing_action) (FILE *))
-{
-  stream_list old = the_streams;
-  the_streams = new_stream ();
-  the_streams->handle = the_stream;
-  the_streams->action = closing_action;
-  the_streams->rest_streams = old;
-  return;
-}
-
-int
-my_fclose (FILE *the_file)
-{
-  putc ('\n', the_file);
-  fflush (the_file);
-  return fclose (the_file);
-}
-
-boolean
-open_a_file (char *name)
-{
-  FILE *the_stream = fopen (name, "a");
-  if (the_stream != ((FILE *) NULL))
-    {
-      add_a_stream (the_stream, my_fclose);
-      if (the_user == ((char *) NULL))
-        file_preface = make_file_preface ();
-      write_line_list (file_preface, the_stream);
-      return true;
-    }
-  return false;
-}
-
-void
-put_string (char *s)
-{
-  register stream_list rem;
-  for (rem = the_streams;
-       rem != ((stream_list) NULL);
-       rem = rem->rest_streams)
-    fputs (s, rem->handle);
-  return;
-}
-
-void
-put_line (const char *string)
-{
-  register stream_list rem;
-  for (rem = the_streams;
-       rem != ((stream_list) NULL);
-       rem = rem->rest_streams)
-    {
-      const char *s = string;
-      int column = 0;
-
-      /* Divide STRING into lines.  */
-      while (*s != 0)
-        {
-          const char *breakpos;
-
-          /* Find the last char that fits.  */
-          for (breakpos = s; *breakpos && column < 78; ++breakpos)
-            {
-              if (*breakpos == '\t')
-                column += 8;
-              else
-                column++;
-            }
-          /* If we didn't reach end of line, break the line.  */
-          if (*breakpos)
-            {
-              /* Back up to just after the last comma that fits.  */
-              while (breakpos != s && breakpos[-1] != ',') --breakpos;
-
-              if (breakpos == s)
-                {
-                  /* If no comma fits, move past the first address anyway.  */
-                  while (*breakpos != 0 && *breakpos != ',') ++breakpos;
-                  if (*breakpos != 0)
-                    /* Include the comma after it.  */
-                    ++breakpos;
-                }
-            }
-          /* Output that much, then break the line.  */
-          fwrite (s, 1, breakpos - s, rem->handle);
-          column = 8;
-
-          /* Skip whitespace and prepare to print more addresses.  */
-          s = breakpos;
-          while (*s == ' ' || *s == '\t') ++s;
-          if (*s != 0)
-            fputs ("\n\t", rem->handle);
-        }
-      putc ('\n', rem->handle);
-    }
-  return;
-}
-
-#define mail_error error
-
-/* Handle an FCC field.  FIELD is the text of the first line (after
-   the header name), and THE_LIST holds the continuation lines if any.
-   Call open_a_file for each file.  */
-
-void
-setup_files (register line_list the_list, register char *field)
-{
-  register char *start;
-  register char c;
-  while (true)
-    {
-      while (((c = *field) != '\0')
-             && (c == ' '
-                 || c == '\t'
-                 || c == ','))
-        field += 1;
-      if (c != '\0')
-        {
-          start = field;
-          while (((c = *field) != '\0')
-                 && c != ' '
-                 && c != '\t'
-                 && c != ',')
-            field += 1;
-          *field = '\0';
-          if (!open_a_file (start))
-            mail_error ("Could not open file %s", start);
-          *field = c;
-          if (c != '\0') continue;
-        }
-      if (the_list == ((line_list) NULL))
-        return;
-      field = the_list->string;
-      the_list = the_list->continuation;
-    }
-}
-
-/* Compute the total size of all recipient names stored in THE_HEADER.
-   The result says how big to make the buffer to pass to parse_header.  */
-
-int
-args_size (header the_header)
-{
-  register header old = the_header;
-  register line_list rem;
-  register int size = 0;
-  do
-    {
-      char *field;
-      register char *keyword = get_keyword (the_header->text->string, &field);
-      if ((strcmp (keyword, "TO") == 0)
-          || (strcmp (keyword, "CC") == 0)
-          || (strcmp (keyword, "BCC") == 0))
-        {
-          size += 1 + strlen (field);
-          for (rem = the_header->text->continuation;
-               rem != NIL;
-               rem = rem->continuation)
-            size += 1 + strlen (rem->string);
-        }
-      the_header = the_header->next;
-    } while (the_header != old);
-  return size;
-}
-
-/* Scan the header described by the lists THE_HEADER,
-   and put all recipient names into the buffer WHERE.
-   Precede each recipient name with a space.
-
-   Also, if the header has any FCC fields, call setup_files for each one.  */
-
-void
-parse_header (header the_header, register char *where)
-{
-  register header old = the_header;
-  do
-    {
-      char *field;
-      register char *keyword = get_keyword (the_header->text->string, &field);
-      if (strcmp (keyword, "TO") == 0)
-        where = add_field (the_header->text->continuation, field, where);
-      else if (strcmp (keyword, "CC") == 0)
-        where = add_field (the_header->text->continuation, field, where);
-      else if (strcmp (keyword, "BCC") == 0)
-        {
-          where = add_field (the_header->text->continuation, field, where);
-          the_header->previous->next = the_header->next;
-          the_header->next->previous = the_header->previous;
-        }
-      else if (strcmp (keyword, "FCC") == 0)
-        setup_files (the_header->text->continuation, field);
-      the_header = the_header->next;
-    } while (the_header != old);
-  *where = '\0';
-  return;
-}
-
-/* Read lines from the input until we get a blank line.
-   Create a list of `header' objects, one for each header field,
-   each of which points to a list of `line_list' objects,
-   one for each line in that field.
-   Continuation lines are grouped in the headers they continue.  */
-
-header
-read_header (void)
-{
-  register header the_header = ((header) NULL);
-  register line_list *next_line = ((line_list *) NULL);
-
-  init_linebuffer (&lb);
-
-  do
-    {
-      long length;
-      register char *line;
-
-      readline (&lb, stdin);
-      line = lb.buffer;
-      length = strlen (line);
-      if (length == 0) break;
-
-      if (has_keyword (line))
-        {
-          register header old = the_header;
-          the_header = new_header ();
-          if (old == ((header) NULL))
-            {
-              the_header->next = the_header;
-              the_header->previous = the_header;
-            }
-          else
-            {
-              the_header->previous = old;
-              the_header->next = old->next;
-              old->next = the_header;
-            }
-          next_line = &(the_header->text);
-        }
-
-      if (next_line == ((line_list *) NULL))
-        {
-          /* Not a valid header */
-          exit (EXIT_FAILURE);
-        }
-      *next_line = new_list ();
-      (*next_line)->string = alloc_string (length);
-      strcpy (((*next_line)->string), line);
-      next_line = &((*next_line)->continuation);
-      *next_line = NIL;
-
-    } while (true);
-
-  if (! the_header)
-    fatal ("input message has no header");
-  return the_header->next;
-}
-
-void
-write_header (header the_header)
-{
-  register header old = the_header;
-  do
-    {
-      register line_list the_list;
-      for (the_list = the_header->text;
-           the_list != NIL;
-           the_list = the_list->continuation)
-        put_line (the_list->string);
-      the_header = the_header->next;
-    } while (the_header != old);
-  put_line ("");
-  return;
-}
-
-int
-main (int argc, char **argv)
-{
-  char *command_line;
-  header the_header;
-  long name_length;
-  const char *mail_program_name;
-  char buf[BUFLEN + 1];
-  register int size;
-  FILE *the_pipe;
-
-  mail_program_name = getenv ("FAKEMAILER");
-  if (!(mail_program_name && *mail_program_name))
-    mail_program_name = MAIL_PROGRAM_NAME;
-  name_length = strlen (mail_program_name);
-
-  my_name = MY_NAME;
-  the_streams = ((stream_list) NULL);
-  the_date = ((char *) NULL);
-  the_user = ((char *) NULL);
-
-  the_header = read_header ();
-  command_line = alloc_string (name_length + args_size (the_header));
-  strcpy (command_line, mail_program_name);
-  parse_header (the_header, &command_line[name_length]);
-
-  the_pipe = popen (command_line, "w");
-  if (the_pipe == ((FILE *) NULL))
-    fatal ("cannot open pipe to real mailer");
-
-  add_a_stream (the_pipe, pclose);
-
-  write_header (the_header);
-
-  /* Dump the message itself */
-
-  while (!feof (stdin))
-    {
-      size = fread (buf, 1, BUFLEN, stdin);
-      buf[size] = '\0';
-      put_string (buf);
-    }
-
-  exit (close_the_streams ());
-}
-
-#endif /* not MSDOS */
-#endif /* not BSD 4.2 (or newer) */
-
-
-/* fakemail.c ends here */
diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index 8addbda0489..ba54202954b 100644
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -41,11 +41,11 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #undef chdir
 
 #include <stdio.h>
+#include <stdlib.h>
 #ifdef MSDOS
 #include <fcntl.h>
 #endif /* MSDOS */
 #ifdef WINDOWSNT
-#include <stdlib.h>
 #include <fcntl.h>
 #include <direct.h>
 #endif /* WINDOWSNT */
@@ -66,10 +66,19 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define IS_DIRECTORY_SEP(_c_) ((_c_) == DIRECTORY_SEP)
 #endif
 
-int scan_file (char *filename);
-int scan_lisp_file (const char *filename, const char *mode);
-int scan_c_file (char *filename, const char *mode);
-void fatal (const char *s1, const char *s2) NO_RETURN;
+/* Use this to suppress gcc's `...may be used before initialized' warnings. */
+#ifdef lint
+# define IF_LINT(Code) Code
+#else
+# define IF_LINT(Code) /* empty */
+#endif
+
+static int scan_file (char *filename);
+static int scan_lisp_file (const char *filename, const char *mode);
+static int scan_c_file (char *filename, const char *mode);
+static void fatal (const char *s1, const char *s2) NO_RETURN;
+static void start_globals (void);
+static void write_globals (void);
 
 #ifdef MSDOS
 /* s/msdos.h defines this as sys_chdir, but we're not linking with the
@@ -85,10 +94,13 @@ FILE *outfile;
 /* Name this program was invoked with.  */
 char *progname;
 
+/* Nonzero if this invocation is generating globals.h.  */
+int generate_globals;
+
 /* Print error message.  `s1' is printf control string, `s2' is arg for it.  */
 
 /* VARARGS1 */
-void
+static void
 error (const char *s1, const char *s2)
 {
   fprintf (stderr, "%s: ", progname);
@@ -99,7 +111,7 @@ error (const char *s1, const char *s2)
 /* Print error message and exit.  */
 
 /* VARARGS1 */
-void
+static void
 fatal (const char *s1, const char *s2)
 {
   error (s1, s2);
@@ -108,7 +120,7 @@ fatal (const char *s1, const char *s2)
 
 /* Like malloc but get fatal error if memory is exhausted.  */
 
-void *
+static void *
 xmalloc (unsigned int size)
 {
   void *result = (void *) malloc (size);
@@ -116,6 +128,18 @@ xmalloc (unsigned int size)
     fatal ("virtual memory exhausted", 0);
   return result;
 }
+
+/* Like realloc but get fatal error if memory is exhausted.  */
+
+static void *
+xrealloc (void *arg, unsigned int size)
+{
+  void *result = (void *) realloc (arg, size);
+  if (result == NULL)
+    fatal ("virtual memory exhausted", 0);
+  return result;
+}
+
 
 int
 main (int argc, char **argv)
@@ -164,10 +188,18 @@ main (int argc, char **argv)
         }
       i += 2;
     }
+  if (argc > i && !strcmp (argv[i], "-g"))
+    {
+      generate_globals = 1;
+      ++i;
+    }
 
   if (outfile == 0)
     fatal ("No output file specified", "");
 
+  if (generate_globals)
+    start_globals ();
+
   first_infile = i;
   for (; i < argc; i++)
     {
@@ -179,11 +211,15 @@ main (int argc, char **argv)
       if (j == i)
         err_count += scan_file (argv[i]);
     }
+
+  if (err_count == 0 && generate_globals)
+    write_globals ();
+
   return (err_count > 0 ? EXIT_FAILURE : EXIT_SUCCESS);
 }
 
 /* Add a source file name boundary marker in the output file.  */
-void
+static void
 put_filename (char *filename)
 {
   char *tmp;
@@ -202,13 +238,14 @@ put_filename (char *filename)
 /* Read file FILENAME and output its doc strings to outfile.  */
 /* Return 1 if file is not found, 0 if it is found.  */
 
-int
+static int
 scan_file (char *filename)
 {
 
   size_t len = strlen (filename);
 
-  put_filename (filename);
+  if (!generate_globals)
+    put_filename (filename);
   if (len > 4 && !strcmp (filename + len - 4, ".elc"))
     return scan_lisp_file (filename, READ_BINARY);
   else if (len > 3 && !strcmp (filename + len - 3, ".el"))
@@ -216,8 +253,16 @@ scan_file (char *filename)
   else
     return scan_c_file (filename, READ_TEXT);
 }
+
+static void
+start_globals (void)
+{
+  fprintf (outfile, "/* This file was auto-generated by make-docfile.  */\n");
+  fprintf (outfile, "/* DO NOT EDIT.  */\n");
+  fprintf (outfile, "struct emacs_globals {\n");
+}
 
-char buf[128];
+static char input_buffer[128];
 
 /* Some state during the execution of `read_c_string_or_comment'.  */
 struct rcsoc_state
@@ -246,7 +291,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 inline void
 put_char (int ch, struct rcsoc_state *state)
 {
   int out_ch;
@@ -350,14 +395,14 @@ scan_keyword_or_put_char (int ch, struct rcsoc_state *state)
    at the beginning of a line will be removed, and *SAW_USAGE set to
    true if any were encountered.  */
 
-int
+static int
 read_c_string_or_comment (FILE *infile, int printflag, int comment, int *saw_usage)
 {
   register int c;
   struct rcsoc_state state;
 
   state.in_file = infile;
-  state.buf_ptr = (printflag < 0 ? buf : 0);
+  state.buf_ptr = (printflag < 0 ? input_buffer : 0);
   state.out_file = (printflag > 0 ? outfile : 0);
   state.pending_spaces = 0;
   state.pending_newlines = 0;
@@ -438,12 +483,12 @@ read_c_string_or_comment (FILE *infile, int printflag, int comment, int *saw_usa
 /* Write to file OUT the argument names of function FUNC, whose text is in BUF.
    MINARGS and MAXARGS are the minimum and maximum number of arguments.  */
 
-void
+static void
 write_c_args (FILE *out, char *func, char *buf, int minargs, int maxargs)
 {
   register char *p;
   int in_ident = 0;
-  char *ident_start;
+  char *ident_start IF_LINT (= NULL);
   size_t ident_length = 0;
 
   fprintf (out, "(fn");
@@ -517,20 +562,109 @@ write_c_args (FILE *out, char *func, char *buf, int minargs, int maxargs)
   putc (')', out);
 }
 
+/* The types of globals.  */
+enum global_type
+{
+  EMACS_INTEGER,
+  BOOLEAN,
+  LISP_OBJECT,
+  INVALID
+};
+
+/* A single global.  */
+struct global
+{
+  enum global_type type;
+  char *name;
+};
+
+/* All the variable names we saw while scanning C sources in `-g'
+   mode.  */
+int num_globals;
+int num_globals_allocated;
+struct global *globals;
+
+static void
+add_global (enum global_type type, char *name)
+{
+  /* Ignore the one non-symbol that can occur.  */
+  if (strcmp (name, "..."))
+    {
+      ++num_globals;
+
+      if (num_globals_allocated == 0)
+        {
+          num_globals_allocated = 100;
+          globals = xmalloc (num_globals_allocated * sizeof (struct global));
+        }
+      else if (num_globals == num_globals_allocated)
+        {
+          num_globals_allocated *= 2;
+          globals = xrealloc (globals,
+                              num_globals_allocated * sizeof (struct global));
+        }
+
+      globals[num_globals - 1].type = type;
+      globals[num_globals - 1].name = name;
+    }
+}
+
+static int
+compare_globals (const void *a, const void *b)
+{
+  const struct global *ga = a;
+  const struct global *gb = b;
+  return strcmp (ga->name, gb->name);
+}
+
+static void
+write_globals (void)
+{
+  int i;
+  qsort (globals, num_globals, sizeof (struct global), compare_globals);
+  for (i = 0; i < num_globals; ++i)
+    {
+      char const *type;
+
+      switch (globals[i].type)
+        {
+        case EMACS_INTEGER:
+          type = "EMACS_INT";
+          break;
+        case BOOLEAN:
+          type = "int";
+          break;
+        case LISP_OBJECT:
+          type = "Lisp_Object";
+          break;
+        default:
+          fatal ("not a recognized DEFVAR_", 0);
+        }
+
+      fprintf (outfile, "  %s f_%s;\n", type, globals[i].name);
+      fprintf (outfile, "#define %s globals.f_%s\n",
+               globals[i].name, globals[i].name);
+      while (i + 1 < num_globals
+             && !strcmp (globals[i].name, globals[i + 1].name))
+        ++i;
+    }
+
+  fprintf (outfile, "};\n");
+  fprintf (outfile, "extern struct emacs_globals globals;\n");
+}
+
+
 /* Read through a c file.  If a .o file is named,
    the corresponding .c or .m file is read instead.
    Looks for DEFUN constructs such as are defined in ../src/lisp.h.
    Accepts any word starting DEF... so it finds DEFSIMPLE and DEFPRED.  */
 
-int
+static int
 scan_c_file (char *filename, const char *mode)
 {
   FILE *infile;
   register int c;
   register int commas;
-  register int defunflag;
-  register int defvarperbufferflag;
-  register int defvarflag;
   int minargs, maxargs;
   int extension = filename[strlen (filename) - 1];
 
@@ -562,6 +696,10 @@ scan_c_file (char *filename, const char *mode)
   while (!feof (infile))
     {
       int doc_keyword = 0;
+      int defunflag = 0;
+      int defvarperbufferflag = 0;
+      int defvarflag = 0;
+      enum global_type type = INVALID;
 
       if (c != '\n' && c != '\r')
         {
@@ -595,12 +733,24 @@ scan_c_file (char *filename, const char *mode)
             continue;
 
           defvarflag = 1;
-          defunflag = 0;
 
           c = getc (infile);
           defvarperbufferflag = (c == 'P');
+          if (generate_globals)
+            {
+              if (c == 'I')
+                type = EMACS_INTEGER;
+              else if (c == 'L')
+                type = LISP_OBJECT;
+              else if (c == 'B')
+                type = BOOLEAN;
+            }
 
           c = getc (infile);
+          /* We need to distinguish between DEFVAR_BOOL and
+             DEFVAR_BUFFER_DEFAULTS.  */
+          if (generate_globals && type == BOOLEAN && c != 'O')
+            type = INVALID;
         }
       else if (c == 'D')
         {
@@ -612,11 +762,13 @@ scan_c_file (char *filename, const char *mode)
             continue;
           c = getc (infile);
           defunflag = c == 'U';
-          defvarflag = 0;
-          defvarperbufferflag = 0;
         }
       else continue;
 
+      if (generate_globals && (!defvarflag || defvarperbufferflag
+                               || type == INVALID))
+        continue;
+
       while (c != '(')
         {
           if (c < 0)
@@ -630,6 +782,34 @@ scan_c_file (char *filename, const char *mode)
         continue;
       c = read_c_string_or_comment (infile, -1, 0, 0);
 
+      if (generate_globals)
+        {
+          int i = 0;
+          char *name;
+
+          /* Skip "," and whitespace.  */
+          do
+            {
+              c = getc (infile);
+            }
+          while (c == ',' || c == ' ' || c == '\t' || c == '\n' || c == '\r');
+
+          /* Read in the identifier.  */
+          do
+            {
+              input_buffer[i++] = c;
+              c = getc (infile);
+            }
+          while (! (c == ',' || c == ' ' || c == '\t' ||
+                    c == '\n' || c == '\r'));
+          input_buffer[i] = '\0';
+
+          name = xmalloc (i + 1);
+          memcpy (name, input_buffer, i + 1);
+          add_global (type, name);
+          continue;
+        }
+
       /* DEFVAR_LISP ("name", addr, "doc")
          DEFVAR_LISP ("name", addr /\* doc *\/)
          DEFVAR_LISP ("name", addr, doc: /\* doc *\/)  */
@@ -637,7 +817,7 @@ scan_c_file (char *filename, const char *mode)
       if (defunflag)
         commas = 5;
       else if (defvarperbufferflag)
-        commas = 2;
+        commas = 3;
       else if (defvarflag)
         commas = 1;
       else  /* For DEFSIMPLE and DEFPRED */
@@ -710,7 +890,7 @@ scan_c_file (char *filename, const char *mode)
 
           putc (037, outfile);
           putc (defvarflag ? 'V' : 'F', outfile);
-          fprintf (outfile, "%s\n", buf);
+          fprintf (outfile, "%s\n", input_buffer);
 
           if (comment)
             getc (infile);      /* Skip past `*' */
@@ -753,11 +933,12 @@ scan_c_file (char *filename, const char *mode)
               *p = '\0';
               /* Output them.  */
               fprintf (outfile, "\n\n");
-              write_c_args (outfile, buf, argbuf, minargs, maxargs);
+              write_c_args (outfile, input_buffer, argbuf, minargs, maxargs);
             }
           else if (defunflag && maxargs == -1 && !saw_usage)
             /* The DOC should provide the usage form.  */
-            fprintf (stderr, "Missing `usage' for function `%s'.\n", buf);
+            fprintf (stderr, "Missing `usage' for function `%s'.\n",
+                     input_buffer);
         }
     }
  eof:
@@ -801,7 +982,7 @@ scan_c_file (char *filename, const char *mode)
  An entry is output only if DOCSTRING has \ newline just after the opening "
  */
 
-void
+static void
 skip_white (FILE *infile)
 {
   char c = ' ';
@@ -810,7 +991,7 @@ skip_white (FILE *infile)
   ungetc (c, infile);
 }
 
-void
+static void
 read_lisp_symbol (FILE *infile, char *buffer)
 {
   char c;
@@ -838,13 +1019,16 @@ read_lisp_symbol (FILE *infile, char *buffer)
   skip_white (infile);
 }
 
-int
+static int
 scan_lisp_file (const char *filename, const char *mode)
 {
   FILE *infile;
   register int c;
   char *saved_string = 0;
 
+  if (generate_globals)
+    fatal ("scanning lisp file when -g specified", 0);
+
   infile = fopen (filename, mode);
   if (infile == NULL)
     {
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 52d1cb5680a..07f6170afe4 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -31,8 +31,6 @@ $(BLD)/make-docfile.exe: 	$(BLD)/make-docfile.$(O) $(BLD)/ntlib.$(O)
                 $(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(BLD)/make-docfile.$(O) $(BLD)/ntlib.$(O) $(LIBS)
 $(BLD)/hexl.exe:                $(BLD)/hexl.$(O)
                 $(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(BLD)/hexl.$(O) $(LIBS)
-$(BLD)/fakemail.exe:            $(BLD)/fakemail.$(O) $(BLD)/ntlib.$(O)
-                $(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(BLD)/fakemail.$(O) $(BLD)/ntlib.$(O) $(LIBS)
 $(BLD)/test-distrib.exe: $(BLD)/test-distrib.$(O)
                 $(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(BLD)/test-distrib.$(O) $(LIBS)
 
@@ -42,7 +40,6 @@ etags:		stamp_BLD $(BLD)/etags.exe
 ebrowse:        stamp_BLD $(BLD)/ebrowse.exe
 hexl:           stamp_BLD $(BLD)/hexl.exe
 movemail:       stamp_BLD $(BLD)/movemail.exe
-fakemail:       stamp_BLD $(BLD)/fakemail.exe
 emacsclient:    stamp_BLD $(BLD)/emacsclient.exe $(BLD)/emacsclientw.exe
 
 test-distrib:   stamp_BLD $(BLD)/test-distrib.exe
@@ -135,14 +132,15 @@ obj =   dosfns.o msdos.o \
         cm.o term.o terminal.o xfaces.o \
         emacs.o keyboard.o macros.o keymap.o sysdep.o \
         buffer.o filelock.o insdel.o marker.o \
-        minibuf.o fileio.o dired.o filemode.o \
+        minibuf.o fileio.o dired.o \
         cmds.o casetab.o casefiddle.o indent.o search.o regex.o undo.o \
         alloc.o data.o doc.o editfns.o callint.o \
         eval.o floatfns.o fns.o print.o lread.o \
         syntax.o bytecode.o \
         process.o callproc.o unexw32.o \
         region-cache.o sound.o atimer.o \
-        doprnt.o intervals.o textprop.o composite.o md5.o
+        doprnt.o intervals.o textprop.o composite.o \
+        gnutls.o
 
 #
 # These are the lisp files that are loaded up in loadup.el
@@ -271,11 +269,6 @@ lisp2 = \
         $(lispsource)window.elc \
         $(lispsource)version.el
 
-# Used by batch-update-autoloads.
-echolisp:
-        @echo $(lisp1)
-        @echo $(lisp2)
-
 # This is needed the first time we build the tree, since temacs.exe
 # does not exist yet, and the DOC rule needs it to rebuild DOC whenever
 # Emacs is rebuilt.
@@ -332,7 +325,6 @@ clean:
                 - $(DEL) ctags.c
                 - $(DEL_TREE) $(OBJDIR)
                 - $(DEL) stamp_BLD
-                - $(DEL) echolisp.tmp
 
 distclean: cleanall
         - $(DEL) TAGS
@@ -374,14 +366,23 @@ $(BLD)/alloca.$(O) : \
 $(BLD)/ctags.$(O) : \
         $(SRC)/ctags.c \
         $(EMACS_ROOT)/nt/inc/sys/param.h \
+        $(EMACS_ROOT)/nt/inc/sys/stat.h \
         $(EMACS_ROOT)/src/s/ms-w32.h \
         $(EMACS_ROOT)/src/m/intel386.h \
         $(EMACS_ROOT)/lib-src/../src/config.h \
         $(SRC)/ntlib.h \
         $(EMACS_ROOT)/lib/getopt.h
 
+$(BLD)/ebrowse.$(O) : \
+        $(SRC)/ebrowse.c \
+        $(EMACS_ROOT)/lib/min-max.h \
+        $(EMACS_ROOT)/src/s/ms-w32.h \
+        $(EMACS_ROOT)/src/m/intel386.h \
+        $(EMACS_ROOT)/lib-src/../src/config.h
+
 $(BLD)/emacsclient.$(O) : \
         $(SRC)/emacsclient.c \
+        $(EMACS_ROOT)/nt/inc/sys/stat.h \
         $(EMACS_ROOT)/src/s/ms-w32.h \
         $(EMACS_ROOT)/src/m/intel386.h \
         $(EMACS_ROOT)/lib-src/../src/config.h
@@ -389,20 +390,13 @@ $(BLD)/emacsclient.$(O) : \
 $(BLD)/etags.$(O) : \
         $(SRC)/etags.c \
         $(EMACS_ROOT)/nt/inc/sys/param.h \
+        $(EMACS_ROOT)/nt/inc/sys/stat.h \
         $(EMACS_ROOT)/src/s/ms-w32.h \
         $(EMACS_ROOT)/src/m/intel386.h \
         $(EMACS_ROOT)/lib-src/../src/config.h \
         $(SRC)/ntlib.h \
         $(EMACS_ROOT)/lib/getopt.h
 
-$(BLD)/fakemail.$(O) : \
-        $(SRC)/fakemail.c \
-        $(SRC)/ntlib.h \
-        $(EMACS_ROOT)/src/s/ms-w32.h \
-        $(EMACS_ROOT)/src/m/intel386.h \
-        $(EMACS_ROOT)/lib-src/../src/config.h \
-        $(EMACS_ROOT)/nt/inc/pwd.h
-
 $(BLD)/getdate.$(O) : \
         $(SRC)/getdate.c \
         $(EMACS_ROOT)/src/s/ms-w32.h \
@@ -429,6 +423,7 @@ $(BLD)/movemail.$(O) : \
         $(EMACS_ROOT)/src/m/intel386.h \
         $(EMACS_ROOT)/lib-src/../src/config.h \
         $(EMACS_ROOT)/nt/inc/sys/file.h \
+        $(EMACS_ROOT)/nt/inc/sys/stat.h \
         $(EMACS_ROOT)/lib-src/../src/syswait.h \
         $(EMACS_ROOT)/nt/inc/pwd.h \
         $(SRC)/ntlib.h
@@ -437,11 +432,13 @@ $(BLD)/movemail.$(O) : \
 $(BLD)/ntlib.$(O) : \
         $(SRC)/ntlib.c \
         $(SRC)/ntlib.h \
+        $(EMACS_ROOT)/nt/inc/sys/stat.h \
         $(EMACS_ROOT)/nt/inc/pwd.h
 
 $(BLD)/pop.$(O) : \
         $(SRC)/pop.c \
         $(SRC)/pop.h \
+        $(EMACS_ROOT)/lib/min-max.h \
         $(SRC)/ntlib.h
 
 $(BLD)/profile.$(O) : \
@@ -469,7 +466,7 @@ $(BLD)/timer.$(O) : \
 # The following dependencies are for supporting parallel builds, where
 # we must make sure $(BLD) exists before any compilation starts.
 #
-$(BLD)/make-docfile.$(O) $(BLD)/hexl.$(O) $(BLD)/fakemail.$(O): stamp_BLD
+$(BLD)/make-docfile.$(O) $(BLD)/hexl.$(O): stamp_BLD
 
 $(BLD)/test-distrib.$(O) $(MOVEMAILOBJS): stamp_BLD
 
diff --git a/lib-src/movemail.c b/lib-src/movemail.c
index 682aa10aa39..e8c09f090f3 100644
--- a/lib-src/movemail.c
+++ b/lib-src/movemail.c
@@ -80,13 +80,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #undef access
 #endif /* MSDOS */
 
-#ifndef DIRECTORY_SEP
-#define DIRECTORY_SEP '/'
-#endif
-#ifndef IS_DIRECTORY_SEP
-#define IS_DIRECTORY_SEP(_c_) ((_c_) == DIRECTORY_SEP)
-#endif
-
 #ifdef WINDOWSNT
 #include "ntlib.h"
 #undef access
@@ -138,7 +131,7 @@ extern int lk_open (), lk_close ();
    files appear in. */
 #ifdef MAILDIR
 #define MAIL_USE_MAILLOCK
-static char *mail_spool_name ();
+static char *mail_spool_name (char *);
 #endif
 #endif
 
@@ -161,7 +154,7 @@ static int mbx_delimit_end (FILE *mbf);
 #endif
 
 /* Nonzero means this is name of a lock file to delete on fatal error.  */
-char *delete_lockname;
+static char *delete_lockname;
 
 int
 main (int argc, char **argv)
@@ -169,15 +162,15 @@ main (int argc, char **argv)
   char *inname, *outname;
   int indesc, outdesc;
   ssize_t nread;
-  int status;
+  int wait_status;
   int c, preserve_mail = 0;
 
 #ifndef MAIL_USE_SYSTEM_LOCK
   struct stat st;
-  long now;
   int tem;
-  char *lockname, *p;
+  char *lockname;
   char *tempname;
+  size_t inname_dirlen;
   int desc;
 #endif /* not MAIL_USE_SYSTEM_LOCK */
 
@@ -266,9 +259,22 @@ main (int argc, char **argv)
 #ifndef MAIL_USE_SYSTEM_LOCK
 #ifdef MAIL_USE_MAILLOCK
   spool_name = mail_spool_name (inname);
-  if (! spool_name)
+  if (spool_name)
+    {
+#ifdef lint
+      lockname = 0;
+#endif
+    }
+  else
 #endif
     {
+      #ifndef DIRECTORY_SEP
+       #define DIRECTORY_SEP '/'
+      #endif
+      #ifndef IS_DIRECTORY_SEP
+       #define IS_DIRECTORY_SEP(_c_) ((_c_) == DIRECTORY_SEP)
+      #endif
+
       /* Use a lock file named after our first argument with .lock appended:
          If it exists, the mail file is locked.  */
       /* Note: this locking mechanism is *required* by the mailer
@@ -293,26 +299,38 @@ main (int argc, char **argv)
          to bug-gnu-emacs@prep.ai.mit.edu so we can fix it.  */
 
       lockname = concat (inname, ".lock", "");
-      tempname = (char *) xmalloc (strlen (inname) + strlen ("EXXXXXX") + 1);
-      strcpy (tempname, inname);
-      p = tempname + strlen (tempname);
-      while (p != tempname && !IS_DIRECTORY_SEP (p[-1]))
-        p--;
-      *p = 0;
-      strcpy (p, "EXXXXXX");
-      mktemp (tempname);
-      unlink (tempname);
+      for (inname_dirlen = strlen (inname);
+           inname_dirlen && !IS_DIRECTORY_SEP (inname[inname_dirlen - 1]);
+           inname_dirlen--)
+        continue;
+      tempname = (char *) xmalloc (inname_dirlen + sizeof "EXXXXXX");
 
       while (1)
         {
           /* Create the lock file, but not under the lock file name.  */
           /* Give up if cannot do that.  */
-          desc = open (tempname, O_WRONLY | O_CREAT | O_EXCL, 0666);
+
+          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
           if (desc < 0)
             {
+              int mkstemp_errno = errno;
               char *message = (char *) xmalloc (strlen (tempname) + 50);
               sprintf (message, "creating %s, which would become the lock file",
                        tempname);
+              errno = mkstemp_errno;
               pfatal_with_name (message);
             }
           close (desc);
@@ -336,7 +354,7 @@ main (int argc, char **argv)
              by time differences between machines.  */
           if (stat (lockname, &st) >= 0)
             {
-              now = time (0);
+              time_t now = time (0);
               if (st.st_ctime < now - 300)
                 unlink (lockname);
             }
@@ -352,7 +370,10 @@ main (int argc, char **argv)
       int lockcount = 0;
       int status = 0;
 #if defined (MAIL_USE_MAILLOCK) && defined (HAVE_TOUCHLOCK)
-      time_t touched_lock, now;
+      time_t touched_lock;
+# ifdef lint
+      touched_lock = 0;
+# endif
 #endif
 
       if (setuid (getuid ()) < 0 || setregid (-1, real_gid) < 0)
@@ -462,7 +483,7 @@ main (int argc, char **argv)
 #if defined (MAIL_USE_MAILLOCK) && defined (HAVE_TOUCHLOCK)
             if (spool_name)
               {
-                now = time (0);
+                time_t now = time (0);
                 if (now - touched_lock > 60)
                   {
                     touchlock ();
@@ -527,11 +548,11 @@ main (int argc, char **argv)
       exit (EXIT_SUCCESS);
     }
 
-  wait (&status);
-  if (!WIFEXITED (status))
+  wait (&wait_status);
+  if (!WIFEXITED (wait_status))
     exit (EXIT_FAILURE);
-  else if (WRETCODE (status) != 0)
-    exit (WRETCODE (status));
+  else if (WRETCODE (wait_status) != 0)
+    exit (WRETCODE (wait_status));
 
 #if !defined (MAIL_USE_MMDF) && !defined (MAIL_USE_SYSTEM_LOCK)
 #ifdef MAIL_USE_MAILLOCK
@@ -670,14 +691,8 @@ xmalloc (unsigned int size)
 
 #define NOTOK (-1)
 #define OK 0
-#define DONE 1
-
-char *progname;
-FILE *sfi;
-FILE *sfo;
-char ibuffer[BUFSIZ];
-char obuffer[BUFSIZ];
-char Errmsg[200];               /* POP errors, at least, can exceed
+
+static char Errmsg[200];        /* POP errors, at least, can exceed
                                    the original length of 80.  */
 
 /*
@@ -736,7 +751,18 @@ popmail (char *mailbox, char *outfile, int preserve, char *password, int reverse
       error ("Error in open: %s, %s", strerror (errno), outfile);
       return EXIT_FAILURE;
     }
-  fchown (mbfi, getuid (), -1);
+
+  if (fchown (mbfi, getuid (), -1) != 0)
+    {
+      int fchown_errno = errno;
+      struct stat st;
+      if (fstat (mbfi, &st) != 0 || st.st_uid != getuid ())
+        {
+          pop_close (server);
+          error ("Error in fchown: %s, %s", strerror (fchown_errno), outfile);
+          return EXIT_FAILURE;
+        }
+    }
 
   if ((mbf = fdopen (mbfi, "wb")) == NULL)
     {
@@ -828,10 +854,10 @@ pop_retr (popserver server, int msgno, FILE *arg)
 
   if (pop_retrieve_first (server, msgno, &line))
     {
-      char *error = concat ("Error from POP server: ", pop_error, "");
-      strncpy (Errmsg, error, sizeof (Errmsg));
+      char *msg = concat ("Error from POP server: ", pop_error, "");
+      strncpy (Errmsg, msg, sizeof (Errmsg));
       Errmsg[sizeof (Errmsg)-1] = '\0';
-      free(error);
+      free (msg);
       return (NOTOK);
     }
 
@@ -850,27 +876,26 @@ pop_retr (popserver server, int msgno, FILE *arg)
 
   if (ret)
     {
-      char *error = concat ("Error from POP server: ", pop_error, "");
-      strncpy (Errmsg, error, sizeof (Errmsg));
+      char *msg = concat ("Error from POP server: ", pop_error, "");
+      strncpy (Errmsg, msg, sizeof (Errmsg));
       Errmsg[sizeof (Errmsg)-1] = '\0';
-      free(error);
+      free (msg);
       return (NOTOK);
     }
 
   return (OK);
 }
 
-/* Do this as a macro instead of using strcmp to save on execution time. */
-#define IS_FROM_LINE(a) ((a[0] == 'F') \
-                         && (a[1] == 'r') \
-                         && (a[2] == 'o') \
-                         && (a[3] == 'm') \
-                         && (a[4] == ' '))
-
 static int
 mbx_write (char *line, int len, FILE *mbf)
 {
 #ifdef MOVEMAIL_QUOTE_POP_FROM_LINES
+  /* Do this as a macro instead of using strcmp to save on execution time. */
+  # define IS_FROM_LINE(a) ((a[0] == 'F')       \
+                            && (a[1] == 'r')    \
+                            && (a[2] == 'o')    \
+                            && (a[3] == 'm')    \
+                            && (a[4] == ' '))
   if (IS_FROM_LINE (line))
     {
       if (fputc ('>', mbf) == EOF)
diff --git a/lib-src/ntlib.c b/lib-src/ntlib.c
index 0ecd4177d2c..83f653f3ea3 100644
--- a/lib-src/ntlib.c
+++ b/lib-src/ntlib.c
@@ -28,6 +28,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>
+#include <ctype.h>
 
 #include "ntlib.h"
 
diff --git a/lib-src/pop.c b/lib-src/pop.c
index a3fda09d44f..426b39bd1fb 100644
--- a/lib-src/pop.c
+++ b/lib-src/pop.c
@@ -67,7 +67,6 @@ extern struct servent *hes_getservbyname (/* char *, char * */);
 #include <stdio.h>
 #ifdef STDC_HEADERS
 #include <string.h>
-#define index strchr
 #endif
 #include <unistd.h>
 
@@ -91,6 +90,8 @@ extern struct servent *hes_getservbyname (/* char *, char * */);
 # endif
 #endif /* KERBEROS */
 
+#include <min-max.h>
+
 #ifdef KERBEROS
 #ifndef KERBEROS5
 extern int krb_sendauth (/* long, int, KTEXT, char *, char *, char *,
@@ -122,19 +123,15 @@ static char *find_crlf (char *, int);
                                    to be bigger than the original
                                    value of 80 */
 #define POP_PORT 110
-#define KPOP_PORT 1109
 #define POP_SERVICE "pop3"      /* we don't want the POP2 port! */
 #ifdef KERBEROS
+#define KPOP_PORT 1109
 #define KPOP_SERVICE "kpop"     /* never used: look for 20060515 to see why */
 #endif
 
 char pop_error[ERROR_MAX];
 int pop_debug = 0;
 
-#ifndef min
-#define min(a,b) (((a) < (b)) ? (a) : (b))
-#endif
-
 /*
  * Function: pop_open (char *host, char *username, char *password,
  *                     int flags)
diff --git a/lib-src/profile.c b/lib-src/profile.c
index 9ce9993f4b1..086d8cc3e9d 100644
--- a/lib-src/profile.c
+++ b/lib-src/profile.c
@@ -38,7 +38,7 @@ static char time_string[30];
 
 /* Reset the stopwatch to zero.  */
 
-void
+static void
 reset_watch (void)
 {
   EMACS_GET_TIME (TV1);
@@ -49,7 +49,7 @@ reset_watch (void)
    is returned as a string with the format  <seconds>.<micro-seconds>
    If reset_watch was not called yet, exit.  */
 
-char *
+static char *
 get_time (void)
 {
   if (watch_not_started)
diff --git a/lib-src/test-distrib.c b/lib-src/test-distrib.c
index acfb147325b..5ad19201118 100644
--- a/lib-src/test-distrib.c
+++ b/lib-src/test-distrib.c
@@ -26,18 +26,16 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Break string in two parts to avoid buggy C compilers that ignore characters
    after nulls in strings.  */
 
-char string1[] = "Testing distribution of nonprinting chars:\n\
+static char string1[] = "Testing distribution of nonprinting chars:\n\
 Should be 0177: \177 Should be 0377: \377 Should be 0212: \212.\n\
 Should be 0000: ";
 
-char string2[] = ".\n\
+static char string2[] = ".\n\
 This file is read by the `test-distribution' program.\n\
 If you change it, you will make that program fail.\n";
 
-char buf[300];
-
 /* Like `read' but keeps trying until it gets SIZE bytes or reaches eof.  */
-int
+static int
 cool_read (int fd, char *buf, size_t size)
 {
   ssize_t num;
@@ -57,6 +55,7 @@ int
 main (int argc, char **argv)
 {
   int fd;
+  char buf[300];
 
   if (argc != 2)
     {
diff --git a/lib-src/update-game-score.c b/lib-src/update-game-score.c
index 9466bf7b149..e95e2ce259d 100644
--- a/lib-src/update-game-score.c
+++ b/lib-src/update-game-score.c
@@ -57,7 +57,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 extern char *optarg;
 extern int optind, opterr;
 
-int usage (int err) NO_RETURN;
+static int usage (int err) NO_RETURN;
 
 #define MAX_ATTEMPTS 5
 #define MAX_SCORES 200
@@ -68,7 +68,7 @@ int usage (int err) NO_RETURN;
 #define difftime(t1, t0) (double)((t1) - (t0))
 #endif
 
-int
+static int
 usage (int err)
 {
   fprintf (stdout, "Usage: update-game-score [-m MAX ] [ -r ] game/scorefile SCORE DATA\n");
@@ -80,8 +80,8 @@ usage (int err)
   exit (err);
 }
 
-int lock_file (const char *filename, void **state);
-int unlock_file (const char *filename, void *state);
+static int lock_file (const char *filename, void **state);
+static int unlock_file (const char *filename, void *state);
 
 struct score_entry
 {
@@ -90,24 +90,24 @@ struct score_entry
   char *data;
 };
 
-int read_scores (const char *filename, struct score_entry **scores,
-                 int *count);
-int push_score (struct score_entry **scores, int *count,
-                int newscore, char *username, char *newdata);
-void sort_scores (struct score_entry *scores, int count, int reverse);
-int write_scores (const char *filename, const struct score_entry *scores,
-                  int count);
+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);
+static int write_scores (const char *filename,
+                         const struct score_entry *scores, int count);
 
-void lose (const char *msg) NO_RETURN;
+static void lose (const char *msg) NO_RETURN;
 
-void
+static void
 lose (const char *msg)
 {
   fprintf (stderr, "%s\n", msg);
   exit (EXIT_FAILURE);
 }
 
-void lose_syserr (const char *msg) NO_RETURN;
+static void lose_syserr (const char *msg) NO_RETURN;
 
 /* Taken from sysdep.c.  */
 #ifndef HAVE_STRERROR
@@ -126,14 +126,14 @@ strerror (errnum)
 #endif /* not WINDOWSNT */
 #endif /* ! HAVE_STRERROR */
 
-void
+static void
 lose_syserr (const char *msg)
 {
   fprintf (stderr, "%s: %s\n", msg, strerror (errno));
   exit (EXIT_FAILURE);
 }
 
-char *
+static char *
 get_user_id (void)
 {
   char *name;
@@ -154,7 +154,7 @@ get_user_id (void)
   return buf->pw_name;
 }
 
-const char *
+static const char *
 get_prefix (int running_suid, const char *user_prefix)
 {
   if (!running_suid && user_prefix == NULL)
@@ -242,13 +242,15 @@ main (int argc, char **argv)
   push_score (&scores, &scorecount, newscore, user_id, newdata);
   sort_scores (scores, scorecount, reverse);
   /* Limit the number of scores.  If we're using reverse sorting, then
-     we should increment the beginning of the array, to skip over the
-     *smallest* scores.  Otherwise, we just decrement the number of
-     scores, since the smallest will be at the end. */
+     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)
-    scorecount -= (scorecount - MAX_SCORES);
-  if (reverse)
-    scores += (scorecount - MAX_SCORES);
+    {
+      if (reverse)
+        scores += (scorecount - MAX_SCORES);
+      scorecount = MAX_SCORES;
+    }
   if (write_scores (scorefile, scores, scorecount) < 0)
     {
       unlock_file (scorefile, lockstate);
@@ -258,7 +260,7 @@ main (int argc, char **argv)
   exit (EXIT_SUCCESS);
 }
 
-int
+static int
 read_score (FILE *f, struct score_entry *score)
 {
   int c;
@@ -342,7 +344,7 @@ read_score (FILE *f, struct score_entry *score)
   return 0;
 }
 
-int
+static int
 read_scores (const char *filename, struct score_entry **scores, int *count)
 {
   int readval, scorecount, cursize;
@@ -375,7 +377,7 @@ read_scores (const char *filename, struct score_entry **scores, int *count)
   return 0;
 }
 
-int
+static int
 score_compare (const void *a, const void *b)
 {
   const struct score_entry *sa = (const struct score_entry *) a;
@@ -383,7 +385,7 @@ score_compare (const void *a, const void *b)
   return (sb->score > sa->score) - (sb->score < sa->score);
 }
 
-int
+static int
 score_compare_reverse (const void *a, const void *b)
 {
   const struct score_entry *sa = (const struct score_entry *) a;
@@ -407,14 +409,14 @@ push_score (struct score_entry **scores, int *count, int newscore, char *usernam
   return 0;
 }
 
-void
+static void
 sort_scores (struct score_entry *scores, int count, int reverse)
 {
   qsort (scores, count, sizeof (struct score_entry),
         reverse ? score_compare_reverse : score_compare);
 }
 
-int
+static int
 write_scores (const char *filename, const struct score_entry *scores, int count)
 {
   FILE *f;
@@ -443,7 +445,7 @@ write_scores (const char *filename, const struct score_entry *scores, int count)
   return 0;
 }
 
-int
+static int
 lock_file (const char *filename, void **state)
 {
   int fd;
@@ -484,7 +486,7 @@ lock_file (const char *filename, void **state)
   return 0;
 }
 
-int
+static int
 unlock_file (const char *filename, void *state)
 {
   char *lockpath = (char *) state;