Merge from trunkpending

20 files changed, 515 insertions, 385 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 098ee06c762..2384599caf2 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,129 @@
+2012-03-11  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * emacsclient.c (main): Handle -print-nonl command.
+
+        * emacsclient.c (main): Handle multiple messages in a single
+        datagram.
+
+        * emacsclient.c (socket_name): Add const.
+        (get_server_config): Add parameter config_file, use it instead of
+        global server_file.
+        (set_tcp_socket): Add parameter local_server_file, pass it down to
+        get_server_config.
+        (set_local_socket): Add parameter local_socket_name, use it
+        instead of global socket_name.
+        (set_socket): Adjust calls to set_local_socket and set_tcp_socket.
+        Don't clobber global server_file or socket_name.
+        (main): No longer reset server_file or socket_name.
+
+2012-01-05  Glenn Morris  <rgm@gnu.org>
+
+        * ebrowse.c (version) <emacs_copyright>:
+        * etags.c (print_version) <emacs_copyright>:
+        * rcs2log (Copyright): Update short copyright year to 2012.
+
+2011-12-25  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * etags.c (C_entries): Properly skip over string and character
+        constants and comments inside brackets.  (Bug#10357)
+
+2011-12-04  Juanma Barranquero  <lekktu@gmail.com>
+
+        * emacsclient.c (decode_options) [WINDOWSNT]: Don't force tty = 0;
+        instead, treat both -c and -t as always requesting a new "tty" frame,
+        and let server.el decide which kind is actually required.
+        Reported by Uwe Siart <usenet@siart.de> in this thread:
+        http://lists.gnu.org/archive/html/emacs-devel/2011-11/msg00303.html
+
+2011-11-30  Chong Yidong  <cyd@gnu.org>
+
+        * emacsclient.c (main): Condition last change on WINDOWSNT
+        (Bug#10155).
+
+2011-11-27  Eli Zaretskii  <eliz@gnu.org>
+
+        * makefile.w32-in (LOCAL_FLAGS): Add $(EMACS_EXTRA_C_FLAGS).
+
+        * emacsclient.c (main) <environ>: Remove declaration, already
+        pulled in by unistd.h on Posix hosts and stdlib.h on MS-Windows.
+
+2011-11-24  Glenn Morris  <rgm@gnu.org>
+
+        * make-docfile.c (scan_lisp_file): Treat defcustom like defvar.
+
+2011-11-14  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * Makefile.in (all): Make sure "all" is the first target.
+
+2011-10-27  Juanma Barranquero  <lekktu@gmail.com>
+
+        * emacsclient.c (w32_getenv): Silence compiler warnings.
+
+2011-09-07  Glenn Morris  <rgm@gnu.org>
+
+        * etags.c (Fortran_functions): Handle "elemental" functions.
+
+2011-09-07  Dieter Schuster  <didischuster@arcor.de>  (tiny change)
+
+        * etags.c (Fortran_functions): Handle "pure" functions.  (Bug#9359)
+
+2011-09-06  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * Makefile.in ($(DESTDIR)${archlibdir}): install-sh moved
+        to build-aux (Bug#9169).
+
+2011-09-04  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Integer and memory overflow issues (Bug#9397).
+
+        * emacsclient.c (xmalloc): Accept size_t, not unsigned int, to
+        avoid potential buffer overflow issues on typical 64-bit hosts.
+        Return void *, not long *.
+        (get_current_dir_name): Report a failure, instead of looping
+        forever, if buffer size calculation overflows.  Treat malloc
+        failures like realloc failures, as that has better behavior and is
+        more consistent.  Do not check whether xmalloc returns NULL, as
+        that's not possible.
+        (message): Do not arbitrarily truncate message to 2048 bytes when
+        sending it to stderr; use vfprintf instead.
+        (get_server_config, set_local_socket)
+        (start_daemon_and_retry_set_socket): Do not alloca
+        arbitrarily-large buffers; that's not safe.
+        (get_server_config, set_local_socket): Do not use sprintf when its
+        result might not fit in 'int'.
+        (set_local_socket): Do not assume uid fits in 'int'.
+
+        * etags.c (xmalloc, xrealloc): Accept size_t, not unsigned int,
+        to avoid potential buffer overflow issues on typical 64-bit hosts.
+        (whatlen_max): New static var.
+        (main): Avoid buffer overflow if subsidiary command length is
+        greater than BUFSIZ or 2*BUFSIZ + 20. Do not use sprintf when its
+        result might not fit in 'int'.
+
+        * movemail.c (main): Do not use sprintf when its result might not fit
+        in 'int'.  Instead, put the possibly-long file name into the
+        output of pfatal_with_name.
+
+        * update-game-score.c: Include <limits.h>
+        (get_user_id): Do not assume uid fits in 'int'.  Simplify.
+
+2011-07-28  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Assume freestanding C89 headers, string.h, stdlib.h.
+        * ebrowse.c: Include stdlib.h unconditionally.
+        * etags.c, update-game-score.c:
+        Include string.h and stdlib.h unconditionally.
+        * makefile.w32-in (LOCAL_CFLAGS): Don't define STDC_HEADERS.
+        * movemail.c, pop.c: Include string.h unconditionally.
+        * update-game-score.c: No need to include stdarg.h; not used.
+
+        Assume support for memcmp, memcpy, memmove, memset.
+        * etags.c (absolute_filename): Assume memmove exists.
+
+2011-07-09  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * update-game-score.c (usage): Update usage line.
+
 2011-07-02  Jason Rumney  <jasonr@gnu.org>
 
         * emacsclient.c (decode_options) [WINDOWSNT]: Avoid tty mode on
@@ -1959,7 +2085,7 @@
         * etags.c [ETAGS_REGEXPS]: Now is unconditionally defined.
         [LONG_OPTIONS]: Changed to NO_LONG_OPTIONS, which is undefined.
         (Objc_suffixes): Suggest using --lang=c for full help.
-        (C_entries): Initialise savetoken to 0 to shut up the compiler.
+        (C_entries): Initialize savetoken to 0 to shut up the compiler.
 
 2006-07-20  Andreas Schwab  <schwab@suse.de>
 
@@ -2665,7 +2791,7 @@
         (add_regex, regex_tag_multiline, readline): Use it.
         (main): Free some global structures.
         (fdesc): New member `written'.
-        (readline, process_file): Initialise it.
+        (readline, process_file): Initialize it.
         (put_entries): Set it.
         (main): Use it to create entries for files without tags.
         (total_size_of_entries): Do not count invalid tags.
@@ -2776,7 +2902,7 @@
         (find_entries): Rewind unconditionally.
         (find_entries): Do not call language functions directly, now calls
         itself.
-        (find_entries): Do general initialisations here.
+        (find_entries): Do general initializations here.
         (CNL_SAVE_DEFINEDEF, C_entries, LOOP_ON_INPUT_LINES, F_getit)
         (Ada_getit, Pascal_functions, Pascal_functions)
         (prolog_skip_comment): Do not do them here.
@@ -3012,7 +3138,7 @@
         (TeX_commands): Name tags.  Correction of old disabled code.
 
         * etags.c (curfiledir, curtagfname): New global variables.
-        (process_file): Initialise them.
+        (process_file): Initialize them.
         (readline): Canonicalize the name found in #line directive.
 
 2002-03-06  Jason Rumney  <jasonr@gnu.org>
@@ -3040,7 +3166,7 @@
         (main): Call put_entries here even in CTAGS mode.
         (main, process_file): Check the return values of fclose and pclose.
         (process_file): Do not call put_entries after parsing each file.
-        (process_file): Canonicalise file names even for ctags.
+        (process_file): Canonicalize file names even for ctags.
         (process_file): Set curfile here...
         (find_entries): ... not here any more.
         (add_node): In etags mode, build a linked list of entries (on
@@ -3102,7 +3228,7 @@
         (L_getit): Simplify by using get_tag.
         (Perl_functions, Postscript_functions, erlang_attribute): Use the
         modified LOOKING_AT.
-        (notinname): Remove '[' and added ')' to the recognised chars.
+        (notinname): Remove '[' and added ')' to the recognized chars.
         (LOOKING_AT, get_tag, PHP_functions): Use notinname.
         (Ada_getit, Ada_funcs, Python_functions, Scheme_functions):
         Clarified, using strneq or notinname.
@@ -3169,7 +3295,7 @@
         (Scheme_functions, Texinfo_nodes): Use it.
         (Perl_functions): Use strneq.
         (prolog_pred): Rename to prolog_pr.
-        (prolog_pr): Recognise Prolog rules in addition to predicates.
+        (prolog_pr): Recognize Prolog rules in addition to predicates.
         [ETAGS_REGEXPS] [!HAVE_CONFIG_H] [__CYGWIN__]: Prevent
         unmodified compile, as Cygwin's regex.h is incompatible with us.
         [!HAVE_CONFIG_H] [!__STDC__]: #define const as the empty string.
@@ -3443,7 +3569,7 @@
         * etags.c (enum sym_type): New label st_C_template.
         (gperf input): Use it for switching to C++ from C.
         (consider_token): Do it.
-        (C_entries): Initialise typdefcblev to quiet compilers.
+        (C_entries): Initialize typdefcblev to quiet compilers.
         [!HAVE_CONFIG_H] [!__STDC__]: #define static as nothing.
 
 2001-02-22  Andrew Innes  <andrewi@gnu.org>
@@ -3569,7 +3695,7 @@
         (lang_names): Add a NULL member for every entry, added an entry
         for makefiles.
         (Makefile_targets): New function.
-        (Texinfo_nodes): Rename from Texinfo_fuctions and made
+        (Texinfo_nodes): Rename from Texinfo_functions and made
         it conformant to the style of the rest of the code.
 
 2001-01-13  Gerd Moellmann  <gerd@gnu.org>
@@ -3894,7 +4020,7 @@
 
         * etags.c (C_entries, consider_token): C++ `operator' now is
         tagged in most cases.
-        As before, :: is not recognised if surrounded by spaces.
+        As before, :: is not recognized if surrounded by spaces.
 
         * etags.c (relative_filename): Account for DOS file names such
         that is impossible to make one relative to another.
@@ -4194,7 +4320,7 @@
 
 1998-12-08  Geoff Voelker  <voelker@cs.washington.edu>
 
-        * makefile.nt: Do string comparision of _NMAKE_VER.
+        * makefile.nt: Do string comparison of _NMAKE_VER.
 
 1998-11-03  Theodore Jump  <tjump@cais.com>
 
@@ -4503,7 +4629,7 @@
         * etags.c (C_entries): Use "." instead of "::" for Java.
         (consider_token): is_func renamed to is_func_or_var.
         (C_entries): is_func renamed to funorvar.
-        (C_entries): Initialise tok.named.
+        (C_entries): Initialize tok.named.
         (sym_type, C_stab_entry, consider_token): st_C_ignore is used to
         get rid of "import", "package" and "friend".
         (fvdef): Rename from funcdef.  Also some constants renamed.
@@ -4557,13 +4683,13 @@
         (lang_names): Add Java.
         (sym_type): Add st_C_javastruct for Java.
         (C_stab_entry): Add `extends' and `implements' keywords.
-        (consider_token, C_entries): Recognise Java structures.
+        (consider_token, C_entries): Recognize Java structures.
 
 1997-05-12  Francesco Potortì  <F.Potorti@cnuce.cnr.it>
 
-        * etags.c (Cplusplus_suffixes): .pdb is Postscript with C syntax.
-        (Postscript_suffixes): .ps is Postscript.
-        (lang_names): Add Postscript.
+        * etags.c (Cplusplus_suffixes): .pdb is PostScript with C syntax.
+        (Postscript_suffixes): .ps is PostScript.
+        (lang_names): Add postscript.
         (Postscript_functions): New function.
         (TEX_decode_env): Close minor memory leak.
         (just_read_file): Correct the char number of the tag.
@@ -4605,7 +4731,7 @@
 
         * etags.c (xnew): Add support for debugging with chkmalloc.
         (error): Use this instead of printf whenever possible.
-        (main): Only call xnew after having initialised progname.
+        (main): Only call xnew after having initialized progname.
         (substitute): Bad memory corruption error corrected.
 
 1997-04-08  Francesco Potortì  <F.Potorti@cnuce.cnr.it>
@@ -5061,7 +5187,7 @@
 
 1996-03-15  Anders Lindgren  <andersl@csd.uu.se>
 
-        * etags.c: Prolog language totaly rewritten.
+        * etags.c: Prolog language totally rewritten.
         (Prolog_functions): Rewritten from scratch.
         (skip_comment, prolog_getit): Removed.
         (prolog_skip_comment): New function, like old skip_comment.
@@ -5523,8 +5649,8 @@
 
 1995-02-22  Francesco Potortì  (pot@cnuce.cnr.it)
 
-        * etags.c (C_entries): token_saved removed.  Initialise tok.valid and
-        savetok.valid.  Mark token as valid when it is initialised.
+        * etags.c (C_entries): token_saved removed.  Initialize tok.valid and
+        savetok.valid.  Mark token as valid when it is initialized.
         (make_tag): Make token only if token is valid and reset validity.
         (CNL_SAVE_DEFINEDEF): Test for savetok.valid instead of token_saved.
         (TOKEN): Add a new member: valid.
@@ -5536,15 +5662,15 @@
 
 1995-02-14  Francesco Potortì  (pot@cnuce.cnr.it)
 
-        * etags.c (C_entries): Initialise the new members of TOKEN.
+        * etags.c (C_entries): Initialize the new members of TOKEN.
         (C_entries): Do not allocate a new space for each token found by
         consider_token.  Let make_tag do that instead.
         (make_tag): Since now TOKEN has memory of where it is taken from,
         this new macro substitutes both make_tag_from_new_lb and
         make_tag_from_oth_lb.  All callers changed.
         (TOKEN): Add linepos and buffer members.
-        (main): Initialise token_str.
-        (lang_extensions): Recognise .c++ and .h++ as C++ file suffixes.
+        (main): Initialize token_str.
+        (lang_extensions): Recognize .c++ and .h++ as C++ file suffixes.
         (token_str): New global variable used by C_entries.
 
 1995-02-07  Richard Stallman  <rms@pogo.gnu.ai.mit.edu>
@@ -5553,7 +5679,7 @@
 
 1995-02-01  Francesco Potortì  (pot@cnuce.cnr.it)
 
-        * etags.c (pfnote): Initialise been_warned in the node.
+        * etags.c (pfnote): Initialize been_warned in the node.
         (C_entries): Remove a speed hack for the sake of clarity.
 
 1995-01-18  Francesco Potortì  (pot@cnuce.cnr.it)
@@ -5838,8 +5964,8 @@
 
 1994-09-29  Francesco Potortì  (pot@cnuce.cnr.it)
 
-        * etags.c (C_entries): Recognise typedef of ANSI style functions.
-        (C_entries): Recognise #define inside a struct.
+        * etags.c (C_entries): Recognize typedef of ANSI style functions.
+        (C_entries): Recognize #define inside a struct.
         (C_entries): ANSI tells that preprocessor commands do not have to
         start on the first column.
         (print_help): Documentation corrected for -d and -D.
@@ -5953,7 +6079,7 @@
 
 1994-07-08  Dave Love  (d.love@dl.ac.uk)
 
-        * etags.c (takeprec): Recognise `character*(*) function'.
+        * etags.c (takeprec): Recognize `character*(*) function'.
 
 1994-07-08  Francesco Potortì  (pot@cnuce.cnr.it)
 
@@ -6146,7 +6272,7 @@
         TeX_functions, Prolog_functions.
         (inf): No more a global variable.
         (C_entries): Take 2nd parameter `inf' instead of using the global one.
-        (find_entries): Add the cp1 var for optimisation.
+        (find_entries): Add the cp1 var for optimization.
         (find_entries): Add more suffixes for assembler files.
         (Asm_funcs): Now finds labels even without an ending colon.
 
@@ -6174,7 +6300,7 @@
         functions added to compute filenames in tags files.
         (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.
+        (main): Initialize the outfiledir var.
         (TYPEDST): Add the `tignore' value.
         (C_entries): Corrected various small bugs.
 
@@ -6480,7 +6606,7 @@
 
 1993-09-20  Francesco Potortì  (pot@fly)
 
-        * etags.c (C_entries): is_func is initialised here instead of in
+        * etags.c (C_entries): is_func is initialized here instead of in
         consider_token for the sake of the yacc rules section.
         (C_entries): Now class, struct, enum, union and typedef produce
         named tags.
@@ -6534,7 +6660,7 @@
 
 1993-08-04  Francesco Potortì  (pot@spiff.gnu.ai.mit.edu)
 
-        * etags.c (L_isdef, L_isquote, L_getit): Small optimisations.
+        * etags.c (L_isdef, L_isquote, L_getit): Small optimizations.
         (L_funcs): The (foo::defmumble stuff now should work.
         (consider_token): Function returned random value--corrected.
         (C_entries): Corrected == versus = typo.
@@ -6556,7 +6682,7 @@
         (C_entries, consider_token): Make use of fignore.
         (consider_token): Reset funcdef when next_token_is_func: when in
         ctags mode makes DEFVAR and others work better.
-        (L_isquote): Function that recognises the "(quote" string.
+        (L_isquote): Function that recognizes the "(quote" string.
         (L_getit): Ignore quoting via "'" or "(quote".  Useful for defalias.
 
 1993-07-29  Paul Eggert  (eggert@twinsun.com)
@@ -6903,7 +7029,7 @@
         (TOKEN): Member linestart removed.
         (linepos, prev_linepos, lb1): Deleted.
         (main): Call initbuffer on lbs array instead of lb1.
-        (init): Remove the initialisation of the logical _gd array.
+        (init): Remove the initialization 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.
@@ -7828,7 +7954,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 1988-1999, 2001-2011 Free Software Foundation, Inc.
+  Copyright (C) 1988-1999, 2001-2012 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index f619febbb2b..cc1757e4e3b 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -1,5 +1,5 @@
 # Makefile for lib-src subdirectory in GNU Emacs.
-# Copyright (C) 1985, 1987-1988, 1993-1994, 2001-2011
+# Copyright (C) 1985, 1987-1988, 1993-1994, 2001-2012
 #   Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
@@ -175,11 +175,11 @@ ALL_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${LDFLAGS} ${CPPFLAGS} ${CFLAGS}
 LINK_CFLAGS = ${BASE_CFLAGS} ${LDFLAGS} ${CFLAGS}
 CPP_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${CPPFLAGS} ${CFLAGS}
 
+all: ${EXE_FILES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS} ${STAMP_INST_SCRIPTS} ${STAMP_SCRIPTS}
+
 LOADLIBES = ../lib/libgnu.a $(LIBS_SYSTEM)
 $(EXE_FILES): ../lib/libgnu.a
 
-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.
 ## Nothing to do if pwd = srcdir.
@@ -229,13 +229,13 @@ maybe-blessmail: $(BLESSMAIL_TARGET)
 $(DESTDIR)${archlibdir}: all
         @echo
         @echo "Installing utilities run internally by Emacs."
-        umask 022; $(top_srcdir)/install-sh -d $(DESTDIR)${archlibdir}
+        umask 022; $(top_srcdir)/build-aux/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)/install-sh -d $(DESTDIR)${gamedir}; \
+        umask 022; $(top_srcdir)/build-aux/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 \
diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c
index 7871a804997..a1fe10b863a 100644
--- a/lib-src/ebrowse.c
+++ b/lib-src/ebrowse.c
@@ -1,6 +1,6 @@
 /* ebrowse.c --- parsing files for the ebrowse C++ browser
 
-Copyright (C) 1992-2011  Free Software Foundation, Inc.
+Copyright (C) 1992-2012  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -20,11 +20,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 #include <stdio.h>
-
-#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
-#endif
-
 #include <string.h>
 #include <ctype.h>
 #include <assert.h>
@@ -49,16 +45,16 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* The character used as a separator in path lists (like $PATH).  */
 
-#if defined(__MSDOS__)
+#if defined (__MSDOS__)
 #define PATH_LIST_SEPARATOR ';'
-#define FILENAME_EQ(X,Y)    (strcasecmp(X,Y) == 0)
+#define FILENAME_EQ(X,Y)    (strcasecmp (X,Y) == 0)
 #else
-#if defined(WINDOWSNT)
+#if defined (WINDOWSNT)
 #define PATH_LIST_SEPARATOR ';'
-#define FILENAME_EQ(X,Y)    (stricmp(X,Y) == 0)
+#define FILENAME_EQ(X,Y)    (stricmp (X,Y) == 0)
 #else
 #define PATH_LIST_SEPARATOR ':'
-#define FILENAME_EQ(X,Y)    (streq(X,Y))
+#define FILENAME_EQ(X,Y)    (streq (X,Y))
 #endif
 #endif
 /* The default output file name.  */
@@ -985,7 +981,7 @@ make_namespace (char *name, struct sym *context)
 }
 
 
-/* Find the symbol for namespace NAME.  If not found, retrun NULL */
+/* Find the symbol for namespace NAME.  If not found, return NULL */
 
 static struct sym *
 check_namespace (char *name, struct sym *context)
@@ -2515,7 +2511,7 @@ member (struct sym *cls, int vis)
 
           /* A function or class may follow.  */
         case TEMPLATE:
-          MATCH();
+          MATCH ();
           SET_FLAG (flags, F_TEMPLATE);
           /* Skip over template argument list */
           SKIP_MATCHING_IF ('<');
@@ -2934,7 +2930,7 @@ parse_qualified_ident_or_type (char **last_id)
     }
 
   while (enter--)
-    leave_namespace();
+    leave_namespace ();
 
   return cls;
 }
@@ -3530,7 +3526,7 @@ static void
 version (void)
 {
   /* Makes it easier to update automatically. */
-  char emacs_copyright[] = "Copyright (C) 2011 Free Software Foundation, Inc.";
+  char emacs_copyright[] = "Copyright (C) 2012 Free Software Foundation, Inc.";
 
   printf ("ebrowse %s\n", VERSION);
   puts (emacs_copyright);
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 2af139aee6d..049886ed2ba 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -1,5 +1,5 @@
 /* Client process that communicates with GNU Emacs acting as server.
-   Copyright (C) 1986-1987, 1994, 1999-2011 Free Software Foundation, Inc.
+   Copyright (C) 1986-1987, 1994, 1999-2012 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -152,7 +152,7 @@ int tty = 0;
 const char *alternate_editor = NULL;
 
 /* If non-NULL, the filename of the UNIX socket.  */
-char *socket_name = NULL;
+const char *socket_name = NULL;
 
 /* If non-NULL, the filename of the authentication file.  */
 const char *server_file = NULL;
@@ -194,10 +194,10 @@ struct option longopts[] =
 
 /* Like malloc but get fatal error if memory is exhausted.  */
 
-static long *
-xmalloc (unsigned int size)
+static void *
+xmalloc (size_t size)
 {
-  long *result = (long *) malloc (size);
+  void *result = malloc (size);
   if (result == NULL)
     {
       perror ("malloc");
@@ -250,32 +250,33 @@ get_current_dir_name (void)
       )
     {
       buf = (char *) xmalloc (strlen (pwd) + 1);
-      if (!buf)
-        return NULL;
       strcpy (buf, pwd);
     }
 #ifdef HAVE_GETCWD
   else
     {
       size_t buf_size = 1024;
-      buf = (char *) xmalloc (buf_size);
-      if (!buf)
-        return NULL;
       for (;;)
         {
+          int tmp_errno;
+          buf = malloc (buf_size);
+          if (! buf)
+            break;
           if (getcwd (buf, buf_size) == buf)
             break;
-          if (errno != ERANGE)
+          tmp_errno = errno;
+          free (buf);
+          if (tmp_errno != ERANGE)
             {
-              int tmp_errno = errno;
-              free (buf);
               errno = tmp_errno;
               return NULL;
             }
           buf_size *= 2;
-          buf = (char *) realloc (buf, buf_size);
-          if (!buf)
-            return NULL;
+          if (! buf_size)
+            {
+              errno = ENOMEM;
+              return NULL;
+            }
         }
     }
 #else
@@ -283,8 +284,6 @@ get_current_dir_name (void)
     {
       /* We need MAXPATHLEN here.  */
       buf = (char *) xmalloc (MAXPATHLEN + 1);
-      if (!buf)
-        return NULL;
       if (getwd (buf) == NULL)
         {
           int tmp_errno = errno;
@@ -360,7 +359,7 @@ w32_getenv (char *envvar)
   char *value;
   DWORD dwType;
 
-  if (value = getenv (envvar))
+  if ((value = getenv (envvar)))
     /* Found in the environment.  strdup it, because values returned
        by getenv cannot be free'd.  */
     return xstrdup (value);
@@ -383,7 +382,7 @@ w32_getenv (char *envvar)
     {
       DWORD size;
 
-      if (size = ExpandEnvironmentStrings (value, NULL, 0))
+      if ((size = ExpandEnvironmentStrings (value, NULL, 0)))
         {
           char *buffer = (char *) xmalloc (size);
           if (ExpandEnvironmentStrings (value, buffer, size))
@@ -494,16 +493,17 @@ 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, format);
-  vsprintf (msg, format, args);
-  va_end (args);
 
 #ifdef WINDOWSNT
   if (w32_window_app ())
     {
+      char msg[2048];
+      vsnprintf (msg, sizeof msg, format, args);
+      msg[sizeof msg - 1] = '\0';
+
       if (is_error)
         MessageBox (NULL, msg, "Emacsclient ERROR", MB_ICONERROR);
       else
@@ -514,9 +514,11 @@ message (int is_error, const char *format, ...)
     {
       FILE *f = is_error ? stderr : stdout;
 
-      fputs (msg, f);
+      vfprintf (f, format, args);
       fflush (f);
     }
+
+  va_end (args);
 }
 
 /* Decode the options from argv and argc.
@@ -636,6 +638,22 @@ decode_options (int argc, char **argv)
   if (display && strlen (display) == 0)
     display = NULL;
 
+#ifdef WINDOWSNT
+  /* Emacs on Windows does not support GUI and console frames in the same
+     instance.  So, it makes sense to treat the -t and -c options as
+     equivalent, and open a new frame regardless of whether the running
+     instance is GUI or console.  Ideally, we would only set tty = 1 when
+     the instance is running in a console, but alas we don't know that.
+     The simplest workaround is to always ask for a tty frame, and let
+     server.el check whether it makes sense.  */
+  if (tty || !current_frame)
+    {
+      display = (const char *) ttyname;
+      current_frame = 0;
+      tty = 1;
+    }
+#endif
+
   /* If no display is available, new frames are tty frames.  */
   if (!current_frame && !display)
     tty = 1;
@@ -652,14 +670,6 @@ decode_options (int argc, char **argv)
 an empty string");
       exit (EXIT_FAILURE);
     }
-
-  /* TTY frames not supported on Windows.  Continue using GUI rather than
-     forcing the user to change their command-line.  This is required since
-     tty is set above if certain options are given and $DISPLAY is not set,
-     which is not obvious to users.  */
-  if (tty)
-      tty = 0;
-
 #endif /* WINDOWSNT */
 }
 
@@ -945,32 +955,39 @@ initialize_sockets (void)
  * the Emacs server: host, port, and authentication string.
  */
 static int
-get_server_config (struct sockaddr_in *server, char *authentication)
+get_server_config (const char *config_file, struct sockaddr_in *server,
+                   char *authentication)
 {
   char dotted[32];
   char *port;
   FILE *config = NULL;
 
-  if (file_name_absolute_p (server_file))
-    config = fopen (server_file, "rb");
+  if (file_name_absolute_p (config_file))
+    config = fopen (config_file, "rb");
   else
     {
       const char *home = egetenv ("HOME");
 
       if (home)
         {
-          char *path = alloca (strlen (home) + strlen (server_file)
-                               + EXTRA_SPACE);
-          sprintf (path, "%s/.emacs.d/server/%s", home, server_file);
+          char *path = xmalloc (strlen (home) + strlen (config_file)
+                                + EXTRA_SPACE);
+          strcpy (path, home);
+          strcat (path, "/.emacs.d/server/");
+          strcat (path, config_file);
           config = fopen (path, "rb");
+          free (path);
         }
 #ifdef WINDOWSNT
       if (!config && (home = egetenv ("APPDATA")))
         {
-          char *path = alloca (strlen (home) + strlen (server_file)
-                               + EXTRA_SPACE);
-          sprintf (path, "%s/.emacs.d/server/%s", home, server_file);
+          char *path = xmalloc (strlen (home) + strlen (config_file)
+                                + EXTRA_SPACE);
+          strcpy (path, home);
+          strcat (path, "/.emacs.d/server/");
+          strcat (path, config_file);
           config = fopen (path, "rb");
+          free (path);
         }
 #endif
     }
@@ -1003,14 +1020,14 @@ get_server_config (struct sockaddr_in *server, char *authentication)
 }
 
 static HSOCKET
-set_tcp_socket (void)
+set_tcp_socket (const char *local_server_file)
 {
   HSOCKET s;
   struct sockaddr_in server;
   struct linger l_arg = {1, 1};
   char auth_string[AUTH_KEY_LENGTH + 1];
 
-  if (! get_server_config (&server, auth_string))
+  if (! get_server_config (local_server_file, &server, auth_string))
     return INVALID_SOCKET;
 
   if (server.sin_addr.s_addr != inet_addr ("127.0.0.1") && !quiet)
@@ -1185,7 +1202,7 @@ handle_sigtstp (int signalnum)
     send_to_emacs (emacs_socket, "-suspend \n");
 
   /* Unblock this signal and call the default handler by temporarily
-     changing the handler and resignalling. */
+     changing the handler and resignaling.  */
   sigprocmask (SIG_BLOCK, NULL, &set);
   sigdelset (&set, signalnum);
   signal (signalnum, SIG_DFL);
@@ -1220,7 +1237,7 @@ init_signals (void)
 
 
 static HSOCKET
-set_local_socket (void)
+set_local_socket (const char *local_socket_name)
 {
   HSOCKET s;
   struct sockaddr_un server;
@@ -1238,23 +1255,20 @@ set_local_socket (void)
   server.sun_family = AF_UNIX;
 
   {
-    int sock_status = 0;
-    int default_sock = !socket_name;
-    int saved_errno = 0;
-    const char *server_name = "server";
+    int sock_status;
+    int use_tmpdir = 0;
+    int saved_errno;
+    const char *server_name = local_socket_name;
     const char *tmpdir IF_LINT ( = NULL);
+    char *tmpdir_storage = NULL;
+    char *socket_name_storage = NULL;
 
-    if (socket_name && !strchr (socket_name, '/')
-        && !strchr (socket_name, '\\'))
+    if (!strchr (local_socket_name, '/') && !strchr (local_socket_name, '\\'))
       {
         /* socket_name is a file name component.  */
-        server_name = socket_name;
-        socket_name = NULL;
-        default_sock = 1;       /* Try both UIDs.  */
-      }
-
-    if (default_sock)
-      {
+        long uid = geteuid ();
+        ptrdiff_t tmpdirlen;
+        use_tmpdir = 1;
         tmpdir = egetenv ("TMPDIR");
         if (!tmpdir)
           {
@@ -1265,32 +1279,35 @@ set_local_socket (void)
             size_t n = confstr (_CS_DARWIN_USER_TEMP_DIR, NULL, (size_t) 0);
             if (n > 0)
               {
-                tmpdir = alloca (n);
+                tmpdir = tmpdir_storage = xmalloc (n);
                 confstr (_CS_DARWIN_USER_TEMP_DIR, tmpdir, n);
               }
             else
 #endif
               tmpdir = "/tmp";
           }
-        socket_name = alloca (strlen (tmpdir) + strlen (server_name)
-                              + EXTRA_SPACE);
-        sprintf (socket_name, "%s/emacs%d/%s",
-                 tmpdir, (int) geteuid (), server_name);
+        tmpdirlen = strlen (tmpdir);
+        socket_name_storage =
+          xmalloc (tmpdirlen + strlen (server_name) + EXTRA_SPACE);
+        strcpy (socket_name_storage, tmpdir);
+        sprintf (socket_name_storage + tmpdirlen, "/emacs%ld/", uid);
+        strcat (socket_name_storage + tmpdirlen, server_name);
+        local_socket_name = socket_name_storage;
       }
 
-    if (strlen (socket_name) < sizeof (server.sun_path))
-      strcpy (server.sun_path, socket_name);
+    if (strlen (local_socket_name) < sizeof (server.sun_path))
+      strcpy (server.sun_path, local_socket_name);
     else
       {
         message (TRUE, "%s: socket-name %s too long\n",
-                 progname, socket_name);
+                 progname, local_socket_name);
         fail ();
       }
 
     /* See if the socket exists, and if it's owned by us. */
     sock_status = socket_status (server.sun_path);
     saved_errno = errno;
-    if (sock_status && default_sock)
+    if (sock_status && use_tmpdir)
       {
         /* Failing that, see if LOGNAME or USER exist and differ from
            our euid.  If so, look for a socket based on the UID
@@ -1309,19 +1326,23 @@ set_local_socket (void)
             if (pw && (pw->pw_uid != geteuid ()))
               {
                 /* We're running under su, apparently. */
-                socket_name = alloca (strlen (tmpdir) + strlen (server_name)
-                                      + EXTRA_SPACE);
-                sprintf (socket_name, "%s/emacs%d/%s",
-                         tmpdir, (int) pw->pw_uid, server_name);
-
-                if (strlen (socket_name) < sizeof (server.sun_path))
-                  strcpy (server.sun_path, socket_name);
+                long uid = pw->pw_uid;
+                ptrdiff_t tmpdirlen = strlen (tmpdir);
+                char *user_socket_name
+                  = xmalloc (tmpdirlen + strlen (server_name) + EXTRA_SPACE);
+                strcpy (user_socket_name, tmpdir);
+                sprintf (user_socket_name + tmpdirlen, "/emacs%ld/", uid);
+                strcat (user_socket_name + tmpdirlen, server_name);
+
+                if (strlen (user_socket_name) < sizeof (server.sun_path))
+                  strcpy (server.sun_path, user_socket_name);
                 else
                   {
                     message (TRUE, "%s: socket-name %s too long\n",
-                             progname, socket_name);
+                             progname, user_socket_name);
                     exit (EXIT_FAILURE);
                   }
+                free (user_socket_name);
 
                 sock_status = socket_status (server.sun_path);
                 saved_errno = errno;
@@ -1331,6 +1352,9 @@ set_local_socket (void)
           }
       }
 
+    free (socket_name_storage);
+    free (tmpdir_storage);
+
     switch (sock_status)
       {
       case 1:
@@ -1372,6 +1396,7 @@ static HSOCKET
 set_socket (int no_exit_if_error)
 {
   HSOCKET s;
+  const char *local_server_file = server_file;
 
   INITIALIZE ();
 
@@ -1379,7 +1404,7 @@ set_socket (int no_exit_if_error)
   /* Explicit --socket-name argument.  */
   if (socket_name)
     {
-      s = set_local_socket ();
+      s = set_local_socket (socket_name);
       if ((s != INVALID_SOCKET) || no_exit_if_error)
         return s;
       message (TRUE, "%s: error accessing socket \"%s\"\n",
@@ -1389,30 +1414,29 @@ set_socket (int no_exit_if_error)
 #endif
 
   /* Explicit --server-file arg or EMACS_SERVER_FILE variable.  */
-  if (!server_file)
-    server_file = egetenv ("EMACS_SERVER_FILE");
+  if (!local_server_file)
+    local_server_file = egetenv ("EMACS_SERVER_FILE");
 
-  if (server_file)
+  if (local_server_file)
     {
-      s = set_tcp_socket ();
+      s = set_tcp_socket (local_server_file);
       if ((s != INVALID_SOCKET) || no_exit_if_error)
         return s;
 
       message (TRUE, "%s: error accessing server file \"%s\"\n",
-               progname, server_file);
+               progname, local_server_file);
       exit (EXIT_FAILURE);
     }
 
 #ifndef NO_SOCKETS_IN_FILE_SYSTEM
   /* Implicit local socket.  */
-  s = set_local_socket ();
+  s = set_local_socket ("server");
   if (s != INVALID_SOCKET)
     return s;
 #endif
 
   /* Implicit server file.  */
-  server_file = "server";
-  s = set_tcp_socket ();
+  s = set_tcp_socket ("server");
   if ((s != INVALID_SOCKET) || no_exit_if_error)
     return s;
 
@@ -1526,8 +1550,8 @@ start_daemon_and_retry_set_socket (void)
         {
           /* Pass  --daemon=socket_name as argument.  */
           const char *deq = "--daemon=";
-          char *daemon_arg = alloca (strlen (deq)
-                                     + strlen (socket_name) + 1);
+          char *daemon_arg = xmalloc (strlen (deq)
+                                      + strlen (socket_name) + 1);
           strcpy (daemon_arg, deq);
           strcat (daemon_arg, socket_name);
           d_argv[1] = daemon_arg;
@@ -1544,8 +1568,6 @@ main (int argc, char **argv)
   int rl = 0, needlf = 0;
   char *cwd, *str;
   char string[BUFSIZ+1];
-  int null_socket_name IF_LINT ( = 0);
-  int null_server_file IF_LINT ( = 0);
   int start_daemon_if_needed;
   int exit_status = EXIT_SUCCESS;
 
@@ -1573,14 +1595,6 @@ main (int argc, char **argv)
      in case of failure to connect.  */
   start_daemon_if_needed = (alternate_editor
                             && (alternate_editor[0] == '\0'));
-  if (start_daemon_if_needed)
-    {
-      /* set_socket changes the values for socket_name and
-         server_file, we need to reset them, if they were NULL before
-         for the second call to set_socket.  */
-      null_socket_name = (socket_name == NULL);
-      null_server_file = (server_file == NULL);
-    }
 
   emacs_socket = set_socket (alternate_editor || start_daemon_if_needed);
   if (emacs_socket == INVALID_SOCKET)
@@ -1588,13 +1602,6 @@ main (int argc, char **argv)
       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 ();
     }
 
@@ -1614,7 +1621,11 @@ main (int argc, char **argv)
   /* Send over our environment and current directory. */
   if (!current_frame)
     {
+#ifndef WINDOWSNT
+      /* This is defined in stdlib.h on MS-Windows.  It's defined in
+         unistd.h on some POSIX hosts, but not all (Bug#10155).  */
       extern char **environ;
+#endif
       int i;
       for (i = 0; environ[i]; i++)
         {
@@ -1757,7 +1768,7 @@ main (int argc, char **argv)
   /* Now, wait for an answer and print any messages.  */
   while (exit_status == EXIT_SUCCESS)
     {
-      char *p;
+      char *p, *end_p;
       do
         {
           errno = 0;
@@ -1772,61 +1783,72 @@ main (int argc, char **argv)
 
       string[rl] = '\0';
 
-      p = string + strlen (string) - 1;
-      while (p > string && *p == '\n')
-        *p-- = 0;
+      /* Loop over all NL-terminated messages.  */
+      for (end_p = p = string; end_p != NULL && *end_p != '\0'; p = end_p)
+        {
+          end_p = strchr (p, '\n');
+          if (end_p != NULL)
+            *end_p++ = '\0';
 
-      if (strprefix ("-emacs-pid ", string))
-        {
-          /* -emacs-pid PID: The process id of the Emacs process. */
-          emacs_pid = strtol (string + strlen ("-emacs-pid"), NULL, 10);
-        }
-      else if (strprefix ("-window-system-unsupported ", string))
-        {
-          /* -window-system-unsupported: Emacs was compiled without X
-              support.  Try again on the terminal. */
-          nowait = 0;
-          tty = 1;
-          goto retry;
-        }
-      else if (strprefix ("-print ", string))
-        {
-          /* -print STRING: Print STRING on the terminal. */
-          str = unquote_argument (string + strlen ("-print "));
-          if (needlf)
-            printf ("\n");
-          printf ("%s", str);
-          needlf = str[0] == '\0' ? needlf : str[strlen (str) - 1] != '\n';
-        }
-      else if (strprefix ("-error ", string))
-        {
-          /* -error DESCRIPTION: Signal an error on the terminal. */
-          str = unquote_argument (string + strlen ("-error "));
-          if (needlf)
-            printf ("\n");
-          fprintf (stderr, "*ERROR*: %s", str);
-          needlf = str[0] == '\0' ? needlf : str[strlen (str) - 1] != '\n';
-          exit_status = EXIT_FAILURE;
-        }
+          if (strprefix ("-emacs-pid ", p))
+            {
+              /* -emacs-pid PID: The process id of the Emacs process. */
+              emacs_pid = strtol (p + strlen ("-emacs-pid"), NULL, 10);
+            }
+          else if (strprefix ("-window-system-unsupported ", p))
+            {
+              /* -window-system-unsupported: Emacs was compiled without X
+                 support.  Try again on the terminal. */
+              nowait = 0;
+              tty = 1;
+              goto retry;
+            }
+          else if (strprefix ("-print ", p))
+            {
+              /* -print STRING: Print STRING on the terminal. */
+              str = unquote_argument (p + strlen ("-print "));
+              if (needlf)
+                printf ("\n");
+              printf ("%s", str);
+              needlf = str[0] == '\0' ? needlf : str[strlen (str) - 1] != '\n';
+            }
+          else if (strprefix ("-print-nonl ", p))
+            {
+              /* -print-nonl STRING: Print STRING on the terminal.
+                 Used to continue a preceding -print command.  */
+              str = unquote_argument (p + strlen ("-print-nonl "));
+              printf ("%s", str);
+              needlf = str[0] == '\0' ? needlf : str[strlen (str) - 1] != '\n';
+            }
+          else if (strprefix ("-error ", p))
+            {
+              /* -error DESCRIPTION: Signal an error on the terminal. */
+              str = unquote_argument (p + strlen ("-error "));
+              if (needlf)
+                printf ("\n");
+              fprintf (stderr, "*ERROR*: %s", str);
+              needlf = str[0] == '\0' ? needlf : str[strlen (str) - 1] != '\n';
+              exit_status = EXIT_FAILURE;
+            }
 #ifdef SIGSTOP
-      else if (strprefix ("-suspend ", string))
-        {
-          /* -suspend: Suspend this terminal, i.e., stop the process. */
-          if (needlf)
-            printf ("\n");
-          needlf = 0;
-          kill (0, SIGSTOP);
-        }
+          else if (strprefix ("-suspend ", p))
+            {
+              /* -suspend: Suspend this terminal, i.e., stop the process. */
+              if (needlf)
+                printf ("\n");
+              needlf = 0;
+              kill (0, SIGSTOP);
+            }
 #endif
-      else
-        {
-          /* Unknown command. */
-          if (needlf)
-            printf ("\n");
-          printf ("*ERROR*: Unknown message: %s", string);
-          needlf = string[0]
-            == '\0' ? needlf : string[strlen (string) - 1] != '\n';
-        }
+          else
+            {
+              /* Unknown command. */
+              if (needlf)
+                printf ("\n");
+              needlf = 0;
+              printf ("*ERROR*: Unknown message: %s\n", p);
+            }
+        }
     }
 
   if (needlf)
diff --git a/lib-src/etags.c b/lib-src/etags.c
index 693c999047f..c88473ad525 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -28,7 +28,7 @@ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-Copyright (C) 1984, 1987-1989, 1993-1995, 1998-2011
+Copyright (C) 1984, 1987-1989, 1993-1995, 1998-2012
   Free Software Foundation, Inc.
 
 This file is not considered part of GNU Emacs.
@@ -103,7 +103,7 @@ char pot_etags_version[] = "@(#) pot revision number is 17.38.1.4";
 #   define PTR void *
 # endif
 #else  /* no config.h */
-# if defined(__STDC__) && (__STDC__ || defined(__SUNPRO_C))
+# if defined (__STDC__) && (__STDC__ || defined (__SUNPRO_C))
 #   define PTR void *           /* for generic pointers */
 # else /* not standard C */
 #   define const                /* remove const for old compilers' sake */
@@ -138,9 +138,7 @@ char pot_etags_version[] = "@(#) pot revision number is 17.38.1.4";
 #endif /* MSDOS */
 
 #ifdef WINDOWSNT
-# include <stdlib.h>
 # include <fcntl.h>
-# include <string.h>
 # include <direct.h>
 # include <io.h>
 # define MAXPATHLEN _MAX_PATH
@@ -151,27 +149,6 @@ char pot_etags_version[] = "@(#) pot revision number is 17.38.1.4";
 #   define HAVE_GETCWD
 # endif /* undef HAVE_GETCWD */
 #else /* not WINDOWSNT */
-# ifdef STDC_HEADERS
-#  include <stdlib.h>
-#  include <string.h>
-# else /* no standard C headers */
-   extern char *getenv (const char *);
-   extern char *strcpy (char *, const char *);
-   extern char *strncpy (char *, const char *, unsigned long);
-   extern char *strcat (char *, const char *);
-   extern char *strncat (char *, const char *, unsigned long);
-   extern int strcmp (const char *, const char *);
-   extern int strncmp (const char *, const char *, unsigned long);
-   extern int system (const char *);
-   extern unsigned long strlen (const char *);
-   extern void *malloc (unsigned long);
-   extern void *realloc (void *, unsigned long);
-   extern void exit (int);
-   extern void free (void *);
-   extern void *memmove (void *, const void *, unsigned long);
-#  define EXIT_SUCCESS  0
-#  define EXIT_FAILURE  1
-# endif
 #endif /* !WINDOWSNT */
 
 #include <unistd.h>
@@ -181,6 +158,8 @@ char pot_etags_version[] = "@(#) pot revision number is 17.38.1.4";
 # endif
 #endif /* HAVE_UNISTD_H */
 
+#include <stdlib.h>
+#include <string.h>
 #include <stdio.h>
 #include <ctype.h>
 #include <errno.h>
@@ -223,25 +202,25 @@ If you want regular expression support, you should delete this notice and
 # define CTAGS FALSE
 #endif
 
-#define streq(s,t)      (assert((s)!=NULL || (t)!=NULL), !strcmp (s, t))
-#define strcaseeq(s,t)  (assert((s)!=NULL && (t)!=NULL), !etags_strcasecmp (s, t))
-#define strneq(s,t,n)   (assert((s)!=NULL || (t)!=NULL), !strncmp (s, t, n))
-#define strncaseeq(s,t,n) (assert((s)!=NULL && (t)!=NULL), !etags_strncasecmp (s, t, n))
+#define streq(s,t)      (assert ((s)!=NULL || (t)!=NULL), !strcmp (s, t))
+#define strcaseeq(s,t)  (assert ((s)!=NULL && (t)!=NULL), !etags_strcasecmp (s, t))
+#define strneq(s,t,n)   (assert ((s)!=NULL || (t)!=NULL), !strncmp (s, t, n))
+#define strncaseeq(s,t,n) (assert ((s)!=NULL && (t)!=NULL), !etags_strncasecmp (s, t, n))
 
 #define CHARS 256               /* 2^sizeof(char) */
 #define CHAR(x)         ((unsigned int)(x) & (CHARS - 1))
-#define iswhite(c)      (_wht[CHAR(c)]) /* c is white (see white) */
-#define notinname(c)    (_nin[CHAR(c)]) /* c is not in a name (see nonam) */
-#define begtoken(c)     (_btk[CHAR(c)]) /* c can start token (see begtk) */
-#define intoken(c)      (_itk[CHAR(c)]) /* c can be in token (see midtk) */
-#define endtoken(c)     (_etk[CHAR(c)]) /* c ends tokens (see endtk) */
+#define iswhite(c)      (_wht[CHAR (c)]) /* c is white (see white) */
+#define notinname(c)    (_nin[CHAR (c)]) /* c is not in a name (see nonam) */
+#define begtoken(c)     (_btk[CHAR (c)]) /* c can start token (see begtk) */
+#define intoken(c)      (_itk[CHAR (c)]) /* c can be in token (see midtk) */
+#define endtoken(c)     (_etk[CHAR (c)]) /* c ends tokens (see endtk) */
 
-#define ISALNUM(c)      isalnum (CHAR(c))
-#define ISALPHA(c)      isalpha (CHAR(c))
-#define ISDIGIT(c)      isdigit (CHAR(c))
-#define ISLOWER(c)      islower (CHAR(c))
+#define ISALNUM(c)      isalnum (CHAR (c))
+#define ISALPHA(c)      isalpha (CHAR (c))
+#define ISDIGIT(c)      isdigit (CHAR (c))
+#define ISLOWER(c)      islower (CHAR (c))
 
-#define lowcase(c)      tolower (CHAR(c))
+#define lowcase(c)      tolower (CHAR (c))
 
 
 /*
@@ -347,7 +326,7 @@ typedef struct regexp
   struct re_pattern_buffer *pat; /* the compiled pattern */
   struct re_registers regs;     /* re registers */
   bool error_signaled;          /* already signaled for this regexp */
-  bool force_explicit_name;     /* do not allow implict tag name */
+  bool force_explicit_name;     /* do not allow implicit tag name */
   bool ignore_case;             /* ignore case when matching */
   bool multi_line;              /* do a multi-line match on the whole file */
 } regexp;
@@ -435,8 +414,8 @@ static bool filename_is_absolute (char *f);
 static void canonicalize_filename (char *);
 static void linebuffer_init (linebuffer *);
 static void linebuffer_setlen (linebuffer *, int);
-static PTR xmalloc (unsigned int);
-static PTR xrealloc (char *, unsigned int);
+static PTR xmalloc (size_t);
+static PTR xrealloc (char *, size_t);
 
 
 static char searchar = '/';     /* use /.../ searches */
@@ -446,6 +425,7 @@ static char *progname;		/* name this program was invoked with */
 static char *cwd;               /* current working directory */
 static char *tagfiledir;        /* directory of tagfile */
 static FILE *tagf;              /* ioptr for tags file */
+static ptrdiff_t whatlen_max;   /* maximum length of any 'what' member */
 
 static fdesc *fdhead;           /* head of file description list */
 static fdesc *curfdp;           /* current file description */
@@ -631,7 +611,7 @@ using `--declarations'.";
 static const char *Cplusplus_suffixes [] =
   { "C", "c++", "cc", "cpp", "cxx", "H", "h++", "hh", "hpp", "hxx",
     "M",                        /* Objective C++ */
-    "pdb",                      /* Postscript with C syntax */
+    "pdb",                      /* PostScript with C syntax */
     NULL };
 static const char Cplusplus_help [] =
 "In C++ code, all the tag constructs of C code are tagged.  (Use\n\
@@ -887,7 +867,7 @@ static void
 print_version (void)
 {
   /* Makes it easier to update automatically. */
-  char emacs_copyright[] = "Copyright (C) 2011 Free Software Foundation, Inc.";
+  char emacs_copyright[] = "Copyright (C) 2012 Free Software Foundation, Inc.";
 
   printf ("%s (%s %s)\n", (CTAGS) ? "ctags" : "etags", EMACS_NAME, VERSION);
   puts (emacs_copyright);
@@ -1087,6 +1067,7 @@ main (int argc, char **argv)
   int current_arg, file_count;
   linebuffer filename_lb;
   bool help_asked = FALSE;
+  ptrdiff_t len;
  char *optstring;
  int opt;
 
@@ -1131,6 +1112,9 @@ main (int argc, char **argv)
         /* This means that a file name has been seen.  Record it. */
         argbuffer[current_arg].arg_type = at_filename;
         argbuffer[current_arg].what     = optarg;
+        len = strlen (optarg);
+        if (whatlen_max < len)
+          whatlen_max = len;
         ++current_arg;
         ++file_count;
         break;
@@ -1139,6 +1123,9 @@ main (int argc, char **argv)
         /* Parse standard input.  Idea by Vivek <vivek@etla.org>. */
         argbuffer[current_arg].arg_type = at_stdin;
         argbuffer[current_arg].what     = optarg;
+        len = strlen (optarg);
+        if (whatlen_max < len)
+          whatlen_max = len;
         ++current_arg;
         ++file_count;
         if (parsing_stdin)
@@ -1181,6 +1168,9 @@ main (int argc, char **argv)
       case 'r':
         argbuffer[current_arg].arg_type = at_regexp;
         argbuffer[current_arg].what = optarg;
+        len = strlen (optarg);
+        if (whatlen_max < len)
+          whatlen_max = len;
         ++current_arg;
         break;
       case 'R':
@@ -1219,6 +1209,9 @@ main (int argc, char **argv)
     {
       argbuffer[current_arg].arg_type = at_filename;
       argbuffer[current_arg].what = argv[optind];
+      len = strlen (argv[optind]);
+      if (whatlen_max < len)
+        whatlen_max = len;
       ++current_arg;
       ++file_count;
     }
@@ -1352,7 +1345,9 @@ main (int argc, char **argv)
   /* From here on, we are in (CTAGS && !cxref_style) */
   if (update)
     {
-      char cmd[BUFSIZ];
+      char *cmd =
+        xmalloc (strlen (tagfile) + whatlen_max +
+                 sizeof "mv..OTAGS;fgrep -v '\t\t' OTAGS >;rm OTAGS");
       for (i = 0; i < current_arg; ++i)
         {
           switch (argbuffer[i].arg_type)
@@ -1363,12 +1358,17 @@ main (int argc, char **argv)
             default:
               continue;         /* the for loop */
             }
-          sprintf (cmd,
-                   "mv %s OTAGS;fgrep -v '\t%s\t' OTAGS >%s;rm OTAGS",
-                   tagfile, argbuffer[i].what, tagfile);
+          strcpy (cmd, "mv ");
+          strcat (cmd, tagfile);
+          strcat (cmd, " OTAGS;fgrep -v '\t");
+          strcat (cmd, argbuffer[i].what);
+          strcat (cmd, "\t' OTAGS >");
+          strcat (cmd, tagfile);
+          strcat (cmd, ";rm OTAGS");
           if (system (cmd) != EXIT_SUCCESS)
             fatal ("failed to execute shell command", (char *)NULL);
         }
+      free (cmd);
       append_to_tagfile = TRUE;
     }
 
@@ -1384,11 +1384,14 @@ main (int argc, char **argv)
   if (CTAGS)
     if (append_to_tagfile || update)
       {
-        char cmd[2*BUFSIZ+20];
+        char *cmd = xmalloc (2 * strlen (tagfile) + sizeof "sort -u -o..");
         /* Maybe these should be used:
            setenv ("LC_COLLATE", "C", 1);
            setenv ("LC_ALL", "C", 1); */
-        sprintf (cmd, "sort -u -o %.*s %.*s", BUFSIZ, tagfile, BUFSIZ, tagfile);
+        strcpy (cmd, "sort -u -o ");
+        strcat (cmd, tagfile);
+        strcat (cmd, " ");
+        strcat (cmd, tagfile);
         exit (system (cmd));
       }
   return EXIT_SUCCESS;
@@ -1722,16 +1725,16 @@ init (void)
   register int i;
 
   for (i = 0; i < CHARS; i++)
-    iswhite(i) = notinname(i) = begtoken(i) = intoken(i) = endtoken(i) = FALSE;
+    iswhite (i) = notinname (i) = begtoken (i) = intoken (i) = endtoken (i) = FALSE;
   for (sp = white; *sp != '\0'; sp++) iswhite (*sp) = TRUE;
   for (sp = nonam; *sp != '\0'; sp++) notinname (*sp) = TRUE;
-  notinname('\0') = notinname('\n');
+  notinname ('\0') = notinname ('\n');
   for (sp = begtk; *sp != '\0'; sp++) begtoken (*sp) = TRUE;
-  begtoken('\0') = begtoken('\n');
+  begtoken ('\0') = begtoken ('\n');
   for (sp = midtk; *sp != '\0'; sp++) intoken (*sp) = TRUE;
-  intoken('\0') = intoken('\n');
+  intoken ('\0') = intoken ('\n');
   for (sp = endtk; *sp != '\0'; sp++) endtoken (*sp) = TRUE;
-  endtoken('\0') = endtoken('\n');
+  endtoken ('\0') = endtoken ('\n');
 }
 
 /*
@@ -1859,10 +1862,10 @@ find_entries (FILE *inf)
 
   assert (parser != NULL);
 
-  /* Generic initialisations before reading from file. */
+  /* Generic initializations before reading from file. */
   linebuffer_setlen (&filebuf, 0); /* reset the file buffer */
 
-  /* Generic initialisations before parsing file with readline. */
+  /* Generic initializations before parsing file with readline. */
   lineno = 0;                  /* reset global line number */
   charno = 0;                  /* reset global char number */
   linecharno = 0;              /* reset global char number of line start */
@@ -1892,7 +1895,7 @@ find_entries (FILE *inf)
  *  4. the character, if any, immediately after NAME in LINESTART must
  *     also be a character in NONAM.
  *
- * The implementation uses the notinname() macro, which recognises the
+ * The implementation uses the notinname() macro, which recognizes the
  * characters stored in the string `nonam'.
  * etags.el needs to use the same characters that are in NONAM.
  */
@@ -3054,7 +3057,7 @@ make_C_tag (int isfun)
     make_tag (token_name.buffer, token_name.len, isfun, token.line,
               token.offset+token.length+1, token.lineno, token.linepos);
   else if (DEBUG)
-    {                             /* this branch is optimised away if !DEBUG */
+    {                             /* this branch is optimized away if !DEBUG */
       make_tag (concat ("INVALID TOKEN:-->", token_name.buffer, ""),
                 token_name.len + 17, isfun, token.line,
                 token.offset+token.length+1, token.lineno, token.linepos);
@@ -3186,24 +3189,12 @@ C_entries (int c_ext, FILE *inf)
             }
           continue;
         }
-      else if (bracketlev > 0)
-        {
-          switch (c)
-            {
-            case ']':
-              if (--bracketlev > 0)
-                continue;
-              break;
-            case '\0':
-              CNL_SAVE_DEFINEDEF ();
-              break;
-            }
-          continue;
-        }
       else switch (c)
         {
         case '"':
           inquote = TRUE;
+          if (bracketlev > 0)
+            continue;
           if (inattribute)
             break;
           switch (fvdef)
@@ -3221,9 +3212,11 @@ C_entries (int c_ext, FILE *inf)
           continue;
         case '\'':
           inchar = TRUE;
+          if (bracketlev > 0)
+            continue;
           if (inattribute)
             break;
-          if (fvdef != finlist && fvdef != fignore && fvdef !=vignore)
+          if (fvdef != finlist && fvdef != fignore && fvdef != vignore)
             {
               fvextern = FALSE;
               fvdef = fvnone;
@@ -3235,6 +3228,8 @@ C_entries (int c_ext, FILE *inf)
               incomm = TRUE;
               lp++;
               c = ' ';
+              if (bracketlev > 0)
+                continue;
             }
           else if (/* cplpl && */ *lp == '/')
             {
@@ -3267,7 +3262,7 @@ C_entries (int c_ext, FILE *inf)
               for (cp = newlb.buffer; cp < lp-1; cp++)
                 if (!iswhite (*cp))
                   {
-                    if (*cp == '*' && *(cp+1) == '/')
+                    if (*cp == '*' && cp[1] == '/')
                       {
                         cp++;
                         cpptoken = TRUE;
@@ -3281,7 +3276,17 @@ C_entries (int c_ext, FILE *inf)
           continue;
         case '[':
           bracketlev++;
-            continue;
+          continue;
+        default:
+          if (bracketlev > 0)
+            {
+              if (c == ']')
+                --bracketlev;
+              else if (c == '\0')
+                CNL_SAVE_DEFINEDEF ();
+              continue;
+            }
+          break;
         } /* switch (c) */
 
 
@@ -3301,7 +3306,7 @@ C_entries (int c_ext, FILE *inf)
                   if (c == ':' && *lp == ':' && begtoken (lp[1]))
                     /* This handles :: in the middle,
                        but not at the beginning of an identifier.
-                       Also, space-separated :: is not recognised. */
+                       Also, space-separated :: is not recognized. */
                     {
                       if (c_ext & C_AUTO) /* automatic detection of C++ */
                         c_ext = (c_ext | C_PLPL) & ~C_AUTO;
@@ -3956,16 +3961,16 @@ Yacc_entries (FILE *inf)
       )
 
 #define LOOKING_AT(cp, kw)  /* kw is the keyword, a literal string */   \
-  ((assert("" kw), TRUE)   /* syntax error if not a literal string */   \
-   && strneq ((cp), kw, sizeof(kw)-1)           /* cp points at kw */   \
-   && notinname ((cp)[sizeof(kw)-1])            /* end of kw */         \
-   && ((cp) = skip_spaces((cp)+sizeof(kw)-1)))  /* skip spaces */
+  ((assert ("" kw), TRUE)   /* syntax error if not a literal string */  \
+   && strneq ((cp), kw, sizeof (kw)-1)          /* cp points at kw */   \
+   && notinname ((cp)[sizeof (kw)-1])           /* end of kw */         \
+   && ((cp) = skip_spaces ((cp)+sizeof (kw)-1))) /* skip spaces */
 
 /* Similar to LOOKING_AT but does not use notinname, does not skip */
 #define LOOKING_AT_NOCASE(cp, kw) /* the keyword is a literal string */ \
-  ((assert("" kw), TRUE)     /* syntax error if not a literal string */ \
-   && strncaseeq ((cp), kw, sizeof(kw)-1)       /* cp points at kw */   \
-   && ((cp) += sizeof(kw)-1))                   /* skip spaces */
+  ((assert ("" kw), TRUE) /* syntax error if not a literal string */    \
+   && strncaseeq ((cp), kw, sizeof (kw)-1)      /* cp points at kw */   \
+   && ((cp) += sizeof (kw)-1))                  /* skip spaces */
 
 /*
  * Read a file, but do no processing.  This is used to do regexp
@@ -4045,6 +4050,12 @@ Fortran_functions (FILE *inf)
       if (LOOKING_AT_NOCASE (dbp, "recursive"))
         dbp = skip_spaces (dbp);
 
+      if (LOOKING_AT_NOCASE (dbp, "pure"))
+        dbp = skip_spaces (dbp);
+
+      if (LOOKING_AT_NOCASE (dbp, "elemental"))
+        dbp = skip_spaces (dbp);
+
       switch (lowcase (*dbp))
         {
         case 'i':
@@ -4132,7 +4143,7 @@ Ada_getit (FILE *inf, const char *name_qualifier)
           readline (&lb, inf);
           dbp = lb.buffer;
         }
-      switch (lowcase(*dbp))
+      switch (lowcase (*dbp))
         {
         case 'b':
           if (nocase_tail ("body"))
@@ -4236,7 +4247,7 @@ Ada_funcs (FILE *inf)
             }
 
           /* We are at the beginning of a token. */
-          switch (lowcase(*dbp))
+          switch (lowcase (*dbp))
             {
             case 'f':
               if (!packages_only && nocase_tail ("function"))
@@ -4362,7 +4373,7 @@ Perl_functions (FILE *inf)
               *cp = '\0';
               name = concat (package, "::", sp);
               *cp = savechar;
-              make_tag (name, strlen(name), TRUE,
+              make_tag (name, strlen (name), TRUE,
                         lb.buffer, cp - lb.buffer + 1, lineno, linecharno);
               free (name);
             }
@@ -4457,9 +4468,9 @@ PHP_functions (FILE *inf)
         }
       else if (LOOKING_AT (cp, "function"))
         {
-          if(*cp == '&')
+          if (*cp == '&')
             cp = skip_spaces (cp+1);
-          if(*cp != '\0')
+          if (*cp != '\0')
             {
               name = cp;
               while (!notinname (*cp))
@@ -4500,7 +4511,7 @@ PHP_functions (FILE *inf)
                && *cp == '$')
         {
           name = cp;
-          while (!notinname(*cp))
+          while (!notinname (*cp))
             cp++;
           make_tag (name, cp - name, FALSE,
                     lb.buffer, cp - lb.buffer + 1, lineno, linecharno);
@@ -4837,7 +4848,7 @@ Lua_functions (FILE *inf)
 
 
 /*
- * Postscript tags
+ * PostScript tags
  * Just look for lines where the first character is '/'
  * Also look at "defineps" for PSWrap
  * Ideas by:
@@ -4881,13 +4892,13 @@ Forth_words (FILE *inf)
 
   LOOP_ON_INPUT_LINES (inf, lb, bp)
     while ((bp = skip_spaces (bp))[0] != '\0')
-      if (bp[0] == '\\' && iswhite(bp[1]))
+      if (bp[0] == '\\' && iswhite (bp[1]))
         break;                  /* read next line */
-      else if (bp[0] == '(' && iswhite(bp[1]))
+      else if (bp[0] == '(' && iswhite (bp[1]))
         do                      /* skip to ) or eol */
           bp++;
         while (*bp != ')' && *bp != '\0');
-      else if ((bp[0] == ':' && iswhite(bp[1]) && bp++)
+      else if ((bp[0] == ':' && iswhite (bp[1]) && bp++)
                || LOOKING_AT_NOCASE (bp, "constant")
                || LOOKING_AT_NOCASE (bp, "code")
                || LOOKING_AT_NOCASE (bp, "create")
@@ -5276,7 +5287,7 @@ Prolog_functions (FILE *inf)
           /* Predicate or rule.  Store the function name so that we
              only generate a tag for the first clause.  */
           if (last == NULL)
-            last = xnew(len + 1, char);
+            last = xnew (len + 1, char);
           else if (len + 1 > allocated)
             xrnew (last, len + 1, char);
           allocated = len + 1;
@@ -5300,7 +5311,7 @@ prolog_skip_comment (linebuffer *plb, FILE *inf)
           return;
       readline (plb, inf);
     }
-  while (!feof(inf));
+  while (!feof (inf));
 }
 
 /*
@@ -5359,11 +5370,11 @@ prolog_atom (char *s, size_t pos)
 
   origpos = pos;
 
-  if (ISLOWER(s[pos]) || (s[pos] == '_'))
+  if (ISLOWER (s[pos]) || (s[pos] == '_'))
     {
       /* The atom is unquoted. */
       pos++;
-      while (ISALNUM(s[pos]) || (s[pos] == '_'))
+      while (ISALNUM (s[pos]) || (s[pos] == '_'))
         {
           pos++;
         }
@@ -5706,7 +5717,7 @@ add_regex (char *regexp_pattern, language *lang)
     single_line = FALSE;        /* dot does not match newline */
 
 
-  if (strlen(regexp_pattern) < 3)
+  if (strlen (regexp_pattern) < 3)
     {
       error ("null regexp", (char *)NULL);
       return;
@@ -5891,7 +5902,7 @@ regex_tag_multiline (void)
       if (!rp->multi_line)
         continue;               /* skip normal regexps */
 
-      /* Generic initialisations before parsing file from memory. */
+      /* Generic initializations before parsing file from memory. */
       lineno = 1;               /* reset global line number */
       charno = 0;               /* reset global char number */
       linecharno = 0;           /* reset global char number of line start */
@@ -6088,7 +6099,7 @@ readline (linebuffer *lbp, FILE *stream)
   lineno += 1;                  /* increment global line number */
   charno += result;             /* increment global char number */
 
-  /* Honour #line directives. */
+  /* Honor #line directives. */
   if (!no_line_directive)
     {
       static bool discard_until_line_directive;
@@ -6567,22 +6578,13 @@ absolute_filename (char *file, char *dir)
               else if (cp[0] != '/')
                 cp = slashp;
 #endif
-#ifdef HAVE_MEMMOVE
               memmove (cp, slashp + 3, strlen (slashp + 2));
-#else
-              /* Overlapping copy isn't really okay */
-              strcpy (cp, slashp + 3);
-#endif
               slashp = cp;
               continue;
             }
           else if (slashp[2] == '/' || slashp[2] == '\0')
             {
-#ifdef HAVE_MEMMOVE
               memmove (slashp, slashp + 2, strlen (slashp + 1));
-#else
-              strcpy (slashp, slashp + 2);
-#endif
               continue;
             }
         }
@@ -6626,7 +6628,7 @@ filename_is_absolute (char *fn)
 {
   return (fn[0] == '/'
 #ifdef DOS_NT
-          || (ISALPHA(fn[0]) && fn[1] == ':' && fn[2] == '/')
+          || (ISALPHA (fn[0]) && fn[1] == ':' && fn[2] == '/')
 #endif
           );
 }
@@ -6641,7 +6643,7 @@ canonicalize_filename (register char *fn)
 
 #ifdef DOS_NT
   /* Canonicalize drive letter case.  */
-# define ISUPPER(c)     isupper (CHAR(c))
+# define ISUPPER(c)     isupper (CHAR (c))
   if (fn[0] != '\0' && fn[1] == ':' && ISUPPER (fn[0]))
     fn[0] = lowcase (fn[0]);
 
@@ -6686,7 +6688,7 @@ linebuffer_setlen (linebuffer *lbp, int toksize)
 
 /* Like malloc but get fatal error if memory is exhausted. */
 static PTR
-xmalloc (unsigned int size)
+xmalloc (size_t size)
 {
   PTR result = (PTR) malloc (size);
   if (result == NULL)
@@ -6695,7 +6697,7 @@ xmalloc (unsigned int size)
 }
 
 static PTR
-xrealloc (char *ptr, unsigned int size)
+xrealloc (char *ptr, size_t size)
 {
   PTR result = (PTR) realloc (ptr, size);
   if (result == NULL)
diff --git a/lib-src/grep-changelog b/lib-src/grep-changelog
index 0c7c42dc7ce..5477de7b577 100755
--- a/lib-src/grep-changelog
+++ b/lib-src/grep-changelog
@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 
-# Copyright (C) 1999-2011 Free Software Foundation, Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 
diff --git a/lib-src/hexl.c b/lib-src/hexl.c
index 89ea7d9f60c..f8fb11f8218 100644
--- a/lib-src/hexl.c
+++ b/lib-src/hexl.c
@@ -1,5 +1,5 @@
 /* Convert files for Emacs Hexl mode.
-   Copyright (C) 1989, 2001-2011  Free Software Foundation, Inc.
+   Copyright (C) 1989, 2001-2012  Free Software Foundation, Inc.
 
 Author: Keith Gabryelski
 (according to authors.el)
@@ -48,7 +48,7 @@ int base = DEFAULT_BASE, un_flag = FALSE, iso_flag = FALSE, endian = 1;
 int group_by = DEFAULT_GROUPING;
 char *progname;
 
-void usage(void) NO_RETURN;
+void usage (void) NO_RETURN;
 
 int
 main (int argc, char **argv)
diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index ba54202954b..3e79cae4f41 100644
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -1,5 +1,5 @@
 /* Generate doc-string file for GNU Emacs from source files.
-   Copyright (C) 1985-1986, 1992-1994, 1997, 1999-2011
+   Copyright (C) 1985-1986, 1992-1994, 1997, 1999-2012
                  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -541,7 +541,7 @@ write_c_args (FILE *out, char *func, char *buf, int minargs, int maxargs)
           maxargs--;
 
           /* In C code, `default' is a reserved word, so we spell it
-             `defalt'; unmangle that here.  */
+             `defalt'; demangle that here.  */
           if (ident_length == 6 && strncmp (ident_start, "defalt", 6) == 0)
             fprintf (out, "DEFAULT");
           else
@@ -1149,8 +1149,10 @@ scan_lisp_file (const char *filename, const char *mode)
             }
         }
 
+      /* defcustom can only occur in uncompiled Lisp files.  */
       else if (! strcmp (buffer, "defvar")
-               || ! strcmp (buffer, "defconst"))
+               || ! strcmp (buffer, "defconst")
+               || ! strcmp (buffer, "defcustom"))
         {
           char c1 = 0, c2 = 0;
           type = 'V';
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 07f6170afe4..117a835c03f 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -1,5 +1,5 @@
 #  -*- Makefile -*- for GNU Emacs on the Microsoft W32 API.
-# Copyright (C) 2000-2011 Free Software Foundation, Inc.
+# Copyright (C) 2000-2012 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -21,9 +21,9 @@ ALL = make-docfile hexl ctags etags movemail ebrowse emacsclient
 
 .PHONY: $(ALL)
 
-LOCAL_FLAGS     = -DWINDOWSNT -DDOS_NT -DSTDC_HEADERS=1 -DNO_LDAV=1 \
+LOCAL_FLAGS     = -DWINDOWSNT -DDOS_NT -DNO_LDAV=1 \
                   -DNO_ARCHIVES=1 -DHAVE_CONFIG_H=1 -I../lib \
-                  -I../nt/inc -I../src
+                  -I../nt/inc -I../src $(EMACS_EXTRA_C_FLAGS)
 
 LIBS            = $(BASE_LIBS) $(ADVAPI32)
 
diff --git a/lib-src/movemail.c b/lib-src/movemail.c
index e8c09f090f3..9d19df32814 100644
--- a/lib-src/movemail.c
+++ b/lib-src/movemail.c
@@ -1,7 +1,7 @@
 /* movemail foo bar -- move file foo to file bar,
    locking file foo the way /bin/mail respects.
 
-Copyright (C) 1986, 1992-1994, 1996, 1999, 2001-2011
+Copyright (C) 1986, 1992-1994, 1996, 1999, 2001-2012
   Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -68,9 +68,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
-#ifdef HAVE_STRING_H
 #include <string.h>
-#endif
 #include "syswait.h"
 #ifdef MAIL_USE_POP
 #include "pop.h"
@@ -185,8 +183,8 @@ main (int argc, char **argv)
 # define ARGSTR "p"
 #endif /* MAIL_USE_POP */
 
-  uid_t real_gid = getgid();
-  uid_t priv_gid = getegid();
+  uid_t real_gid = getgid ();
+  uid_t priv_gid = getegid ();
 
 #ifdef WINDOWSNT
   /* Ensure all file i/o is in binary mode. */
@@ -327,11 +325,10 @@ main (int argc, char **argv)
           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);
+              error ("error while creating what would become the lock file",
+                     0, 0);
               errno = mkstemp_errno;
-              pfatal_with_name (message);
+              pfatal_with_name (tempname);
             }
           close (desc);
 
diff --git a/lib-src/ntlib.c b/lib-src/ntlib.c
index 83f653f3ea3..d3b001c157c 100644
--- a/lib-src/ntlib.c
+++ b/lib-src/ntlib.c
@@ -1,5 +1,5 @@
 /* Utility and Unix shadow routines for GNU Emacs support programs on NT.
-   Copyright (C) 1994, 2001-2011  Free Software Foundation, Inc.
+   Copyright (C) 1994, 2001-2012  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/lib-src/ntlib.h b/lib-src/ntlib.h
index be8d2a58a50..7502a8a8b34 100644
--- a/lib-src/ntlib.h
+++ b/lib-src/ntlib.h
@@ -1,5 +1,5 @@
 /* Utility and Unix shadow routines for GNU Emacs support programs on NT.
-   Copyright (C) 1994, 2002-2011 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2002-2012 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/lib-src/pop.c b/lib-src/pop.c
index 426b39bd1fb..37494d17a44 100644
--- a/lib-src/pop.c
+++ b/lib-src/pop.c
@@ -1,6 +1,6 @@
 /* pop.c: client routines for talking to a POP3-protocol post-office server
 
-Copyright (C) 1991, 1993, 1996-1997, 1999, 2001-2011
+Copyright (C) 1991, 1993, 1996-1997, 1999, 2001-2012
   Free Software Foundation, Inc.
 
 Author: Jonathan Kamens <jik@security.ov.com>
@@ -34,15 +34,15 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "ntlib.h"
 #include <winsock.h>
 #undef SOCKET_ERROR
-#define RECV(s,buf,len,flags) recv(s,buf,len,flags)
-#define SEND(s,buf,len,flags) send(s,buf,len,flags)
-#define CLOSESOCKET(s) closesocket(s)
+#define RECV(s,buf,len,flags) recv (s,buf,len,flags)
+#define SEND(s,buf,len,flags) send (s,buf,len,flags)
+#define CLOSESOCKET(s) closesocket (s)
 #else
 #include <netinet/in.h>
 #include <sys/socket.h>
-#define RECV(s,buf,len,flags) read(s,buf,len)
-#define SEND(s,buf,len,flags) write(s,buf,len)
-#define CLOSESOCKET(s) close(s)
+#define RECV(s,buf,len,flags) read (s,buf,len)
+#define SEND(s,buf,len,flags) write (s,buf,len)
+#define CLOSESOCKET(s) close (s)
 #endif
 #include <pop.h>
 
@@ -65,9 +65,7 @@ extern struct servent *hes_getservbyname (/* char *, char * */);
 #include <netdb.h>
 #include <errno.h>
 #include <stdio.h>
-#ifdef STDC_HEADERS
 #include <string.h>
-#endif
 #include <unistd.h>
 
 #ifdef KERBEROS
@@ -103,7 +101,7 @@ extern char *krb_realmofhost (/* char * */);
 #endif /* KERBEROS */
 
 #ifndef WINDOWSNT
-#if !defined(HAVE_H_ERRNO) || !defined(HAVE_CONFIG_H)
+#if !defined (HAVE_H_ERRNO) || !defined (HAVE_CONFIG_H)
 extern int h_errno;
 #endif
 #endif
@@ -1069,7 +1067,7 @@ socket_connection (char *host, int flags)
     }
 
 #ifdef HAVE_GETADDRINFO
-  memset (&hints, 0, sizeof(hints));
+  memset (&hints, 0, sizeof (hints));
   hints.ai_socktype = SOCK_STREAM;
   hints.ai_flags = AI_CANONNAME;
   hints.ai_family = AF_INET;
@@ -1161,7 +1159,7 @@ socket_connection (char *host, int flags)
             krb5_free_context (kcontext);
           strcpy (pop_error, KRB_ERROR);
           strncat (pop_error, error_message (rem),
-                   ERROR_MAX - sizeof(KRB_ERROR));
+                   ERROR_MAX - sizeof (KRB_ERROR));
           CLOSESOCKET (sock);
           return (-1);
         }
@@ -1214,7 +1212,7 @@ socket_connection (char *host, int flags)
                        ERROR_MAX - strlen (pop_error) - 1);
             }
 #elif defined HAVE_KRB5_ERROR_E_TEXT
-          if (err_ret && err_ret->e_text && strlen(*err_ret->e_text))
+          if (err_ret && err_ret->e_text && strlen (*err_ret->e_text))
             {
               strncat (pop_error, " [server says '",
                        ERROR_MAX - strlen (pop_error) - 1);
diff --git a/lib-src/pop.h b/lib-src/pop.h
index bc079fcc971..682a7f93dc5 100644
--- a/lib-src/pop.h
+++ b/lib-src/pop.h
@@ -1,5 +1,5 @@
 /* pop.h: Header file for the "pop.c" client POP3 protocol.
-   Copyright (C) 1991, 1993, 2001-2011  Free Software Foundation, Inc.
+   Copyright (C) 1991, 1993, 2001-2012  Free Software Foundation, Inc.
 
 Author:  Jonathan Kamens <jik@security.ov.com>
 
diff --git a/lib-src/profile.c b/lib-src/profile.c
index 086d8cc3e9d..8ed4f318974 100644
--- a/lib-src/profile.c
+++ b/lib-src/profile.c
@@ -1,5 +1,5 @@
 /* profile.c --- generate periodic events for profiling of Emacs Lisp code.
-   Copyright (C) 1992, 1994, 1999, 2001-2011  Free Software Foundation, Inc.
+   Copyright (C) 1992, 1994, 1999, 2001-2012  Free Software Foundation, Inc.
 
 Author: Boaz Ben-Zvi <boaz@lcs.mit.edu>
 
diff --git a/lib-src/rcs-checkin b/lib-src/rcs-checkin
index 6861a30b40b..57e91becf9d 100755
--- a/lib-src/rcs-checkin
+++ b/lib-src/rcs-checkin
@@ -2,7 +2,7 @@
 
 # This script accepts any number of file arguments and checks them into RCS.
 
-# Copyright (C) 1993-1995, 2001-2011 Free Software Foundation, Inc.
+# Copyright (C) 1993-1995, 2001-2012 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
diff --git a/lib-src/rcs2log b/lib-src/rcs2log
index 4e1dd306977..3ed54684a7e 100755
--- a/lib-src/rcs2log
+++ b/lib-src/rcs2log
@@ -2,7 +2,7 @@
 
 # RCS to ChangeLog generator
 
-# Copyright (C) 1992-1998, 2001-2011  Free Software Foundation, Inc.
+# Copyright (C) 1992-1998, 2001-2012  Free Software Foundation, Inc.
 
 # Author: Paul Eggert <eggert@twinsun.com>
 
@@ -20,7 +20,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-Copyright='Copyright (C) 2011 Free Software Foundation, Inc.
+Copyright='Copyright (C) 2012 Free Software Foundation, Inc.
 This program comes with NO WARRANTY, to the extent permitted by law.
 You may redistribute copies of this program
 under the terms of the GNU General Public License.
diff --git a/lib-src/test-distrib.c b/lib-src/test-distrib.c
index 5ad19201118..b404c8230d1 100644
--- a/lib-src/test-distrib.c
+++ b/lib-src/test-distrib.c
@@ -1,6 +1,6 @@
 /* test-distrib.c --- testing distribution of nonprinting chars
 
-Copyright (C) 1987, 1993-1995, 1999, 2001-2011  Free Software Foundation, Inc.
+Copyright (C) 1987, 1993-1995, 1999, 2001-2012  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/lib-src/update-game-score.c b/lib-src/update-game-score.c
index e95e2ce259d..a32bd6d8d78 100644
--- a/lib-src/update-game-score.c
+++ b/lib-src/update-game-score.c
@@ -1,6 +1,6 @@
 /* update-game-score.c --- Update a score file
 
-Copyright (C) 2002-2011  Free Software Foundation, Inc.
+Copyright (C) 2002-2012  Free Software Foundation, Inc.
 
 Author: Colin Walters <walters@debian.org>
 
@@ -35,12 +35,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <unistd.h>
 #include <errno.h>
-#ifdef HAVE_STRING_H
+#include <limits.h>
 #include <string.h>
-#endif
-#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
-#endif
 #include <stdio.h>
 #include <time.h>
 #include <pwd.h>
@@ -48,9 +45,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
-#ifdef STDC_HEADERS
-#include <stdarg.h>
-#endif
 #include <sys/stat.h>
 
 /* Needed for SunOS4, for instance.  */
@@ -71,7 +65,7 @@ static int usage (int err) NO_RETURN;
 static int
 usage (int err)
 {
-  fprintf (stdout, "Usage: update-game-score [-m MAX ] [ -r ] game/scorefile SCORE DATA\n");
+  fprintf (stdout, "Usage: update-game-score [-m MAX] [-r] [-d DIR] game/scorefile SCORE DATA\n");
   fprintf (stdout, "       update-game-score -h\n");
   fprintf (stdout, " -h\t\tDisplay this help.\n");
   fprintf (stdout, " -m MAX\t\tLimit the maximum number of scores to MAX.\n");
@@ -113,8 +107,7 @@ static void lose_syserr (const char *msg) NO_RETURN;
 #ifndef HAVE_STRERROR
 #ifndef WINDOWSNT
 char *
-strerror (errnum)
-     int errnum;
+strerror (int errnum)
 {
   extern char *sys_errlist[];
   extern int sys_nerr;
@@ -136,19 +129,13 @@ lose_syserr (const char *msg)
 static char *
 get_user_id (void)
 {
-  char *name;
   struct passwd *buf = getpwuid (getuid ());
   if (!buf)
     {
-      int count = 1;
-      int uid = (int) getuid ();
-      int tuid = uid;
-      while (tuid /= 10)
-        count++;
-      name = malloc (count+1);
-      if (!name)
-        return NULL;
-      sprintf (name, "%d", uid);
+      long uid = getuid ();
+      char *name = malloc (sizeof uid * CHAR_BIT / 3 + 1);
+      if (name)
+        sprintf (name, "%ld", uid);
       return name;
     }
   return buf->pw_name;
@@ -359,7 +346,7 @@ read_scores (const char *filename, struct score_entry **scores, int *count)
     return -1;
   while ((readval = read_score (f, &ret[scorecount])) == 0)
     {
-      /* We encoutered an error */
+      /* We encountered an error.  */
       if (readval < 0)
         return -1;
       scorecount++;
diff --git a/lib-src/vcdiff b/lib-src/vcdiff
index 0f975cd0ee3..dd7ca446d7c 100755
--- a/lib-src/vcdiff
+++ b/lib-src/vcdiff
@@ -3,7 +3,7 @@
 # Enhanced sccs diff utility for use with vc mode.
 # This version is more compatible with rcsdiff(1).
 
-# Copyright (C) 1992-1993, 1995, 1997, 2001-2011
+# Copyright (C) 1992-1993, 1995, 1997, 2001-2012
 #   Free Software Foundation, Inc.
 
 # Author: Paul Eggert