Merge from trunk

author: Stefan Monnier 2011-03-31 00:24:03 -0400
committer: Stefan Monnier 2011-03-31 00:24:03 -0400
commit: 40d83b412f584cc02e68d4eac8fd5e6eb769e2fe (patch)
tree: b56f27a7e6d75a8c1fd27b00179a27b5efea0a32
parent: f488fb6528738131ef41859e1f04125f2e50efce (diff)
parent: 44f230aa043ebb222aa0876b44d70484d5dd38db (diff)
download: emacs-40d83b412f584cc02e68d4eac8fd5e6eb769e2fe.tar.gz
emacs-40d83b412f584cc02e68d4eac8fd5e6eb769e2fe.zip
170 files changed, 5695 insertions, 2650 deletions
diff --git a/.gitignore b/.gitignore
index 57537b8a503..21702f7cd07 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,13 @@
+configure
+aclocal.m4
+compile
+config.guess
+config.sub
+depcomp
+install-sh
+missing
+lib/Makefile.in
+src/config.in
 autom4te.cache
 makefile
 *~
@@ -5,5 +15,3 @@ makefile
 /bin/
 /site-lisp/
-# arch-tag: 75cd3c50-1875-4814-8360-190f7de38302
diff --git a/ChangeLog b/ChangeLog
index a58a60465d4..bf7a6af63b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,71 @@
+2011-03-28  Glenn Morris  <rgm@gnu.org>
+        * autogen/update_autogen: Pass -f to autoreconf.
+        * autogen.sh (get_version): Discard "not found" lines.
+        (check_version): Respect $AUTOCONF etc environment variables.
+2011-03-27  Glenn Morris  <rgm@gnu.org>
+        * configure.in (AC_TYPE_SIGNAL): Remove obsolete macro.
+        (AH_BOTTOM): Do not define SIGTYPE.
+2011-03-26  Glenn Morris  <rgm@gnu.org>
+        * configure.in: Replace obsolete macros AC_TRY_COMPILE, AC_TRY_LINK,
+        AC_TRY_RUN with AC_COMPILE_IFELSE, AC_LINK_IFELSE, AC_RUN_IFELSE.
+2011-03-25  Andreas Schwab  <schwab@linux-m68k.org>
+        * autogen/update_autogen: Remove useless function keyword.
+2011-03-25  Eli Zaretskii  <eliz@gnu.org>
+        * config.bat: Generate src/config.h and lib/Makefile from
+        autogen/config.in and autogen/Makefile.in.
+2011-03-25  Glenn Morris  <rgm@gnu.org>
+        * compile, config.guess, config.sub, depcomp, install-sh, missing:
+        Remove; autoreconf can supply them.
+        * Makefile.in (sync-from-gnulib): Don't sync config.sub,
+        config.guess, install-sh.  Pass -i to autoreconf.
+        * autogen/update_autogen (genfiles): Add compile, config.guess,
+        config.sub, depcomp, install-sh, missing.  Pass -i to autoreconf.
+        Discard non-error output from autoreconf in -q case.
+        * autogen/compile, autogen/config.guess, autogen/config.sub:
+        * autogen/depcomp, autogen/install-sh, autogen/missing: New.
+        * autogen/copy_autogen: Add compile, config.guess, config.sub, depcomp,
+        install-sh, missing.
+2011-03-23  Glenn Morris  <rgm@gnu.org>
+        * autogen/update_autogen: Fix typo.
+        (msg): Remove function; use `exec' instead.
+        * Makefile.in (mkdir): Use `install-sh -d' instead of mkinstalldirs.
+        (sync-from-gnulib): Don't sync mkinstalldirs.
+        * make-dist: Don't distribute mkinstalldirs.
+2011-03-23  Paul Eggert  <eggert@cs.ucla.edu>
+        Fix more problems found by GCC 4.5.2's static checks.
+        * Makefile.in (GNULIB_MODULES): Add socklen.
+        * configure.in: Do not check for sys/socket.h, since socklen does that.
+        * m4/socklen.m4: New automatically-generated file, from gnulib.
+        fakemail: Remove dependency on ignore-value.
+        * Makefile.in (GNULIB_MODULES): Add stdio.
+        * lib/stdio.in.h, m4/stdio_h.m4: New files, automatically
+        imported from gnulib.
+        * .bzrignore: Add lib/stdio.h.
+2011-03-22  Glenn Morris  <rgm@gnu.org>
+        * autogen/copy_autogen: Work from ./ or ../.
+        Fix time-stamps.
+        * autogen.sh: Doc fix.
 2011-03-20  Glenn Morris  <rgm@gnu.org>
        * autogen/: New directory, to be excluded from releases.
diff --git a/INSTALL.BZR b/INSTALL.BZR
index 3859e3cd4fc..93229ec7a79 100644
--- a/INSTALL.BZR
+++ b/INSTALL.BZR
@@ -17,11 +17,11 @@ The `autogen.sh' script can help you figure out if you have the
 necessary tools.
 The first time you build, there are a couple of extra steps.
-First, generate the `configure' script:
+First, generate the `configure' script and some related files:
  $ ./autogen.sh
-(or you can just run `autoreconf -I m4').
+(or you can just run `autoreconf -i -I m4').
 You can then configure your build (use `./configure --help' to see
 options you can set):
diff --git a/Makefile.in b/Makefile.in
index 19267f82121..699589c6920 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -332,7 +332,8 @@ DOS_gnulib_comp.m4 = gl-comp.m4
 # as per $(gnulib_srcdir)/DEPENDENCIES.
 GNULIB_MODULES = \
  crypto/md5 dtoastr filemode getloadavg getopt-gnu \
-  ignore-value intprops lstat mktime readlink strftime symlink sys_stat
+  ignore-value intprops lstat mktime readlink \
+  socklen stdio strftime symlink sys_stat
 GNULIB_TOOL_FLAGS = \
 --import --no-changelog --no-vc-files --makefile-name=gnulib.mk
 sync-from-gnulib: $(gnulib_srcdir)
@@ -343,13 +344,9 @@ sync-from-gnulib: $(gnulib_srcdir)
        cd $(srcdir)/m4 && mv gnulib-comp.m4 $(DOS_gnulib_comp.m4)
        cp $(gnulib_srcdir)/build-aux/texinfo.tex $(srcdir)/doc/misc
        cp \
-          $(gnulib_srcdir)/build-aux/config.sub \
-          $(gnulib_srcdir)/build-aux/config.guess \
-          $(gnulib_srcdir)/build-aux/install-sh \
-          $(gnulib_srcdir)/build-aux/mkinstalldirs \
          $(gnulib_srcdir)/build-aux/move-if-change \
          $(srcdir)
-        cd $(srcdir) && autoreconf -I m4
+        cd $(srcdir) && autoreconf -i -I m4
 .PHONY: sync-from-gnulib
 # These targets should be "${SUBDIR} without `src'".
@@ -677,7 +674,7 @@ install-strip:
 ### Build all the directories we're going to install Emacs in.  Since
 ### we may be creating several layers of directories (for example,
-### /usr/local/lib/emacs/19.0/mips-dec-ultrix4.2), we use mkinstalldirs
+### /usr/local/lib/emacs/19.0/mips-dec-ultrix4.2), we use install-sh -d
 ### instead of mkdir.  Not all systems' mkdir programs have the `-p' flag.
 ### We set the umask so that any created directories are world-readable.
 ### FIXME it would be good to warn about non-standard permissions of
@@ -691,7 +688,7 @@ mkdir: FRC
        done ; \
        icondirs=`echo "$${icondirs}" | sed 's,$(srcdir)/etc/images/icons,$(DESTDIR)${icondir},g'` ; \
        umask 022 ; \
-        $(srcdir)/mkinstalldirs $(DESTDIR)${datadir} ${COPYDESTS} \
+        $(srcdir)/install-sh -d $(DESTDIR)${datadir} ${COPYDESTS} \
          $(DESTDIR)${infodir} $(DESTDIR)${man1dir} \
          $(DESTDIR)${bindir} $(DESTDIR)${docdir} $(DESTDIR)${libexecdir} \
          $(DESTDIR)${datadir}/emacs/site-lisp \
diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index dae6202b4e4..7f6a18f7d54 100644
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -58,7 +58,6 @@ HAVE_TERMIOS
 INTERRUPT_INPUT
 NARROWPROTO
 SEPCHAR
-SIGTYPE
 SYSTEM_TYPE
 ** Machine specific macros, decribed in detail in src/m/template.h
@@ -238,7 +237,6 @@ SIGNALS_VIA_CHARACTERS
 SIGPIPE
 SIGQUIT
 SIGTRAP
-SIGTYPE
 SOLARIS2
 STDC_HEADERS
 SYSTEM_PURESIZE_EXTRA
diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt
index 9c47d6e1fa2..1af20326543 100644
--- a/admin/make-tarball.txt
+++ b/admin/make-tarball.txt
@@ -29,9 +29,12 @@ For each step, check for possible errors.
    when preparing a major Emacs release, or branching for it.)
 5.  Edit configure.in so that maintainer-mode is off by default.
-    (FIXME - need to find a better way of dealing with this).
+    (FIXME - need to find a better way of dealing with this.
+     Or maybe it's fine and indeed correct to leave it on?
+     See http://lists.gnu.org/archive/html/emacs-devel/2011-03/msg00859.html
+     and subsequent.)
-     autoreconf -I m4 --force
+     autoreconf -i -I m4 --force
     make bootstrap
 6.  Commit etc/AUTHORS, all the files changed by M-x set-version, and
diff --git a/admin/notes/bzr b/admin/notes/bzr
index db9e6e0dcda..5600c9badb0 100644
--- a/admin/notes/bzr
+++ b/admin/notes/bzr
@@ -65,23 +65,22 @@ removes a file, then remove the corresponding files by hand.
 The following description uses bound branches, presumably it works in
 a similar way with unbound ones.
-0) (First time only) Get the bzr changelog_merge plugin:
+0) (First time only) Get the bzr changelog_merge plugin
+(this will be included by default in bzr 2.4 onwards):
 cd ~/.bazaar/plugins
-bzr branch lp:bzr-changelog-merge
+# The following is an improved version of: lp:bzr-changelog-merge
+bzr branch lp:~spiv/bzr-changelog-merge/non-head-edits-723968
 mv bzr-changelog-merge changelog_merge
-This will make merging ChangeLogs a lot smoother.  It merges new
+This should make merging ChangeLogs smoother.  It merges new entries
-entries to the top of the file, rather than trying to fit them in
+to the top of the file, rather than trying to fit them in mid-way
-mid-way through.
+through.  Newer versions of the plugin should also be able to deal
+with changes to *old* ChangeLog entries, that should not be floated to
+the head of the file (see launchpad#723968).
-Sigh.  This plugin has a drawback.  People often like to edit older
+Maybe the default Emacs behavior without this plugin is better,
-ChangeLog entries, not at the head of the file.  Frequently they do
+though, it's not clear yet.
-this in the same commit as making new entries.  Using this plugin
-will merge ALL changed entries (including older ones) to the top of
-the destination file.
-Maybe the default Emacs behavior without this plugin is better, I dunno.
 1) Get clean, up-to-date copies of the emacs-23 and trunk branches.
 Check for any uncommitted changes with bzr status.
diff --git a/admin/notes/copyright b/admin/notes/copyright
index 54d97adaf1c..39eb003a07d 100644
--- a/admin/notes/copyright
+++ b/admin/notes/copyright
@@ -120,7 +120,10 @@ or even ChangeLogs, for older changes. People often installed changes
 from others, without recording the true authorship.
 [For reference, most of these points were established via email with
-rms, 2007/1, "Copyright years".]
+rms, 2007/1, "Copyright years".
+In March 2011, information on some files no longer included was removed.
+Consult older versions of this document if interested.]
 lisp/version.el           # emacs-copyright
@@ -143,20 +146,9 @@ lib/Makefile.in
 install-sh
 - this file is copyright MIT, which is OK. Leave the copyright alone.
-mkinstalldirs
-src/m/news-r6.h
-  public domain, leave alone.
 etc/refcards/*.tex
  also update the \def\year macro for the latest year.
-etc/BABYL, ms-kermit
-  no notices (see below).
-etc/emacs.csh
- - written by Michael DeCorte, who has no assignment. But trivial
- enough to not need license.
 etc/future-bug
 - doesn't need a humorless disclaimer, because Karl Fogel says we
 can consider it part of Emacs, and he has a blanker disclaimer for
@@ -389,9 +381,9 @@ Makefile.in does now.
 src/gmalloc.c
  - contains numerous copyrights from the GNU C library. Leave them alone.
-src/acldef.h, chpdef.h, ndir.h
+src/ndir.h
-  - see comments below. These files are OK to be released with Emacs
+  - see comments below. This file is OK to be released with Emacs
-  22, but we may want to revisit them afterwards.
+  22, but we may want to revisit it afterwards.
 ** Some notes on resolved issues, for historical information only
@@ -402,15 +394,6 @@ which year, I can probably tell you which.) Either way, we have papers
 for it." It was present in Emacs-16.56 (15-jul-85). rms: "Then I
 conclude it was written by me."
-etc/ulimit.hack
-  Very obsolete file removed March 2007. Doesn't say who the author
-is, but web-search suggests Karl Kleinpaste, who has no Emacs
-assignment. Trivial anyway.
-http://groups.google.com/group/comp.unix.shell/browse_thread/thread/bf3df496994\
-9f1df/7e5922c67b3a98fb
-http://groups.google.com/group/comp.unix.questions/msg/cc7e49cacfd1ccb4
-    (original 1987 source)
 lisp/term/README
  - had no copyright notice till Feb 2007. ChangeLog.3 suggests it was
  written by Eric Raymond. When asked by rms on 14 Feb 2007 he said:
@@ -431,20 +414,6 @@ src/unexhp9k800.c
  HP. So this file is public domain.
-K Rodgers changes
- It was pointed out that K Rodgers only had assigments for VC and
- ps-print, but had changed several other files. We tried to contact
- him for a general assignment, but he proved uncommunicative (despite
- initially indicating to rms he would sign an assignment). As a result, his
- changes were removed and/or rewritten independently. For details, see
- threads:
-http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg00225.html
-http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg00257.html
- But then an assignment arrived before the release of Emacs 22:
-http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg01427.html
 lisp/progmodes/python.el
 Dave Love alerted us to a potential legal problem:
 http://lists.gnu.org/archive/html/emacs-pretest-bug/2007-04/msg00459.html
@@ -460,14 +429,8 @@ http://lists.gnu.org/archive/html/emacs-devel/2007-05/msg00466.html
 admin/check-doc-strings
  File says it's in the public domain, but that might not make it so.
-etc/BABYL
-  File written long ago by authors with no assignment. Keep them
-  without notices for now, try and contact authors if possible. Be
-  ready to remove these files if the authors ever object.
-etc/ms-kermit
 etc/e/eterm-color.ti
-src/acldef.h, chpdef.h, ndir.h
+src/ndir.h
  On legal advice from Matt Norwood, the following comment was added
  to these files in Feb/Mar 2007:
@@ -480,25 +443,8 @@ src/acldef.h, chpdef.h, ndir.h
  and possibly add a list of all authors who have changed these files.
  (details in email from Matt Norwood to rms, 2007/02/03).
-etc/ms-7bkermit
+src/s/aix3-2.h, hpux8.h, hpux9.h, irix5-0.h, netbsd.h, usg5-4-2.h
-  Says it was written by Andy Lowry and Joel Spolsky. No entry for
+  [note some of these have since been merged into other files]
-either in copyright.list. NB this file is not "constrained" like
-ms-kermit (rms: "We know it isn't. A comment at the front says it has
-other bindings which might be handy."). File removed March 2007.
-Re-add if clear up status at some point.
-etc/Xkeymap.txt
-  No info on author. File removed March 2007. rms: "It says it is
-RLK's way of remapping his keyboard, so it is not constrained. I think
-it was written by RLK. Let's delete it; if we contact RLK again, we
-can put it back." Actually, RLK == Robert Krawitz has an Emacs
-assignment. So this could be restored if it is still useful, but Jan Dj�rv
-says it is obsolete:
-<http://lists.gnu.org/archive/html/emacs-devel/2007-03/msg00673.html>
-src/m/mips4.h, news-risc.h, pmax.h
-src/s/aix3-2.h, bsd386.h, hpux8.h, hpux9.h, irix4-0.h, irix5-0.h,
-netbsd.h, sol2-3.h, usg5-4-2.h
  - all these (not obviously trivial) files were missing copyrights
  till Feb 2007, when FSF copyright was added. Matt Norwood advised:
@@ -513,22 +459,6 @@ netbsd.h, sol2-3.h, usg5-4-2.h
 Here is my (rgm) take on the details of the above files:
-mips4.h
-  might be trivial? started trivial, been added to in tiny changes by
-  those with FSF assignment, often result of email suggestions by others.
-news-risc.h
-  started trivial. Grown by tiny additions, plus chunk
-  from mips.h, which was and is Copyright FSF
-pmax.h
-  started trivial. grown in tiny changes, except for maybe Jim Wilson's
-  comment.
-? irix4-0.h
-  I would say started non-trivial (1992, rms). only tiny changes since
-  installed.
 ? irix5-0.h
  I would say started non-trivial (1993, jimb, heavily based
  on irix4-0.h). A few borderline non-tiny changes since.
@@ -537,11 +467,7 @@ usg5-4-2.h
 started non-trivial, but was heavily based on usg5-4.h, which was and is
 copyright FSF. only tiny changes since installed.
-sol2-3.h
+aix3-2.h, hpux8.h, hpux9.h, netbsd.h
- started trivial. only non-tiny change (1994) incorporated code from
- usg5-4.h, which was and is copyright FSF.
-aix3-2.h, bsd386.h, hpux8.h, hpux9.h, netbsd.h
  started trivial, grown in tiny changes.
 netbsd.h:
@@ -556,8 +482,8 @@ Someone might want to tweak the copyright years (for dates before
 Note: erring on the side of caution, I also added notices to some
 files I thought might be considered non-trivial (if one includes
 comment) in s/:
-  aix4-1.h hpux10.h irix6-0.h irix6-5.h
+  aix4-1.h hpux10.h irix6-5.h
-  ptx4.h sol2.h
+  sol2.h
 (everything with > 30 non-blank lines, which at least is _some_ kind of
 system)
diff --git a/autogen.sh b/autogen.sh
index a56b8d77826..d15817d0596 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -30,6 +30,7 @@
 ### Code:
 ## Tools we need:
+## Note that we respect the values of AUTOCONF etc, like autoreconf does.
 progs="autoconf automake"
 ## Minimum versions we need:
@@ -46,7 +47,8 @@ automake_min=1.11
 ## Also note that we do not handle micro versions.
 get_version ()
 {
-    $1 --version 2>&1 | sed -n '1 s/.* \([1-9][0-9\.]*\).*/\1/p'
+    ## Remove eg "./autogen.sh: line 50: autoconf: command not found".
+    $1 --version 2>&1 | sed -e '/not found/d' -n -e '1 s/.* \([1-9][0-9\.]*\).*/\1/p'
 }
 ## $1 = version string, eg "2.59"
@@ -71,7 +73,14 @@ minor_version ()
 ## Return 3 for unexpected error (eg failed to parse version).
 check_version ()
 {
-    have_version=`get_version $1`
+    ## Respect eg $AUTOMAKE if it is set, like autoreconf does.
+    uprog=`echo $1 | sed 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+    eval uprog=\$${uprog}
+    [ x"$uprog" = x ] && uprog=$1
+    have_version=`get_version $uprog`
    [ x"$have_version" = x ] && return 1
@@ -177,14 +186,14 @@ this script.
 If you know that the required versions are in your PATH, but this
 script has made an error, then you can simply run
-autoreconf -I m4
+autoreconf -i -I m4
 instead of this script.
 If all else fails, you can try using the pre-built versions of the
 generated files by doing:
-cd autogen && ./copy_autogen
+./autogen/copy_autogen
 This is not recommended - see the comments in \`copy_autogen'.
@@ -198,7 +207,7 @@ echo "Your system has the required tools, running autoreconf..."
 ## Let autoreconf figure out what, if anything, needs doing.
-autoreconf -I m4 || exit $?
+autoreconf -i -I m4 || exit $?
 echo "You can now run \`./configure'."
diff --git a/autogen/Makefile.in b/autogen/Makefile.in
index 502b3dbb927..88be88ad08f 100644
--- a/autogen/Makefile.in
+++ b/autogen/Makefile.in
@@ -24,7 +24,7 @@
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=. --makefile-name=gnulib.mk --no-libtool --macro-prefix=gl --no-vc-files crypto/md5 dtoastr filemode getloadavg getopt-gnu ignore-value intprops lstat mktime readlink strftime symlink sys_stat
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=. --makefile-name=gnulib.mk --no-libtool --macro-prefix=gl --no-vc-files crypto/md5 dtoastr filemode getloadavg getopt-gnu ignore-value intprops lstat mktime readlink socklen stdio strftime symlink sys_stat
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
@@ -57,9 +57,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
        $(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/longlong.m4 \
        $(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/md5.m4 \
        $(top_srcdir)/m4/mktime.m4 $(top_srcdir)/m4/multiarch.m4 \
-        $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/st_dm_mode.m4 \
+        $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/socklen.m4 \
-        $(top_srcdir)/m4/stat.m4 $(top_srcdir)/m4/stdbool.m4 \
+        $(top_srcdir)/m4/st_dm_mode.m4 $(top_srcdir)/m4/stat.m4 \
-        $(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/stdint.m4 \
+        $(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/stddef_h.m4 \
+        $(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/stdio_h.m4 \
        $(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/strftime.m4 \
        $(top_srcdir)/m4/symlink.m4 $(top_srcdir)/m4/sys_stat_h.m4 \
        $(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/time_r.m4 \
@@ -67,7 +68,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
        $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@@ -150,6 +151,7 @@ GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@
 GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
 GNULIB_CHOWN = @GNULIB_CHOWN@
 GNULIB_CLOSE = @GNULIB_CLOSE@
+GNULIB_DPRINTF = @GNULIB_DPRINTF@
 GNULIB_DUP2 = @GNULIB_DUP2@
 GNULIB_DUP3 = @GNULIB_DUP3@
 GNULIB_ENVIRON = @GNULIB_ENVIRON@
@@ -158,15 +160,31 @@ GNULIB_FACCESSAT = @GNULIB_FACCESSAT@
 GNULIB_FCHDIR = @GNULIB_FCHDIR@
 GNULIB_FCHMODAT = @GNULIB_FCHMODAT@
 GNULIB_FCHOWNAT = @GNULIB_FCHOWNAT@
+GNULIB_FCLOSE = @GNULIB_FCLOSE@
+GNULIB_FFLUSH = @GNULIB_FFLUSH@
+GNULIB_FOPEN = @GNULIB_FOPEN@
+GNULIB_FPRINTF = @GNULIB_FPRINTF@
+GNULIB_FPRINTF_POSIX = @GNULIB_FPRINTF_POSIX@
+GNULIB_FPURGE = @GNULIB_FPURGE@
+GNULIB_FPUTC = @GNULIB_FPUTC@
+GNULIB_FPUTS = @GNULIB_FPUTS@
+GNULIB_FREOPEN = @GNULIB_FREOPEN@
+GNULIB_FSEEK = @GNULIB_FSEEK@
+GNULIB_FSEEKO = @GNULIB_FSEEKO@
 GNULIB_FSTATAT = @GNULIB_FSTATAT@
 GNULIB_FSYNC = @GNULIB_FSYNC@
+GNULIB_FTELL = @GNULIB_FTELL@
+GNULIB_FTELLO = @GNULIB_FTELLO@
 GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@
 GNULIB_FUTIMENS = @GNULIB_FUTIMENS@
+GNULIB_FWRITE = @GNULIB_FWRITE@
 GNULIB_GETCWD = @GNULIB_GETCWD@
+GNULIB_GETDELIM = @GNULIB_GETDELIM@
 GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@
 GNULIB_GETDTABLESIZE = @GNULIB_GETDTABLESIZE@
 GNULIB_GETGROUPS = @GNULIB_GETGROUPS@
 GNULIB_GETHOSTNAME = @GNULIB_GETHOSTNAME@
+GNULIB_GETLINE = @GNULIB_GETLINE@
 GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@
 GNULIB_GETLOGIN = @GNULIB_GETLOGIN@
 GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@
@@ -194,22 +212,37 @@ GNULIB_MKSTEMP = @GNULIB_MKSTEMP@
 GNULIB_MKSTEMPS = @GNULIB_MKSTEMPS@
 GNULIB_MKTIME = @GNULIB_MKTIME@
 GNULIB_NANOSLEEP = @GNULIB_NANOSLEEP@
+GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@
+GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@
+GNULIB_PERROR = @GNULIB_PERROR@
 GNULIB_PIPE = @GNULIB_PIPE@
 GNULIB_PIPE2 = @GNULIB_PIPE2@
+GNULIB_POPEN = @GNULIB_POPEN@
 GNULIB_PREAD = @GNULIB_PREAD@
+GNULIB_PRINTF = @GNULIB_PRINTF@
+GNULIB_PRINTF_POSIX = @GNULIB_PRINTF_POSIX@
 GNULIB_PTSNAME = @GNULIB_PTSNAME@
+GNULIB_PUTC = @GNULIB_PUTC@
+GNULIB_PUTCHAR = @GNULIB_PUTCHAR@
 GNULIB_PUTENV = @GNULIB_PUTENV@
+GNULIB_PUTS = @GNULIB_PUTS@
 GNULIB_PWRITE = @GNULIB_PWRITE@
 GNULIB_RANDOM_R = @GNULIB_RANDOM_R@
 GNULIB_READLINK = @GNULIB_READLINK@
 GNULIB_READLINKAT = @GNULIB_READLINKAT@
 GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@
 GNULIB_REALPATH = @GNULIB_REALPATH@
+GNULIB_REMOVE = @GNULIB_REMOVE@
+GNULIB_RENAME = @GNULIB_RENAME@
+GNULIB_RENAMEAT = @GNULIB_RENAMEAT@
 GNULIB_RMDIR = @GNULIB_RMDIR@
 GNULIB_RPMATCH = @GNULIB_RPMATCH@
 GNULIB_SETENV = @GNULIB_SETENV@
 GNULIB_SLEEP = @GNULIB_SLEEP@
+GNULIB_SNPRINTF = @GNULIB_SNPRINTF@
+GNULIB_SPRINTF_POSIX = @GNULIB_SPRINTF_POSIX@
 GNULIB_STAT = @GNULIB_STAT@
+GNULIB_STDIO_H_SIGPIPE = @GNULIB_STDIO_H_SIGPIPE@
 GNULIB_STRPTIME = @GNULIB_STRPTIME@
 GNULIB_STRTOD = @GNULIB_STRTOD@
 GNULIB_STRTOLL = @GNULIB_STRTOLL@
@@ -219,6 +252,7 @@ GNULIB_SYMLINKAT = @GNULIB_SYMLINKAT@
 GNULIB_SYSTEM_POSIX = @GNULIB_SYSTEM_POSIX@
 GNULIB_TIMEGM = @GNULIB_TIMEGM@
 GNULIB_TIME_R = @GNULIB_TIME_R@
+GNULIB_TMPFILE = @GNULIB_TMPFILE@
 GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@
 GNULIB_UNISTD_H_GETOPT = @GNULIB_UNISTD_H_GETOPT@
 GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@
@@ -228,6 +262,14 @@ GNULIB_UNLOCKPT = @GNULIB_UNLOCKPT@
 GNULIB_UNSETENV = @GNULIB_UNSETENV@
 GNULIB_USLEEP = @GNULIB_USLEEP@
 GNULIB_UTIMENSAT = @GNULIB_UTIMENSAT@
+GNULIB_VASPRINTF = @GNULIB_VASPRINTF@
+GNULIB_VDPRINTF = @GNULIB_VDPRINTF@
+GNULIB_VFPRINTF = @GNULIB_VFPRINTF@
+GNULIB_VFPRINTF_POSIX = @GNULIB_VFPRINTF_POSIX@
+GNULIB_VPRINTF = @GNULIB_VPRINTF@
+GNULIB_VPRINTF_POSIX = @GNULIB_VPRINTF_POSIX@
+GNULIB_VSNPRINTF = @GNULIB_VSNPRINTF@
+GNULIB_VSPRINTF_POSIX = @GNULIB_VSPRINTF_POSIX@
 GNULIB_WCTOMB = @GNULIB_WCTOMB@
 GNULIB_WRITE = @GNULIB_WRITE@
 GNULIB__EXIT = @GNULIB__EXIT@
@@ -243,15 +285,24 @@ HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
 HAVE_CHOWN = @HAVE_CHOWN@
 HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
 HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
+HAVE_DECL_FPURGE = @HAVE_DECL_FPURGE@
+HAVE_DECL_FSEEKO = @HAVE_DECL_FSEEKO@
+HAVE_DECL_FTELLO = @HAVE_DECL_FTELLO@
+HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@
 HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@
+HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@
 HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@
 HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
 HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@
 HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@
 HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@
+HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@
 HAVE_DECL_SETENV = @HAVE_DECL_SETENV@
+HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@
 HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@
 HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@
+HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@
+HAVE_DPRINTF = @HAVE_DPRINTF@
 HAVE_DUP2 = @HAVE_DUP2@
 HAVE_DUP3 = @HAVE_DUP3@
 HAVE_EUIDACCESS = @HAVE_EUIDACCESS@
@@ -259,8 +310,10 @@ HAVE_FACCESSAT = @HAVE_FACCESSAT@
 HAVE_FCHDIR = @HAVE_FCHDIR@
 HAVE_FCHMODAT = @HAVE_FCHMODAT@
 HAVE_FCHOWNAT = @HAVE_FCHOWNAT@
+HAVE_FSEEKO = @HAVE_FSEEKO@
 HAVE_FSTATAT = @HAVE_FSTATAT@
 HAVE_FSYNC = @HAVE_FSYNC@
+HAVE_FTELLO = @HAVE_FTELLO@
 HAVE_FTRUNCATE = @HAVE_FTRUNCATE@
 HAVE_FUTIMENS = @HAVE_FUTIMENS@
 HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@
@@ -301,6 +354,7 @@ HAVE_RANDOM_R = @HAVE_RANDOM_R@
 HAVE_READLINK = @HAVE_READLINK@
 HAVE_READLINKAT = @HAVE_READLINKAT@
 HAVE_REALPATH = @HAVE_REALPATH@
+HAVE_RENAMEAT = @HAVE_RENAMEAT@
 HAVE_RPMATCH = @HAVE_RPMATCH@
 HAVE_SETENV = @HAVE_SETENV@
 HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
@@ -327,6 +381,8 @@ HAVE_UNLOCKPT = @HAVE_UNLOCKPT@
 HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@
 HAVE_USLEEP = @HAVE_USLEEP@
 HAVE_UTIMENSAT = @HAVE_UTIMENSAT@
+HAVE_VASPRINTF = @HAVE_VASPRINTF@
+HAVE_VDPRINTF = @HAVE_VDPRINTF@
 HAVE_WCHAR_H = @HAVE_WCHAR_H@
 HAVE_WCHAR_T = @HAVE_WCHAR_T@
 HAVE_XSERVER = @HAVE_XSERVER@
@@ -397,6 +453,7 @@ M_FILE = @M_FILE@
 NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
 NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@
 NEXT_AS_FIRST_DIRECTIVE_STDINT_H = @NEXT_AS_FIRST_DIRECTIVE_STDINT_H@
+NEXT_AS_FIRST_DIRECTIVE_STDIO_H = @NEXT_AS_FIRST_DIRECTIVE_STDIO_H@
 NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@
 NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@
 NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@
@@ -404,6 +461,7 @@ NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@
 NEXT_GETOPT_H = @NEXT_GETOPT_H@
 NEXT_STDDEF_H = @NEXT_STDDEF_H@
 NEXT_STDINT_H = @NEXT_STDINT_H@
+NEXT_STDIO_H = @NEXT_STDIO_H@
 NEXT_STDLIB_H = @NEXT_STDLIB_H@
 NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@
 NEXT_TIME_H = @NEXT_TIME_H@
@@ -438,15 +496,28 @@ REPLACE_CALLOC = @REPLACE_CALLOC@
 REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@
 REPLACE_CHOWN = @REPLACE_CHOWN@
 REPLACE_CLOSE = @REPLACE_CLOSE@
+REPLACE_DPRINTF = @REPLACE_DPRINTF@
 REPLACE_DUP = @REPLACE_DUP@
 REPLACE_DUP2 = @REPLACE_DUP2@
 REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@
+REPLACE_FCLOSE = @REPLACE_FCLOSE@
+REPLACE_FFLUSH = @REPLACE_FFLUSH@
+REPLACE_FOPEN = @REPLACE_FOPEN@
+REPLACE_FPRINTF = @REPLACE_FPRINTF@
+REPLACE_FPURGE = @REPLACE_FPURGE@
+REPLACE_FREOPEN = @REPLACE_FREOPEN@
+REPLACE_FSEEK = @REPLACE_FSEEK@
+REPLACE_FSEEKO = @REPLACE_FSEEKO@
 REPLACE_FSTAT = @REPLACE_FSTAT@
 REPLACE_FSTATAT = @REPLACE_FSTATAT@
+REPLACE_FTELL = @REPLACE_FTELL@
+REPLACE_FTELLO = @REPLACE_FTELLO@
 REPLACE_FUTIMENS = @REPLACE_FUTIMENS@
 REPLACE_GETCWD = @REPLACE_GETCWD@
+REPLACE_GETDELIM = @REPLACE_GETDELIM@
 REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@
 REPLACE_GETGROUPS = @REPLACE_GETGROUPS@
+REPLACE_GETLINE = @REPLACE_GETLINE@
 REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
 REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
 REPLACE_LCHOWN = @REPLACE_LCHOWN@
@@ -464,25 +535,42 @@ REPLACE_MKSTEMP = @REPLACE_MKSTEMP@
 REPLACE_MKTIME = @REPLACE_MKTIME@
 REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@
 REPLACE_NULL = @REPLACE_NULL@
+REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@
+REPLACE_PERROR = @REPLACE_PERROR@
+REPLACE_POPEN = @REPLACE_POPEN@
 REPLACE_PREAD = @REPLACE_PREAD@
+REPLACE_PRINTF = @REPLACE_PRINTF@
 REPLACE_PUTENV = @REPLACE_PUTENV@
 REPLACE_PWRITE = @REPLACE_PWRITE@
 REPLACE_READLINK = @REPLACE_READLINK@
 REPLACE_REALLOC = @REPLACE_REALLOC@
 REPLACE_REALPATH = @REPLACE_REALPATH@
+REPLACE_REMOVE = @REPLACE_REMOVE@
+REPLACE_RENAME = @REPLACE_RENAME@
+REPLACE_RENAMEAT = @REPLACE_RENAMEAT@
 REPLACE_RMDIR = @REPLACE_RMDIR@
 REPLACE_SETENV = @REPLACE_SETENV@
 REPLACE_SLEEP = @REPLACE_SLEEP@
+REPLACE_SNPRINTF = @REPLACE_SNPRINTF@
+REPLACE_SPRINTF = @REPLACE_SPRINTF@
 REPLACE_STAT = @REPLACE_STAT@
+REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@
 REPLACE_STRTOD = @REPLACE_STRTOD@
 REPLACE_SYMLINK = @REPLACE_SYMLINK@
 REPLACE_TIMEGM = @REPLACE_TIMEGM@
+REPLACE_TMPFILE = @REPLACE_TMPFILE@
 REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@
 REPLACE_UNLINK = @REPLACE_UNLINK@
 REPLACE_UNLINKAT = @REPLACE_UNLINKAT@
 REPLACE_UNSETENV = @REPLACE_UNSETENV@
 REPLACE_USLEEP = @REPLACE_USLEEP@
 REPLACE_UTIMENSAT = @REPLACE_UTIMENSAT@
+REPLACE_VASPRINTF = @REPLACE_VASPRINTF@
+REPLACE_VDPRINTF = @REPLACE_VDPRINTF@
+REPLACE_VFPRINTF = @REPLACE_VFPRINTF@
+REPLACE_VPRINTF = @REPLACE_VPRINTF@
+REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@
+REPLACE_VSPRINTF = @REPLACE_VSPRINTF@
 REPLACE_WCTOMB = @REPLACE_WCTOMB@
 REPLACE_WRITE = @REPLACE_WRITE@
 RSVG_CFLAGS = @RSVG_CFLAGS@
@@ -601,21 +689,22 @@ x_default_search_path = @x_default_search_path@
 # present in all Makefile.am that need it. This is ensured by the applicability
 # 'all' defined above.
 BUILT_SOURCES = arg-nonnull.h c++defs.h $(GETOPT_H) $(STDBOOL_H) \
-        $(STDDEF_H) $(STDINT_H) stdlib.h sys/stat.h time.h unistd.h \
+        $(STDDEF_H) $(STDINT_H) stdio.h stdlib.h sys/stat.h time.h \
-        warn-on-use.h
+        unistd.h warn-on-use.h
 EXTRA_DIST = $(top_srcdir)/./arg-nonnull.h $(top_srcdir)/./c++defs.h \
        md5.c md5.h dosname.h ftoastr.c ftoastr.h filemode.c \
        filemode.h getloadavg.c getopt.c getopt.in.h getopt1.c \
        getopt_int.h intprops.h lstat.c mktime-internal.h mktime.c \
        readlink.c stat.c stdbool.in.h stddef.in.h stdint.in.h \
-        stdlib.in.h strftime.c strftime.h symlink.c sys_stat.in.h \
+        stdio.in.h stdlib.in.h strftime.c strftime.h symlink.c \
-        time.in.h time_r.c unistd.in.h $(top_srcdir)/./warn-on-use.h
+        sys_stat.in.h time.in.h time_r.c unistd.in.h \
+        $(top_srcdir)/./warn-on-use.h
 MOSTLYCLEANDIRS = sys
 MOSTLYCLEANFILES = core *.stackdump arg-nonnull.h arg-nonnull.h-t \
        c++defs.h c++defs.h-t getopt.h getopt.h-t stdbool.h \
-        stdbool.h-t stddef.h stddef.h-t stdint.h stdint.h-t stdlib.h \
+        stdbool.h-t stddef.h stddef.h-t stdint.h stdint.h-t stdio.h \
-        stdlib.h-t sys/stat.h sys/stat.h-t time.h time.h-t unistd.h \
+        stdio.h-t stdlib.h stdlib.h-t sys/stat.h sys/stat.h-t time.h \
-        unistd.h-t warn-on-use.h warn-on-use.h-t
+        time.h-t unistd.h unistd.h-t warn-on-use.h warn-on-use.h-t
 noinst_LIBRARIES = libgnu.a
 DEFAULT_INCLUDES = -I. -I../src -I$(top_srcdir)/src
 libgnu_a_SOURCES = dtoastr.c gettext.h ignore-value.h
@@ -996,6 +1085,108 @@ stdint.h: stdint.in.h
        } > $@-t && \
        mv $@-t $@
+# We need the following in order to create <stdio.h> when the system
+# doesn't have one that works with the given compiler.
+stdio.h: stdio.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+        $(AM_V_GEN)rm -f $@-t $@ && \
+        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
+          sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+              -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+              -e 's|@''NEXT_STDIO_H''@|$(NEXT_STDIO_H)|g' \
+              -e 's|@''GNULIB_DPRINTF''@|$(GNULIB_DPRINTF)|g' \
+              -e 's|@''GNULIB_FCLOSE''@|$(GNULIB_FCLOSE)|g' \
+              -e 's|@''GNULIB_FFLUSH''@|$(GNULIB_FFLUSH)|g' \
+              -e 's|@''GNULIB_FOPEN''@|$(GNULIB_FOPEN)|g' \
+              -e 's|@''GNULIB_FPRINTF''@|$(GNULIB_FPRINTF)|g' \
+              -e 's|@''GNULIB_FPRINTF_POSIX''@|$(GNULIB_FPRINTF_POSIX)|g' \
+              -e 's|@''GNULIB_FPURGE''@|$(GNULIB_FPURGE)|g' \
+              -e 's|@''GNULIB_FPUTC''@|$(GNULIB_FPUTC)|g' \
+              -e 's|@''GNULIB_FPUTS''@|$(GNULIB_FPUTS)|g' \
+              -e 's|@''GNULIB_FREOPEN''@|$(GNULIB_FREOPEN)|g' \
+              -e 's|@''GNULIB_FSEEK''@|$(GNULIB_FSEEK)|g' \
+              -e 's|@''GNULIB_FSEEKO''@|$(GNULIB_FSEEKO)|g' \
+              -e 's|@''GNULIB_FTELL''@|$(GNULIB_FTELL)|g' \
+              -e 's|@''GNULIB_FTELLO''@|$(GNULIB_FTELLO)|g' \
+              -e 's|@''GNULIB_FWRITE''@|$(GNULIB_FWRITE)|g' \
+              -e 's|@''GNULIB_GETDELIM''@|$(GNULIB_GETDELIM)|g' \
+              -e 's|@''GNULIB_GETLINE''@|$(GNULIB_GETLINE)|g' \
+              -e 's|@''GNULIB_OBSTACK_PRINTF''@|$(GNULIB_OBSTACK_PRINTF)|g' \
+              -e 's|@''GNULIB_OBSTACK_PRINTF_POSIX''@|$(GNULIB_OBSTACK_PRINTF_POSIX)|g' \
+              -e 's|@''GNULIB_PERROR''@|$(GNULIB_PERROR)|g' \
+              -e 's|@''GNULIB_POPEN''@|$(GNULIB_POPEN)|g' \
+              -e 's|@''GNULIB_PRINTF''@|$(GNULIB_PRINTF)|g' \
+              -e 's|@''GNULIB_PRINTF_POSIX''@|$(GNULIB_PRINTF_POSIX)|g' \
+              -e 's|@''GNULIB_PUTC''@|$(GNULIB_PUTC)|g' \
+              -e 's|@''GNULIB_PUTCHAR''@|$(GNULIB_PUTCHAR)|g' \
+              -e 's|@''GNULIB_PUTS''@|$(GNULIB_PUTS)|g' \
+              -e 's|@''GNULIB_REMOVE''@|$(GNULIB_REMOVE)|g' \
+              -e 's|@''GNULIB_RENAME''@|$(GNULIB_RENAME)|g' \
+              -e 's|@''GNULIB_RENAMEAT''@|$(GNULIB_RENAMEAT)|g' \
+              -e 's|@''GNULIB_SNPRINTF''@|$(GNULIB_SNPRINTF)|g' \
+              -e 's|@''GNULIB_SPRINTF_POSIX''@|$(GNULIB_SPRINTF_POSIX)|g' \
+              -e 's|@''GNULIB_STDIO_H_SIGPIPE''@|$(GNULIB_STDIO_H_SIGPIPE)|g' \
+              -e 's|@''GNULIB_TMPFILE''@|$(GNULIB_TMPFILE)|g' \
+              -e 's|@''GNULIB_VASPRINTF''@|$(GNULIB_VASPRINTF)|g' \
+              -e 's|@''GNULIB_VDPRINTF''@|$(GNULIB_VDPRINTF)|g' \
+              -e 's|@''GNULIB_VFPRINTF''@|$(GNULIB_VFPRINTF)|g' \
+              -e 's|@''GNULIB_VFPRINTF_POSIX''@|$(GNULIB_VFPRINTF_POSIX)|g' \
+              -e 's|@''GNULIB_VPRINTF''@|$(GNULIB_VPRINTF)|g' \
+              -e 's|@''GNULIB_VPRINTF_POSIX''@|$(GNULIB_VPRINTF_POSIX)|g' \
+              -e 's|@''GNULIB_VSNPRINTF''@|$(GNULIB_VSNPRINTF)|g' \
+              -e 's|@''GNULIB_VSPRINTF_POSIX''@|$(GNULIB_VSPRINTF_POSIX)|g' \
+              < $(srcdir)/stdio.in.h | \
+          sed -e 's|@''HAVE_DECL_FPURGE''@|$(HAVE_DECL_FPURGE)|g' \
+              -e 's|@''HAVE_DECL_FSEEKO''@|$(HAVE_DECL_FSEEKO)|g' \
+              -e 's|@''HAVE_DECL_FTELLO''@|$(HAVE_DECL_FTELLO)|g' \
+              -e 's|@''HAVE_DECL_GETDELIM''@|$(HAVE_DECL_GETDELIM)|g' \
+              -e 's|@''HAVE_DECL_GETLINE''@|$(HAVE_DECL_GETLINE)|g' \
+              -e 's|@''HAVE_DECL_OBSTACK_PRINTF''@|$(HAVE_DECL_OBSTACK_PRINTF)|g' \
+              -e 's|@''HAVE_DECL_SNPRINTF''@|$(HAVE_DECL_SNPRINTF)|g' \
+              -e 's|@''HAVE_DECL_VSNPRINTF''@|$(HAVE_DECL_VSNPRINTF)|g' \
+              -e 's|@''HAVE_DPRINTF''@|$(HAVE_DPRINTF)|g' \
+              -e 's|@''HAVE_FSEEKO''@|$(HAVE_FSEEKO)|g' \
+              -e 's|@''HAVE_FTELLO''@|$(HAVE_FTELLO)|g' \
+              -e 's|@''HAVE_RENAMEAT''@|$(HAVE_RENAMEAT)|g' \
+              -e 's|@''HAVE_VASPRINTF''@|$(HAVE_VASPRINTF)|g' \
+              -e 's|@''HAVE_VDPRINTF''@|$(HAVE_VDPRINTF)|g' \
+              -e 's|@''REPLACE_DPRINTF''@|$(REPLACE_DPRINTF)|g' \
+              -e 's|@''REPLACE_FCLOSE''@|$(REPLACE_FCLOSE)|g' \
+              -e 's|@''REPLACE_FFLUSH''@|$(REPLACE_FFLUSH)|g' \
+              -e 's|@''REPLACE_FOPEN''@|$(REPLACE_FOPEN)|g' \
+              -e 's|@''REPLACE_FPRINTF''@|$(REPLACE_FPRINTF)|g' \
+              -e 's|@''REPLACE_FPURGE''@|$(REPLACE_FPURGE)|g' \
+              -e 's|@''REPLACE_FREOPEN''@|$(REPLACE_FREOPEN)|g' \
+              -e 's|@''REPLACE_FSEEK''@|$(REPLACE_FSEEK)|g' \
+              -e 's|@''REPLACE_FSEEKO''@|$(REPLACE_FSEEKO)|g' \
+              -e 's|@''REPLACE_FTELL''@|$(REPLACE_FTELL)|g' \
+              -e 's|@''REPLACE_FTELLO''@|$(REPLACE_FTELLO)|g' \
+              -e 's|@''REPLACE_GETDELIM''@|$(REPLACE_GETDELIM)|g' \
+              -e 's|@''REPLACE_GETLINE''@|$(REPLACE_GETLINE)|g' \
+              -e 's|@''REPLACE_OBSTACK_PRINTF''@|$(REPLACE_OBSTACK_PRINTF)|g' \
+              -e 's|@''REPLACE_PERROR''@|$(REPLACE_PERROR)|g' \
+              -e 's|@''REPLACE_POPEN''@|$(REPLACE_POPEN)|g' \
+              -e 's|@''REPLACE_PRINTF''@|$(REPLACE_PRINTF)|g' \
+              -e 's|@''REPLACE_REMOVE''@|$(REPLACE_REMOVE)|g' \
+              -e 's|@''REPLACE_RENAME''@|$(REPLACE_RENAME)|g' \
+              -e 's|@''REPLACE_RENAMEAT''@|$(REPLACE_RENAMEAT)|g' \
+              -e 's|@''REPLACE_SNPRINTF''@|$(REPLACE_SNPRINTF)|g' \
+              -e 's|@''REPLACE_SPRINTF''@|$(REPLACE_SPRINTF)|g' \
+              -e 's|@''REPLACE_STDIO_WRITE_FUNCS''@|$(REPLACE_STDIO_WRITE_FUNCS)|g' \
+              -e 's|@''REPLACE_TMPFILE''@|$(REPLACE_TMPFILE)|g' \
+              -e 's|@''REPLACE_VASPRINTF''@|$(REPLACE_VASPRINTF)|g' \
+              -e 's|@''REPLACE_VDPRINTF''@|$(REPLACE_VDPRINTF)|g' \
+              -e 's|@''REPLACE_VFPRINTF''@|$(REPLACE_VFPRINTF)|g' \
+              -e 's|@''REPLACE_VPRINTF''@|$(REPLACE_VPRINTF)|g' \
+              -e 's|@''REPLACE_VSNPRINTF''@|$(REPLACE_VSNPRINTF)|g' \
+              -e 's|@''REPLACE_VSPRINTF''@|$(REPLACE_VSPRINTF)|g' \
+              -e 's|@''ASM_SYMBOL_PREFIX''@|$(ASM_SYMBOL_PREFIX)|g' \
+              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+              -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \
+        } > $@-t && \
+        mv $@-t $@
 # We need the following in order to create <stdlib.h> when the system
 # doesn't have one that works with the given compiler.
 stdlib.h: stdlib.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
diff --git a/autogen/README b/autogen/README
index a16dc93c48a..fd574c41cd6 100644
--- a/autogen/README
+++ b/autogen/README
@@ -7,6 +7,12 @@ configure    ../           autoconf
 config.in    ../src        autoheader      * also used by MSDOS bzr build
 aclocal.m4   ../           aclocal
 Makefile.in  ../lib        automake
+compile      ../           automake
+config.guess ../           automake
+config.sub   ../           automake
+depcomp      ../           automake
+install-sh   ../           automake
+missing      ../           automake
 There are also some scripts:
diff --git a/autogen/aclocal.m4 b/autogen/aclocal.m4
index 963faafb453..f23562235df 100644
--- a/autogen/aclocal.m4
+++ b/autogen/aclocal.m4
@@ -999,11 +999,13 @@ m4_include([m4/md5.m4])
 m4_include([m4/mktime.m4])
 m4_include([m4/multiarch.m4])
 m4_include([m4/readlink.m4])
+m4_include([m4/socklen.m4])
 m4_include([m4/st_dm_mode.m4])
 m4_include([m4/stat.m4])
 m4_include([m4/stdbool.m4])
 m4_include([m4/stddef_h.m4])
 m4_include([m4/stdint.m4])
+m4_include([m4/stdio_h.m4])
 m4_include([m4/stdlib_h.m4])
 m4_include([m4/strftime.m4])
 m4_include([m4/symlink.m4])
diff --git a/compile b/autogen/compile
index c0096a7b563..c0096a7b563 100755
--- a/compile
+++ b/autogen/compile
diff --git a/config.guess b/autogen/config.guess
index 187cd54edd2..e3a2116a7dc 100755
--- a/config.guess
+++ b/autogen/config.guess
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-#   2011 Free Software Foundation, Inc.
+#   Free Software Foundation, Inc.
-timestamp='2011-02-02'
+timestamp='2009-06-10'
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -27,16 +27,16 @@ timestamp='2011-02-02'
 # the same distribution terms that you use for the rest of that program.
-# Originally written by Per Bothner.  Please send patches (context
+# Originally written by Per Bothner <per@bothner.com>.
-# diff format) to <config-patches@gnu.org> and include a ChangeLog
+# Please send patches to <config-patches@gnu.org>.  Submit a context
-# entry.
+# diff and a properly formatted ChangeLog entry.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub.  If it succeeds, it prints the system name on stdout, and
 # exits with 0.  Otherwise, it exits with 1.
 #
-# You can get the latest version of this script from:
+# The plan is that this can be called by configure scripts if you
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+# don't specify an explicit build system type.
 me=`echo "$0" | sed -e 's,.*/,,'`
@@ -56,9 +56,8 @@ version="\
 GNU config.guess ($timestamp)
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -181,7 +180,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
                fi
                ;;
            *)
-                os=netbsd
+                os=netbsd
                ;;
        esac
        # The OS release
@@ -224,7 +223,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
                UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
                ;;
        *5.*)
-                UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+                UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
                ;;
        esac
        # According to Compaq, /usr/sbin/psrinfo has been available on
@@ -270,10 +269,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
        # A Xn.n version is an unreleased experimental baselevel.
        # 1.2 uses "1.2" for uname -r.
        echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+        exit ;;
-        exitcode=$?
-        trap '' 0
-        exit $exitcode ;;
    Alpha\ *:Windows_NT*:*)
        # How do we know it's Interix rather than the generic POSIX subsystem?
        # Should we change UNAME_MACHINE based on the output of uname instead
@@ -299,7 +295,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
        echo s390-ibm-zvmoe
        exit ;;
    *:OS400:*:*)
-        echo powerpc-ibm-os400
+        echo powerpc-ibm-os400
        exit ;;
    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
        echo arm-acorn-riscix${UNAME_RELEASE}
@@ -337,9 +333,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
        echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
        exit ;;
-    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
-        echo i386-pc-auroraux${UNAME_RELEASE}
-        exit ;;
    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
        eval $set_cc_for_build
        SUN_ARCH="i386"
@@ -398,23 +391,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
    # MiNT.  But MiNT is downward compatible to TOS, so this should
    # be no problem.
    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+        echo m68k-atari-mint${UNAME_RELEASE}
        exit ;;
    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
        echo m68k-atari-mint${UNAME_RELEASE}
-        exit ;;
+        exit ;;
    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+        echo m68k-atari-mint${UNAME_RELEASE}
        exit ;;
    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
+        echo m68k-milan-mint${UNAME_RELEASE}
-        exit ;;
+        exit ;;
    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
+        echo m68k-hades-mint${UNAME_RELEASE}
-        exit ;;
+        exit ;;
    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
+        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit ;;
+        exit ;;
    m68k:machten:*:*)
        echo m68k-apple-machten${UNAME_RELEASE}
        exit ;;
@@ -484,8 +477,8 @@ EOF
        echo m88k-motorola-sysv3
        exit ;;
    AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
+        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
+        UNAME_PROCESSOR=`/usr/bin/uname -p`
        if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
        then
            if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
@@ -498,7 +491,7 @@ EOF
        else
            echo i586-dg-dgux${UNAME_RELEASE}
        fi
-        exit ;;
+        exit ;;
    M88*:DolphinOS:*:*) # DolphinOS (SVR3)
        echo m88k-dolphin-sysv3
        exit ;;
@@ -555,7 +548,7 @@ EOF
                echo rs6000-ibm-aix3.2
        fi
        exit ;;
-    *:AIX:*:[4567])
+    *:AIX:*:[456])
        IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
        if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
                IBM_ARCH=rs6000
@@ -598,52 +591,52 @@ EOF
            9000/[678][0-9][0-9])
                if [ -x /usr/bin/getconf ]; then
                    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
+                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
+                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
+                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
+                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
+                          64) HP_ARCH="hppa2.0w" ;;
                          '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-                        esac ;;
+                        esac ;;
-                    esac
+                    esac
                fi
                if [ "${HP_ARCH}" = "" ]; then
                    eval $set_cc_for_build
-                    sed 's/^            //' << EOF >$dummy.c
+                    sed 's/^              //' << EOF >$dummy.c
-                #define _HPUX_SOURCE
+              #define _HPUX_SOURCE
-                #include <stdlib.h>
+              #include <stdlib.h>
-                #include <unistd.h>
+              #include <unistd.h>
-                int main ()
+              int main ()
-                {
+              {
-                #if defined(_SC_KERNEL_BITS)
+              #if defined(_SC_KERNEL_BITS)
-                    long bits = sysconf(_SC_KERNEL_BITS);
+                  long bits = sysconf(_SC_KERNEL_BITS);
-                #endif
+              #endif
-                    long cpu  = sysconf (_SC_CPU_VERSION);
+                  long cpu  = sysconf (_SC_CPU_VERSION);
-                    switch (cpu)
+                  switch (cpu)
-                        {
+                {
-                        case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+                case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-                        case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+                case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-                        case CPU_PA_RISC2_0:
+                case CPU_PA_RISC2_0:
-                #if defined(_SC_KERNEL_BITS)
+              #if defined(_SC_KERNEL_BITS)
-                            switch (bits)
+                    switch (bits)
-                                {
+                        {
-                                case 64: puts ("hppa2.0w"); break;
+                        case 64: puts ("hppa2.0w"); break;
-                                case 32: puts ("hppa2.0n"); break;
+                        case 32: puts ("hppa2.0n"); break;
-                                default: puts ("hppa2.0"); break;
+                        default: puts ("hppa2.0"); break;
-                                } break;
+                        } break;
-                #else  /* !defined(_SC_KERNEL_BITS) */
+              #else  /* !defined(_SC_KERNEL_BITS) */
-                            puts ("hppa2.0"); break;
+                    puts ("hppa2.0"); break;
-                #endif
+              #endif
-                        default: puts ("hppa1.0"); break;
+                default: puts ("hppa1.0"); break;
-                        }
+                }
-                    exit (0);
+                  exit (0);
-                }
+              }
 EOF
                    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
                    test -z "$HP_ARCH" && HP_ARCH=hppa
@@ -734,22 +727,22 @@ EOF
        exit ;;
    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
        echo c1-convex-bsd
-        exit ;;
+        exit ;;
    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
        if getsysinfo -f scalar_acc
        then echo c32-convex-bsd
        else echo c2-convex-bsd
        fi
-        exit ;;
+        exit ;;
    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
        echo c34-convex-bsd
-        exit ;;
+        exit ;;
    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
        echo c38-convex-bsd
-        exit ;;
+        exit ;;
    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
        echo c4-convex-bsd
-        exit ;;
+        exit ;;
    CRAY*Y-MP:*:*:*)
        echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
        exit ;;
@@ -773,14 +766,14 @@ EOF
        exit ;;
    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
        FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit ;;
+        exit ;;
    5000:UNIX_System_V:4.*:*)
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
        exit ;;
    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
        echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
@@ -808,18 +801,18 @@ EOF
        echo ${UNAME_MACHINE}-pc-mingw32
        exit ;;
    i*:windows32*:*)
-        # uname -m includes "-pc" on this system.
+        # uname -m includes "-pc" on this system.
-        echo ${UNAME_MACHINE}-mingw32
+        echo ${UNAME_MACHINE}-mingw32
        exit ;;
    i*:PW*:*)
        echo ${UNAME_MACHINE}-pc-pw32
        exit ;;
-    *:Interix*:*)
+    *:Interix*:[3456]*)
-        case ${UNAME_MACHINE} in
+        case ${UNAME_MACHINE} in
            x86)
                echo i586-pc-interix${UNAME_RELEASE}
                exit ;;
-            authenticamd | genuineintel | EM64T)
+            EM64T | authenticamd | genuineintel)
                echo x86_64-unknown-interix${UNAME_RELEASE}
                exit ;;
            IA64)
@@ -861,20 +854,6 @@ EOF
    i*86:Minix:*:*)
        echo ${UNAME_MACHINE}-pc-minix
        exit ;;
-    alpha:Linux:*:*)
-        case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-          EV5)   UNAME_MACHINE=alphaev5 ;;
-          EV56)  UNAME_MACHINE=alphaev56 ;;
-          PCA56) UNAME_MACHINE=alphapca56 ;;
-          PCA57) UNAME_MACHINE=alphapca56 ;;
-          EV6)   UNAME_MACHINE=alphaev6 ;;
-          EV67)  UNAME_MACHINE=alphaev67 ;;
-          EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-        objdump --private-headers /bin/sh | grep -q ld.so.1
-        if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-        echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-        exit ;;
    arm*:Linux:*:*)
        eval $set_cc_for_build
        if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -895,18 +874,7 @@ EOF
        echo crisv32-axis-linux-gnu
        exit ;;
    frv:Linux:*:*)
-        echo frv-unknown-linux-gnu
+        echo frv-unknown-linux-gnu
-        exit ;;
-    i*86:Linux:*:*)
-        LIBC=gnu
-        eval $set_cc_for_build
-        sed 's/^        //' << EOF >$dummy.c
-        #ifdef __dietlibc__
-        LIBC=dietlibc
-        #endif
-EOF
-        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
-        echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
        exit ;;
    ia64:Linux:*:*)
        echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -933,18 +901,39 @@ EOF
        #endif
        #endif
 EOF
-        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+        eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+            /^CPU/{
+                s: ::g
+                p
+            }'`"
        test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
        ;;
    or32:Linux:*:*)
        echo or32-unknown-linux-gnu
        exit ;;
+    ppc:Linux:*:*)
+        echo powerpc-unknown-linux-gnu
+        exit ;;
+    ppc64:Linux:*:*)
+        echo powerpc64-unknown-linux-gnu
+        exit ;;
+    alpha:Linux:*:*)
+        case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+          EV5)   UNAME_MACHINE=alphaev5 ;;
+          EV56)  UNAME_MACHINE=alphaev56 ;;
+          PCA56) UNAME_MACHINE=alphapca56 ;;
+          PCA57) UNAME_MACHINE=alphapca56 ;;
+          EV6)   UNAME_MACHINE=alphaev6 ;;
+          EV67)  UNAME_MACHINE=alphaev67 ;;
+          EV68*) UNAME_MACHINE=alphaev68 ;;
+        esac
+        objdump --private-headers /bin/sh | grep -q ld.so.1
+        if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+        echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+        exit ;;
    padre:Linux:*:*)
        echo sparc-unknown-linux-gnu
        exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-        echo hppa64-unknown-linux-gnu
-        exit ;;
    parisc:Linux:*:* | hppa:Linux:*:*)
        # Look for CPU level
        case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -953,17 +942,14 @@ EOF
          *)    echo hppa-unknown-linux-gnu ;;
        esac
        exit ;;
-    ppc64:Linux:*:*)
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
-        echo powerpc64-unknown-linux-gnu
+        echo hppa64-unknown-linux-gnu
-        exit ;;
-    ppc:Linux:*:*)
-        echo powerpc-unknown-linux-gnu
        exit ;;
    s390:Linux:*:* | s390x:Linux:*:*)
        echo ${UNAME_MACHINE}-ibm-linux
        exit ;;
    sh64*:Linux:*:*)
-        echo ${UNAME_MACHINE}-unknown-linux-gnu
+        echo ${UNAME_MACHINE}-unknown-linux-gnu
        exit ;;
    sh*:Linux:*:*)
        echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -971,9 +957,6 @@ EOF
    sparc:Linux:*:* | sparc64:Linux:*:*)
        echo ${UNAME_MACHINE}-unknown-linux-gnu
        exit ;;
-    tile*:Linux:*:*)
-        echo ${UNAME_MACHINE}-tilera-linux-gnu
-        exit ;;
    vax:Linux:*:*)
        echo ${UNAME_MACHINE}-dec-linux-gnu
        exit ;;
@@ -981,8 +964,60 @@ EOF
        echo x86_64-unknown-linux-gnu
        exit ;;
    xtensa*:Linux:*:*)
-        echo ${UNAME_MACHINE}-unknown-linux-gnu
+        echo ${UNAME_MACHINE}-unknown-linux-gnu
        exit ;;
+    i*86:Linux:*:*)
+        # The BFD linker knows what the default object file format is, so
+        # first see if it will tell us. cd to the root directory to prevent
+        # problems with other programs or directories called `ld' in the path.
+        # Set LC_ALL=C to ensure ld outputs messages in English.
+        ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
+                         | sed -ne '/supported targets:/!d
+                                    s/[         ][      ]*/ /g
+                                    s/.*supported targets: *//
+                                    s/ .*//
+                                    p'`
+        case "$ld_supported_targets" in
+          elf32-i386)
+                TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+                ;;
+        esac
+        # Determine whether the default compiler is a.out or elf
+        eval $set_cc_for_build
+        sed 's/^        //' << EOF >$dummy.c
+        #include <features.h>
+        #ifdef __ELF__
+        # ifdef __GLIBC__
+        #  if __GLIBC__ >= 2
+        LIBC=gnu
+        #  else
+        LIBC=gnulibc1
+        #  endif
+        # else
+        LIBC=gnulibc1
+        # endif
+        #else
+        #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
+        LIBC=gnu
+        #else
+        LIBC=gnuaout
+        #endif
+        #endif
+        #ifdef __dietlibc__
+        LIBC=dietlibc
+        #endif
+EOF
+        eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+            /^LIBC/{
+                s: ::g
+                p
+            }'`"
+        test x"${LIBC}" != x && {
+                echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+                exit
+        }
+        test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
+        ;;
    i*86:DYNIX/ptx:4*:*)
        # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
        # earlier versions are messed up and put the nodename in both
@@ -990,11 +1025,11 @@ EOF
        echo i386-sequent-sysv4
        exit ;;
    i*86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
+        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
+        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
+        # I am not positive that other SVR4 systems won't match this,
        # I just have to hope.  -- rms.
-        # Use sysv4.2uw... so that sysv4* matches it.
+        # Use sysv4.2uw... so that sysv4* matches it.
        echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
        exit ;;
    i*86:OS/2:*:*)
@@ -1026,7 +1061,7 @@ EOF
        fi
        exit ;;
    i*86:*:5:[678]*)
-        # UnixWare 7.x, OpenUNIX and OpenServer 6.
+        # UnixWare 7.x, OpenUNIX and OpenServer 6.
        case `/bin/uname -X | grep "^Machine"` in
            *486*)           UNAME_MACHINE=i486 ;;
            *Pentium)        UNAME_MACHINE=i586 ;;
@@ -1054,13 +1089,13 @@ EOF
        exit ;;
    pc:*:*:*)
        # Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
+        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i586.
+        # the processor, so we play safe by assuming i586.
        # Note: whatever this is, it MUST be the same as what config.sub
        # prints for the "djgpp" host, or else GDB configury will decide that
        # this is a cross-build.
        echo i586-pc-msdosdjgpp
-        exit ;;
+        exit ;;
    Intel:Mach:3*:*)
        echo i386-pc-mach3
        exit ;;
@@ -1095,8 +1130,8 @@ EOF
        /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
          && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && { echo i486-ncr-sysv4; exit; } ;;
+          && { echo i486-ncr-sysv4; exit; } ;;
    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
        OS_REL='.3'
        test -r /etc/.relid \
@@ -1139,10 +1174,10 @@ EOF
                echo ns32k-sni-sysv
        fi
        exit ;;
-    PENTIUM:*:4.0*:*)   # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                        # says <Richard.M.Bartel@ccMail.Census.GOV>
+                      # says <Richard.M.Bartel@ccMail.Census.GOV>
-        echo i586-unisys-sysv4
+        echo i586-unisys-sysv4
-        exit ;;
+        exit ;;
    *:UNIX_System_V:4*:FTX*)
        # From Gerald Hewes <hewes@openmarket.com>.
        # How about differentiating between stratus architectures? -djm
@@ -1168,11 +1203,11 @@ EOF
        exit ;;
    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
        if [ -d /usr/nec ]; then
-                echo mips-nec-sysv${UNAME_RELEASE}
+                echo mips-nec-sysv${UNAME_RELEASE}
        else
-                echo mips-unknown-sysv${UNAME_RELEASE}
+                echo mips-unknown-sysv${UNAME_RELEASE}
        fi
-        exit ;;
+        exit ;;
    BeBox:BeOS:*:*)     # BeOS running on hardware made by Be, PPC only.
        echo powerpc-be-beos
        exit ;;
@@ -1212,16 +1247,6 @@ EOF
    *:Darwin:*:*)
        UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
        case $UNAME_PROCESSOR in
-            i386)
-                eval $set_cc_for_build
-                if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-                  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-                      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-                      grep IS_64BIT_ARCH >/dev/null
-                  then
-                      UNAME_PROCESSOR="x86_64"
-                  fi
-                fi ;;
            unknown) UNAME_PROCESSOR=powerpc ;;
        esac
        echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
@@ -1237,9 +1262,6 @@ EOF
    *:QNX:*:4*)
        echo i386-pc-qnx
        exit ;;
-    NEO-?:NONSTOP_KERNEL:*:*)
-        echo neo-tandem-nsk${UNAME_RELEASE}
-        exit ;;
    NSE-?:NONSTOP_KERNEL:*:*)
        echo nse-tandem-nsk${UNAME_RELEASE}
        exit ;;
@@ -1285,13 +1307,13 @@ EOF
        echo pdp10-unknown-its
        exit ;;
    SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
+        echo mips-sei-seiux${UNAME_RELEASE}
        exit ;;
    *:DragonFly:*:*)
        echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
        exit ;;
    *:*VMS:*:*)
-        UNAME_MACHINE=`(uname -p) 2>/dev/null`
+        UNAME_MACHINE=`(uname -p) 2>/dev/null`
        case "${UNAME_MACHINE}" in
            A*) echo alpha-dec-vms ; exit ;;
            I*) echo ia64-dec-vms ; exit ;;
@@ -1331,11 +1353,11 @@ main ()
 #include <sys/param.h>
  printf ("m68k-sony-newsos%s\n",
 #ifdef NEWSOS4
-        "4"
+          "4"
 #else
-        ""
+          ""
 #endif
-        ); exit (0);
+         ); exit (0);
 #endif
 #endif
diff --git a/autogen/config.in b/autogen/config.in
index 8889213b781..57ff5f45e0c 100644
--- a/autogen/config.in
+++ b/autogen/config.in
@@ -833,6 +833,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if `vfork' works. */
 #undef HAVE_WORKING_VFORK
+/* Define to 1 if you have the <ws2tcpip.h> header file. */
+#undef HAVE_WS2TCPIP_H
 /* Define to 1 if you want to use version 11 of X windows. Otherwise, Emacs
   expects to use version 10. */
 #undef HAVE_X11
@@ -996,9 +999,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
   slash */
 #undef REPLACE_FUNC_STAT_FILE
-/* Define as the return type of signal handlers (`int' or `void'). */
-#undef RETSIGTYPE
 /* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
   'sig_atomic_t'. */
 #undef SIG_ATOMIC_T_SUFFIX
@@ -1206,6 +1206,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 # define __restrict__
 #endif
+/* type to use in place of socklen_t if not defined */
+#undef socklen_t
 /* Define to any substitute for sys_siglist. */
 #undef sys_siglist
@@ -1268,11 +1271,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #  define SYSTEM_PURESIZE_EXTRA 30000
 #endif
-/* SIGTYPE is the macro we actually use.  */
-#ifndef SIGTYPE
-#define SIGTYPE RETSIGTYPE
-#endif
 #ifdef emacs /* Don't do this for lib-src.  */
 /* Tell regex.c to use a type compatible with Emacs.  */
 #define RE_TRANSLATE_TYPE Lisp_Object
diff --git a/config.sub b/autogen/config.sub
index 0ef29b072ed..eb0389a693f 100755
--- a/config.sub
+++ b/autogen/config.sub
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-#   2011 Free Software Foundation, Inc.
+#   Free Software Foundation, Inc.
-timestamp='2011-02-24'
+timestamp='2009-06-11'
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -32,16 +32,13 @@ timestamp='2011-02-24'
 # Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted GNU ChangeLog entry.
+# diff and a properly formatted ChangeLog entry.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
 # If it is invalid, we print an error message on stderr and exit with code 1.
 # Otherwise, we print the canonical config type on stdout and succeed.
-# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
 # that are meaningful with *any* GNU software.
@@ -75,9 +72,8 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -124,9 +120,8 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
-  knetbsd*-gnu* | netbsd*-gnu* | \
  kopensolaris*-gnu* | \
  storm-chaos* | os2-emx* | rtmk-nova*)
    os=-$maybe_os
@@ -154,12 +149,12 @@ case $os in
        -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
        -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
        -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-        -apple | -axis | -knuth | -cray | -microblaze)
+        -apple | -axis | -knuth | -cray)
                os=
                basic_machine=$1
                ;;
-        -bluegene*)
+        -bluegene*)
-                os=-cnk
+                os=-cnk
                ;;
        -sim | -cisco | -oki | -wec | -winbond)
                os=
@@ -175,10 +170,10 @@ case $os in
                os=-chorusos
                basic_machine=$1
                ;;
-        -chorusrdb)
+        -chorusrdb)
-                os=-chorusrdb
+                os=-chorusrdb
                basic_machine=$1
-                ;;
+                ;;
        -hiux*)
                os=-hiuxwe2
                ;;
@@ -283,38 +278,26 @@ case $basic_machine in
        | moxie \
        | mt \
        | msp430 \
-        | nds32 | nds32le | nds32be \
        | nios | nios2 \
        | ns16k | ns32k \
        | or32 \
        | pdp10 | pdp11 | pj | pjl \
        | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
        | pyramid \
-        | rx \
        | score \
        | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
        | sh64 | sh64le \
        | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
        | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
        | spu | strongarm \
-        | tahoe | thumb | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+        | tahoe | thumb | tic4x | tic80 | tron \
-        | ubicom32 \
        | v850 | v850e \
        | we32k \
        | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
        | z8k | z80)
                basic_machine=$basic_machine-unknown
                ;;
-        c54x)
+        m6811 | m68hc11 | m6812 | m68hc12)
-                basic_machine=tic54x-unknown
-                ;;
-        c55x)
-                basic_machine=tic55x-unknown
-                ;;
-        c6x)
-                basic_machine=tic6x-unknown
-                ;;
-        m6811 | m68hc11 | m6812 | m68hc12 | picochip)
                # Motorola 68HC11/12.
                basic_machine=$basic_machine-unknown
                os=-none
@@ -345,7 +328,7 @@ case $basic_machine in
        | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
        | avr-* | avr32-* \
        | bfin-* | bs2000-* \
-        | c[123]* | c30-* | [cjt]90-* | c4x-* \
+        | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
        | clipper-* | craynv-* | cydra-* \
        | d10v-* | d30v-* | dlx-* \
        | elxsi-* \
@@ -357,7 +340,7 @@ case $basic_machine in
        | lm32-* \
        | m32c-* | m32r-* | m32rle-* \
        | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-        | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
+        | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
        | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
        | mips16-* \
        | mips64-* | mips64el-* \
@@ -379,24 +362,21 @@ case $basic_machine in
        | mmix-* \
        | mt-* \
        | msp430-* \
-        | nds32-* | nds32le-* | nds32be-* \
        | nios-* | nios2-* \
        | none-* | np1-* | ns16k-* | ns32k-* \
        | orion-* \
        | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
        | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
        | pyramid-* \
-        | romp-* | rs6000-* | rx-* \
+        | romp-* | rs6000-* \
        | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
        | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
        | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
        | sparclite-* \
        | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
        | tahoe-* | thumb-* \
-        | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+        | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
-        | tile-* | tilegx-* \
        | tron-* \
-        | ubicom32-* \
        | v850-* | v850e-* | vax-* \
        | we32k-* \
        | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
@@ -424,7 +404,7 @@ case $basic_machine in
                basic_machine=a29k-amd
                os=-udi
                ;;
-        abacus)
+        abacus)
                basic_machine=abacus-unknown
                ;;
        adobe68k)
@@ -494,20 +474,11 @@ case $basic_machine in
                basic_machine=powerpc-ibm
                os=-cnk
                ;;
-        c54x-*)
-                basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
-                ;;
-        c55x-*)
-                basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
-                ;;
-        c6x-*)
-                basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
-                ;;
        c90)
                basic_machine=c90-cray
                os=-unicos
                ;;
-        cegcc)
+        cegcc)
                basic_machine=arm-unknown
                os=-cegcc
                ;;
@@ -539,7 +510,7 @@ case $basic_machine in
                basic_machine=craynv-cray
                os=-unicosmp
                ;;
-        cr16 | cr16-*)
+        cr16)
                basic_machine=cr16-unknown
                os=-elf
                ;;
@@ -755,9 +726,6 @@ case $basic_machine in
                basic_machine=ns32k-utek
                os=-sysv
                ;;
-        microblaze)
-                basic_machine=microblaze-xilinx
-                ;;
        mingw32)
                basic_machine=i386-pc
                os=-mingw32
@@ -862,12 +830,6 @@ case $basic_machine in
        np1)
                basic_machine=np1-gould
                ;;
-        neo-tandem)
-                basic_machine=neo-tandem
-                ;;
-        nse-tandem)
-                basic_machine=nse-tandem
-                ;;
        nsr-tandem)
                basic_machine=nsr-tandem
                ;;
@@ -1102,10 +1064,17 @@ case $basic_machine in
                basic_machine=t90-cray
                os=-unicos
                ;;
-        # This must be matched before tile*.
+        tic54x | c54x*)
-        tilegx*)
+                basic_machine=tic54x-unknown
-                basic_machine=tilegx-unknown
+                os=-coff
-                os=-linux-gnu
+                ;;
+        tic55x | c55x*)
+                basic_machine=tic55x-unknown
+                os=-coff
+                ;;
+        tic6x | c6x*)
+                basic_machine=tic6x-unknown
+                os=-coff
                ;;
        tile*)
                basic_machine=tile-unknown
@@ -1275,12 +1244,9 @@ esac
 if [ x"$os" != x"" ]
 then
 case $os in
-        # First match some system type aliases
+        # First match some system type aliases
-        # that might get confused with valid system types.
+        # that might get confused with valid system types.
        # -solaris* is a basic system type, with this one exception.
-        -auroraux)
-                os=-auroraux
-                ;;
        -solaris1 | -solaris1.*)
                os=`echo $os | sed -e 's|solaris1|sunos4|'`
                ;;
@@ -1302,8 +1268,8 @@ case $os in
        # -sysv* is not here because it comes later, after sysvr4.
        -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
              | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
-              | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+              | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-              | -sym* | -kopensolaris* \
+              | -kopensolaris* \
              | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
              | -aos* | -aros* \
              | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
@@ -1316,8 +1282,7 @@ case $os in
              | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
              | -chorusos* | -chorusrdb* | -cegcc* \
              | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-              | -mingw32* | -linux-gnu* | -linux-android* \
+              | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-              | -linux-newlib* | -linux-uclibc* \
              | -uxpv* | -beos* | -mpeix* | -udk* \
              | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
              | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
@@ -1325,7 +1290,7 @@ case $os in
              | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
              | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
              | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-              | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+              | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
        # Remember, each alternative MUST END IN *, to match a version number.
                ;;
        -qnx*)
@@ -1364,7 +1329,7 @@ case $os in
        -opened*)
                os=-openedition
                ;;
-        -os400*)
+        -os400*)
                os=-os400
                ;;
        -wince*)
@@ -1413,7 +1378,7 @@ case $os in
        -sinix*)
                os=-sysv4
                ;;
-        -tpf*)
+        -tpf*)
                os=-tpf
                ;;
        -triton*)
@@ -1458,8 +1423,6 @@ case $os in
        -dicos*)
                os=-dicos
                ;;
-        -nacl*)
-                ;;
        -none)
                ;;
        *)
@@ -1482,10 +1445,10 @@ else
 # system, and we'll never get to this point.
 case $basic_machine in
-        score-*)
+        score-*)
                os=-elf
                ;;
-        spu-*)
+        spu-*)
                os=-elf
                ;;
        *-acorn)
@@ -1497,17 +1460,8 @@ case $basic_machine in
        arm*-semi)
                os=-aout
                ;;
-        c4x-* | tic4x-*)
+        c4x-* | tic4x-*)
-                os=-coff
+                os=-coff
-                ;;
-        tic54x-*)
-                os=-coff
-                ;;
-        tic55x-*)
-                os=-coff
-                ;;
-        tic6x-*)
-                os=-coff
                ;;
        # This must come before the *-dec entry.
        pdp10-*)
@@ -1534,7 +1488,7 @@ case $basic_machine in
        m68*-cisco)
                os=-aout
                ;;
-        mep-*)
+        mep-*)
                os=-elf
                ;;
        mips*-cisco)
@@ -1561,7 +1515,7 @@ case $basic_machine in
        *-ibm)
                os=-aix
                ;;
-        *-knuth)
+        *-knuth)
                os=-mmixware
                ;;
        *-wec)
diff --git a/autogen/configure b/autogen/configure
index 4c45db1badd..94c65d62ccd 100755
--- a/autogen/configure
+++ b/autogen/configure
@@ -673,6 +673,93 @@ NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H
 NEXT_SYS_STAT_H
 NEXT_AS_FIRST_DIRECTIVE_STDLIB_H
 NEXT_STDLIB_H
+NEXT_AS_FIRST_DIRECTIVE_STDIO_H
+NEXT_STDIO_H
+REPLACE_VSPRINTF
+REPLACE_VSNPRINTF
+REPLACE_VPRINTF
+REPLACE_VFPRINTF
+REPLACE_VDPRINTF
+REPLACE_VASPRINTF
+REPLACE_TMPFILE
+REPLACE_STDIO_WRITE_FUNCS
+REPLACE_SPRINTF
+REPLACE_SNPRINTF
+REPLACE_RENAMEAT
+REPLACE_RENAME
+REPLACE_REMOVE
+REPLACE_PRINTF
+REPLACE_POPEN
+REPLACE_PERROR
+REPLACE_OBSTACK_PRINTF
+REPLACE_GETLINE
+REPLACE_GETDELIM
+REPLACE_FTELLO
+REPLACE_FTELL
+REPLACE_FSEEKO
+REPLACE_FSEEK
+REPLACE_FREOPEN
+REPLACE_FPURGE
+REPLACE_FPRINTF
+REPLACE_FOPEN
+REPLACE_FFLUSH
+REPLACE_FCLOSE
+REPLACE_DPRINTF
+HAVE_VDPRINTF
+HAVE_VASPRINTF
+HAVE_RENAMEAT
+HAVE_FTELLO
+HAVE_FSEEKO
+HAVE_DPRINTF
+HAVE_DECL_VSNPRINTF
+HAVE_DECL_SNPRINTF
+HAVE_DECL_OBSTACK_PRINTF
+HAVE_DECL_GETLINE
+HAVE_DECL_GETDELIM
+HAVE_DECL_FTELLO
+HAVE_DECL_FSEEKO
+HAVE_DECL_FPURGE
+GNULIB_VSPRINTF_POSIX
+GNULIB_VSNPRINTF
+GNULIB_VPRINTF_POSIX
+GNULIB_VPRINTF
+GNULIB_VFPRINTF_POSIX
+GNULIB_VFPRINTF
+GNULIB_VDPRINTF
+GNULIB_VASPRINTF
+GNULIB_TMPFILE
+GNULIB_STDIO_H_SIGPIPE
+GNULIB_SPRINTF_POSIX
+GNULIB_SNPRINTF
+GNULIB_RENAMEAT
+GNULIB_RENAME
+GNULIB_REMOVE
+GNULIB_PUTS
+GNULIB_PUTCHAR
+GNULIB_PUTC
+GNULIB_PRINTF_POSIX
+GNULIB_PRINTF
+GNULIB_POPEN
+GNULIB_PERROR
+GNULIB_OBSTACK_PRINTF_POSIX
+GNULIB_OBSTACK_PRINTF
+GNULIB_GETLINE
+GNULIB_GETDELIM
+GNULIB_FWRITE
+GNULIB_FTELLO
+GNULIB_FTELL
+GNULIB_FSEEKO
+GNULIB_FSEEK
+GNULIB_FREOPEN
+GNULIB_FPUTS
+GNULIB_FPUTC
+GNULIB_FPURGE
+GNULIB_FPRINTF_POSIX
+GNULIB_FPRINTF
+GNULIB_FOPEN
+GNULIB_FFLUSH
+GNULIB_FCLOSE
+GNULIB_DPRINTF
 STDINT_H
 WINT_T_SUFFIX
 WCHAR_T_SUFFIX
@@ -2943,6 +3030,7 @@ as_fn_append ac_header_list " getopt.h"
 as_fn_append ac_func_list " lstat"
 as_fn_append ac_func_list " alarm"
 as_fn_append ac_func_list " readlink"
+as_fn_append ac_header_list " sys/socket.h"
 as_fn_append ac_header_list " wchar.h"
 as_fn_append ac_header_list " stdint.h"
 as_fn_append ac_func_list " tzset"
@@ -6120,10 +6208,12 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
  # Code from module mktime:
  # Code from module multiarch:
  # Code from module readlink:
+  # Code from module socklen:
  # Code from module stat:
  # Code from module stdbool:
  # Code from module stddef:
  # Code from module stdint:
+  # Code from module stdio:
  # Code from module stdlib:
  # Code from module strftime:
  # Code from module symlink:
@@ -7809,40 +7899,6 @@ $as_echo "#define HAVE_STRUCT_UTIMBUF 1" >>confdefs.h
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
-$as_echo_n "checking return type of signal handlers... " >&6; }
-if test "${ac_cv_type_signal+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <signal.h>
-int
-main ()
-{
-return *(signal (0, 0)) (0) == 1;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_type_signal=int
-else
-  ac_cv_type_signal=void
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5
-$as_echo "$ac_cv_type_signal" >&6; }
-cat >>confdefs.h <<_ACEOF
-#define RETSIGTYPE $ac_cv_type_signal
-_ACEOF
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for speed_t" >&5
 $as_echo_n "checking for speed_t... " >&6; }
 if test "${emacs_cv_speed_t+set}" = set; then :
@@ -7947,18 +8003,6 @@ $as_echo "#define NO_MATHERR 1" >>confdefs.h
 fi
-for ac_header in sys/socket.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "sys/socket.h" "ac_cv_header_sys_socket_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_socket_h" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_SYS_SOCKET_H 1
-_ACEOF
-fi
-done
 for ac_header in net/if.h
 do :
  ac_fn_c_check_header_compile "$LINENO" "net/if.h" "ac_cv_header_net_if_h" "$ac_includes_default
@@ -8667,7 +8711,7 @@ $as_echo "$ac_enable_autodepend" >&6; }
      DEPFLAGS='-MMD -MF ${DEPDIR}/$*.d'
      ## In parallel builds, another make might create depdir between
      ## the first test and mkdir, so stick another test on the end.
-      ## Or use mkinstalldirs?  mkdir -p is not portable.
+      ## Or use install-sh -d?  mkdir -p is not portable.
      MKDEPDIR='test -d ${DEPDIR} || mkdir ${DEPDIR} || test -d ${DEPDIR}'
      deps_frag=autodeps.mk
   fi
@@ -14761,6 +14805,24 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   if test $ac_cv_header_sys_socket_h = no; then
+                         for ac_header in ws2tcpip.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "ws2tcpip.h" "ac_cv_header_ws2tcpip_h" "$ac_includes_default"
+if test "x$ac_cv_header_ws2tcpip_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_WS2TCPIP_H 1
+_ACEOF
+fi
+done
+   fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5
 $as_echo_n "checking for stdbool.h that conforms to C99... " >&6; }
 if test "${ac_cv_header_stdbool_h+set}" = set; then :
@@ -15008,6 +15070,93 @@ $as_echo "#define HAVE_LONG_LONG_INT 1" >>confdefs.h
+  GNULIB_DPRINTF=0;
+  GNULIB_FCLOSE=0;
+  GNULIB_FFLUSH=0;
+  GNULIB_FOPEN=0;
+  GNULIB_FPRINTF=0;
+  GNULIB_FPRINTF_POSIX=0;
+  GNULIB_FPURGE=0;
+  GNULIB_FPUTC=0;
+  GNULIB_FPUTS=0;
+  GNULIB_FREOPEN=0;
+  GNULIB_FSEEK=0;
+  GNULIB_FSEEKO=0;
+  GNULIB_FTELL=0;
+  GNULIB_FTELLO=0;
+  GNULIB_FWRITE=0;
+  GNULIB_GETDELIM=0;
+  GNULIB_GETLINE=0;
+  GNULIB_OBSTACK_PRINTF=0;
+  GNULIB_OBSTACK_PRINTF_POSIX=0;
+  GNULIB_PERROR=0;
+  GNULIB_POPEN=0;
+  GNULIB_PRINTF=0;
+  GNULIB_PRINTF_POSIX=0;
+  GNULIB_PUTC=0;
+  GNULIB_PUTCHAR=0;
+  GNULIB_PUTS=0;
+  GNULIB_REMOVE=0;
+  GNULIB_RENAME=0;
+  GNULIB_RENAMEAT=0;
+  GNULIB_SNPRINTF=0;
+  GNULIB_SPRINTF_POSIX=0;
+  GNULIB_STDIO_H_SIGPIPE=0;
+  GNULIB_TMPFILE=0;
+  GNULIB_VASPRINTF=0;
+  GNULIB_VDPRINTF=0;
+  GNULIB_VFPRINTF=0;
+  GNULIB_VFPRINTF_POSIX=0;
+  GNULIB_VPRINTF=0;
+  GNULIB_VPRINTF_POSIX=0;
+  GNULIB_VSNPRINTF=0;
+  GNULIB_VSPRINTF_POSIX=0;
+    HAVE_DECL_FPURGE=1;
+  HAVE_DECL_FSEEKO=1;
+  HAVE_DECL_FTELLO=1;
+  HAVE_DECL_GETDELIM=1;
+  HAVE_DECL_GETLINE=1;
+  HAVE_DECL_OBSTACK_PRINTF=1;
+  HAVE_DECL_SNPRINTF=1;
+  HAVE_DECL_VSNPRINTF=1;
+  HAVE_DPRINTF=1;
+  HAVE_FSEEKO=1;
+  HAVE_FTELLO=1;
+  HAVE_RENAMEAT=1;
+  HAVE_VASPRINTF=1;
+  HAVE_VDPRINTF=1;
+  REPLACE_DPRINTF=0;
+  REPLACE_FCLOSE=0;
+  REPLACE_FFLUSH=0;
+  REPLACE_FOPEN=0;
+  REPLACE_FPRINTF=0;
+  REPLACE_FPURGE=0;
+  REPLACE_FREOPEN=0;
+  REPLACE_FSEEK=0;
+  REPLACE_FSEEKO=0;
+  REPLACE_FTELL=0;
+  REPLACE_FTELLO=0;
+  REPLACE_GETDELIM=0;
+  REPLACE_GETLINE=0;
+  REPLACE_OBSTACK_PRINTF=0;
+  REPLACE_PERROR=0;
+  REPLACE_POPEN=0;
+  REPLACE_PRINTF=0;
+  REPLACE_REMOVE=0;
+  REPLACE_RENAME=0;
+  REPLACE_RENAMEAT=0;
+  REPLACE_SNPRINTF=0;
+  REPLACE_SPRINTF=0;
+  REPLACE_STDIO_WRITE_FUNCS=0;
+  REPLACE_TMPFILE=0;
+  REPLACE_VASPRINTF=0;
+  REPLACE_VDPRINTF=0;
+  REPLACE_VFPRINTF=0;
+  REPLACE_VPRINTF=0;
+  REPLACE_VSNPRINTF=0;
+  REPLACE_VSPRINTF=0;
 ac_fn_c_check_member "$LINENO" "struct tm" "tm_gmtoff" "ac_cv_member_struct_tm_tm_gmtoff" "#include <time.h>
 "
 if test "x$ac_cv_member_struct_tm_tm_gmtoff" = x""yes; then :
@@ -16333,6 +16482,70 @@ $as_echo "#define READLINK_TRAILING_SLASH_BUG 1" >>confdefs.h
+  # Code from module socklen:
+     ac_fn_c_check_type "$LINENO" "socklen_t" "ac_cv_type_socklen_t" "
+/* <sys/types.h> is not needed according to POSIX, but the
+   <sys/socket.h> in i386-unknown-freebsd4.10 and
+   powerpc-apple-darwin5.5 required it. */
+#include <sys/types.h>
+#if HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
+#elif HAVE_WS2TCPIP_H
+# include <ws2tcpip.h>
+#endif
+"
+if test "x$ac_cv_type_socklen_t" = x""yes; then :
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socklen_t equivalent" >&5
+$as_echo_n "checking for socklen_t equivalent... " >&6; }
+      if test "${gl_cv_socklen_t_equiv+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  # Systems have either "struct sockaddr *" or
+         # "void *" as the second argument to getpeername
+         gl_cv_socklen_t_equiv=
+         for arg2 in "struct sockaddr" void; do
+           for t in int size_t "unsigned int" "long int" "unsigned long int"; do
+             cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+                   #include <sys/socket.h>
+                   int getpeername (int, $arg2 *, $t *);
+int
+main ()
+{
+$t len;
+                  getpeername (0, 0, &len);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  gl_cv_socklen_t_equiv="$t"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+             test "$gl_cv_socklen_t_equiv" != "" && break
+           done
+           test "$gl_cv_socklen_t_equiv" != "" && break
+         done
+fi
+      if test "$gl_cv_socklen_t_equiv" = ""; then
+        as_fn_error "Cannot find a type to use in place of socklen_t" "$LINENO" 5
+      fi
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_socklen_t_equiv" >&5
+$as_echo "$gl_cv_socklen_t_equiv" >&6; }
+cat >>confdefs.h <<_ACEOF
+#define socklen_t $gl_cv_socklen_t_equiv
+_ACEOF
+fi
  # Code from module stat:
@@ -17272,6 +17485,77 @@ _ACEOF
  fi
+  # Code from module stdio:
+     if test $gl_cv_have_include_next = yes; then
+       gl_cv_next_stdio_h='<'stdio.h'>'
+     else
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdio.h>" >&5
+$as_echo_n "checking absolute name of <stdio.h>... " >&6; }
+if test "${gl_cv_next_stdio_h+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdio.h>
+_ACEOF
+                                                                                                                        case "$host_os" in
+                 aix*) gl_absname_cpp="$ac_cpp -C" ;;
+                 *)    gl_absname_cpp="$ac_cpp" ;;
+               esac
+                                                            gl_cv_next_stdio_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+                  sed -n '\#/stdio.h#{
+                    s#.*"\(.*/stdio.h\)".*#\1#
+                    s#^/[^/]#//&#
+                    p
+                    q
+                  }'`'"'
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdio_h" >&5
+$as_echo "$gl_cv_next_stdio_h" >&6; }
+     fi
+     NEXT_STDIO_H=$gl_cv_next_stdio_h
+     if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
+       gl_next_as_first_directive='<'stdio.h'>'
+     else
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
+       gl_next_as_first_directive=$gl_cv_next_stdio_h
+     fi
+     NEXT_AS_FIRST_DIRECTIVE_STDIO_H=$gl_next_as_first_directive
+      GNULIB_FPRINTF=1
+  GNULIB_PRINTF=1
+  GNULIB_VFPRINTF=1
+  GNULIB_VPRINTF=1
+  GNULIB_FPUTC=1
+  GNULIB_PUTC=1
+  GNULIB_PUTCHAR=1
+  GNULIB_FPUTS=1
+  GNULIB_PUTS=1
+  GNULIB_FWRITE=1
  # Code from module stdlib:
diff --git a/autogen/copy_autogen b/autogen/copy_autogen
index 4abdbd87c0f..a0daf9f02e5 100755
--- a/autogen/copy_autogen
+++ b/autogen/copy_autogen
@@ -8,12 +8,18 @@
 ## regenerate configure and will fail if you do not have the required
 ## tools.  You will have to run this script again.
+test -d autogen && cd autogen
 if test ! -e config.in; then
-    echo "You must run this script from the autogen/ directory."
+    echo "Cannot find autogen/ directory."
    exit 1
 fi
-cp configure aclocal.m4 ../
+## Order implied by top-level Makefile's rules, for time-stamps.
+cp compile config.guess config.sub depcomp install-sh missing ../
+cp aclocal.m4 ../
+cp configure ../
+touch ../src/stamp-h.in
 cp config.in ../src/
 cp Makefile.in ../lib/
diff --git a/depcomp b/autogen/depcomp
index df8eea7e4ce..df8eea7e4ce 100755
--- a/depcomp
+++ b/autogen/depcomp
diff --git a/install-sh b/autogen/install-sh
index a9244eb0786..6781b987bdb 100755
--- a/install-sh
+++ b/autogen/install-sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
-scriptversion=2011-01-19.21; # UTC
+scriptversion=2009-04-28.21; # UTC
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -156,10 +156,6 @@ while test $# -ne 0; do
    -s) stripcmd=$stripprog;;
    -t) dst_arg=$2
-        # Protect names problematic for `test' and other utilities.
-        case $dst_arg in
-          -* | [=\(\)!]) dst_arg=./$dst_arg;;
-        esac
        shift;;
    -T) no_target_directory=true;;
@@ -190,10 +186,6 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
    fi
    shift # arg
    dst_arg=$arg
-    # Protect names problematic for `test' and other utilities.
-    case $dst_arg in
-      -* | [=\(\)!]) dst_arg=./$dst_arg;;
-    esac
  done
 fi
@@ -208,11 +200,7 @@ if test $# -eq 0; then
 fi
 if test -z "$dir_arg"; then
-  do_exit='(exit $ret); exit $ret'
+  trap '(exit $?); exit' 1 2 13 15
-  trap "ret=129; $do_exit" 1
-  trap "ret=130; $do_exit" 2
-  trap "ret=141; $do_exit" 13
-  trap "ret=143; $do_exit" 15
  # Set umask so as not to create temps with too-generous modes.
  # However, 'strip' requires both read and write access to temps.
@@ -240,9 +228,9 @@ fi
 for src
 do
-  # Protect names problematic for `test' and other utilities.
+  # Protect names starting with `-'.
  case $src in
-    -* | [=\(\)!]) src=./$src;;
+    -*) src=./$src;;
  esac
  if test -n "$dir_arg"; then
@@ -264,7 +252,12 @@ do
      echo "$0: no destination specified." >&2
      exit 1
    fi
    dst=$dst_arg
+    # Protect names starting with `-'.
+    case $dst in
+      -*) dst=./$dst;;
+    esac
    # If destination is a directory, append the input filename; won't work
    # if double slashes aren't ignored.
@@ -392,7 +385,7 @@ do
      case $dstdir in
        /*) prefix='/';;
-        [-=\(\)!]*) prefix='./';;
+        -*) prefix='./';;
        *)  prefix='';;
      esac
@@ -410,7 +403,7 @@ do
      for d
      do
-        test X"$d" = X && continue
+        test -z "$d" && continue
        prefix=$prefix$d
        if test -d "$prefix"; then
diff --git a/missing b/autogen/missing
index 28055d2ae6f..28055d2ae6f 100755
--- a/missing
+++ b/autogen/missing
diff --git a/autogen/update_autogen b/autogen/update_autogen
index 0b26dd27d2b..b2a6d0b42a4 100755
--- a/autogen/update_autogen
+++ b/autogen/update_autogen
@@ -28,7 +28,7 @@
 ### Code:
-function die ()                 # write error to stderr and exit
+die ()                 # write error to stderr and exit
 {
    [ $# -gt 0 ] && echo "$PN: $@" >&2
    exit 1
@@ -45,7 +45,7 @@ cd ../
 [ -d autogen ] || die "Could not locate autogen directory"
-function usage ()
+usage ()
 {
    cat 1>&2 <<EOF
 Usage: ${PN} [-f] [-c] [-q]
@@ -68,7 +68,7 @@ quiet=
 ## Parameters.
 sources="configure.in lib/Makefile.am"
-genfiles="configure aclocal.m4 src/config.in lib/Makefile.in"
+genfiles="configure aclocal.m4 src/config.in lib/Makefile.in compile config.guess config.sub depcomp install-sh missing"
 for g in $genfiles; do
    basegen="$basegen ${g##*/}"
@@ -104,14 +104,10 @@ OPTIND=1
 [ $# -eq 0 ] || die "Wrong number of arguments"
-function msg ()
+[ "$quiet" ] && exec 1> /dev/null
-{
-    [ "$quiet" ] && return 0
-    echo "$@"
-}                               # function msg
-msg "Running bzr status..."
+echo "Running bzr status..."
 bzr status -S $sources >| $tempfile || die "bzr status error for sources"
@@ -119,7 +115,7 @@ while read stat file; do
    case $stat in
        M)
-            msg "Locally modified: $file"
+            echo "Locally modified: $file"
            [ "$force" ] || die "There are local modifications"
            ;;
@@ -128,9 +124,20 @@ while read stat file; do
 done < $tempfile
-msg "Running autoreconf..."
+echo "Running autoreconf..."
+autoreconf -f -i -I m4 2>| $tempfile
+retval=$?
-autoreconf -I m4 || die "autoreconf error"
+## Annoyingly, autoreconf puts the "installing `./foo' messages on stderr.
+if [ "$quiet" ]; then
+    grep -v 'installing `\.' $tempfile 1>&2
+else
+    cat "$tempfile" 1>&2
+fi
+[ $retval -ne 0 ] && die "autoreconf error"
 cp $genfiles autogen/
@@ -138,6 +145,7 @@ cp $genfiles autogen/
 cd autogen
+echo "Checking status of generated files..."
 bzr status -S $basegen >| $tempfile || \
    die "bzr status error for generated files"
@@ -155,28 +163,25 @@ done < $tempfile
 [ "$modified" ] || {
-    msg "No files were modified"
+    echo "No files were modified"
    exit 0
 }
-msg "Modified file(s): $modified"
+echo "Modified file(s): $modified"
 [ "$commit" ] || exit 0
-msg "Committing..."
+echo "Committing..."
 ## bzr status output is annoyingly always relative to top-level, not PWD.
 cd ../
-opt=
+bzr commit -m "Auto-commit of generated files." $modified || \
-[ "$quiet" ] || opt=-q
-bzr commit $opt -m "Auto-commit of generated files." $modified || \
    die "bzr commit error"
-msg "Committed files: $modified"
+echo "Committed files: $modified"
 exit
diff --git a/config.bat b/config.bat
index 4288f6537e6..e480a4b9bc8 100644
--- a/config.bat
+++ b/config.bat
@@ -156,9 +156,9 @@ rm -f epaths.tmp
 rem   Create "config.h"
 rm -f config.h2 config.tmp
-sed -e '' config.in > config.tmp
+sed -e '' ../autogen/config.in > config.tmp
 if "%X11%" == "" goto src4
-sed -f ../msdos/sed2x.inp <config.in >config.tmp
+sed -f ../msdos/sed2x.inp < ..\autogen\config.in > config.tmp
 :src4
 sed -f ../msdos/sed2v2.inp <config.tmp >config.h2
 Rem See if DECL_ALIGN can be supported with this GCC
@@ -283,11 +283,12 @@ If Exist getopt.in.h update getopt.in.h getopt.in-h
 If Exist stdbool.in.h update stdbool.in.h stdbool.in-h
 If Exist stddef.in.h update stddef.in.h  stddef.in-h
 If Exist stdint.in.h update stdint.in.h  stdint.in-h
+If Exist stdio.in.h update stdio.in.h stdio.in-h
 If Exist stdlib.in.h update stdlib.in.h stdlib.in-h
 If Exist sys_stat.in.h update sys_stat.in.h sys_stat.in-h
 If Exist time.in.h update time.in.h time.in-h
 If Exist unistd.in.h update unistd.in.h unistd.in-h
-sed -f ../msdos/sedlibcf.inp < Makefile.in > makefile.tmp
+sed -f ../msdos/sedlibcf.inp < ..\autogen\Makefile.in > makefile.tmp
 sed -f ../msdos/sedlibmk.inp < makefile.tmp > Makefile
 rm -f makefile.tmp
 Rem Create .Po files for new files in lib/
diff --git a/configure.in b/configure.in
index b38aa976259..77deef8dba5 100644
--- a/configure.in
+++ b/configure.in
@@ -664,11 +664,11 @@ if test x"$GCC" != xyes && test x"$emacs_check_sunpro_c" = xyes && \
 test x"$CPP" = x; then
  AC_MSG_CHECKING([whether we are using a Sun C compiler])
  AC_CACHE_VAL(emacs_cv_sunpro_c,
-  [AC_TRY_LINK([],
+  [AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],
-[#ifndef __SUNPRO_C
+[[#ifndef __SUNPRO_C
 fail;
 #endif
-], emacs_cv_sunpro_c=yes, emacs_cv_sunpro_c=no)])
+]])], emacs_cv_sunpro_c=yes, emacs_cv_sunpro_c=no)])
  AC_MSG_RESULT($emacs_cv_sunpro_c)
  if test x"$emacs_cv_sunpro_c" = xyes; then
@@ -703,7 +703,7 @@ fi
 AC_MSG_CHECKING([whether gcc understands -Wdeclaration-after-statement])
 SAVE_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -Wdeclaration-after-statement"
-AC_TRY_COMPILE([], [], has_option=yes, has_option=no,)
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])], has_option=yes, has_option=no)
 if test $has_option = yes; then
   C_WARNINGS_SWITCH="-Wdeclaration-after-statement $C_WARNINGS_SWITCH"
 fi
@@ -717,7 +717,7 @@ unset SAVE_CFLAGS
 AC_MSG_CHECKING([whether gcc understands -Wold-style-definition])
 SAVE_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -Wold-style-definition"
-AC_TRY_COMPILE([], [], has_option=yes, has_option=no,)
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])], has_option=yes, has_option=no)
 if test $has_option = yes; then
   C_WARNINGS_SWITCH="-Wold-style-definition $C_WARNINGS_SWITCH"
 fi
@@ -730,7 +730,7 @@ unset SAVE_CFLAGS
 AC_MSG_CHECKING([whether gcc understands -Wimplicit-function-declaration])
 SAVE_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -Wimplicit-function-declaration"
-AC_TRY_COMPILE([], [], has_option=yes, has_option=no,)
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])], has_option=yes, has_option=no)
 if test $has_option = yes; then
   C_WARNINGS_SWITCH="-Wimplicit-function-declaration $C_WARNINGS_SWITCH"
 fi
@@ -1137,12 +1137,12 @@ if test "${with_sound}" != "no"; then
    SAVE_LDFLAGS="$LDFLAGS"
    CFLAGS="$ALSA_CFLAGS $CFLAGS"
    LDFLAGS="$ALSA_LIBS $LDFLAGS"
-    AC_TRY_COMPILE([#include <asoundlib.h>], [snd_lib_error_set_handler (0);],
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <asoundlib.h>]], [[snd_lib_error_set_handler (0);]])],
                    emacs_alsa_normal=yes,
                    emacs_alsa_normal=no)
    if test "$emacs_alsa_normal" != yes; then
-      AC_TRY_COMPILE([#include <alsa/asoundlib.h>],
+      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <alsa/asoundlib.h>]],
-                     [snd_lib_error_set_handler (0);],
+                     [[snd_lib_error_set_handler (0);]])],
                     emacs_alsa_subdir=yes,
                     emacs_alsa_subdir=no)
      if test "$emacs_alsa_subdir" != yes; then
@@ -1181,7 +1181,7 @@ AC_CHECK_HEADERS(sys/select.h sys/time.h unistd.h utime.h \
  sys/utsname.h pwd.h utmp.h dirent.h util.h)
 AC_MSG_CHECKING(if personality LINUX32 can be set)
-AC_TRY_COMPILE([#include <sys/personality.h>], [personality (PER_LINUX32)],
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/personality.h>]], [[personality (PER_LINUX32)]])],
               emacs_cv_personality_linux32=yes,
               emacs_cv_personality_linux32=no)
 AC_MSG_RESULT($emacs_cv_personality_linux32)
@@ -1209,7 +1209,7 @@ AC_HEADER_SYS_WAIT
 dnl Some systems have utime.h but don't declare the struct anyplace.
 AC_CACHE_CHECK(for struct utimbuf, emacs_cv_struct_utimbuf,
-AC_TRY_COMPILE([#ifdef TIME_WITH_SYS_TIME
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
 #include <time.h>
 #else
@@ -1221,18 +1221,15 @@ AC_TRY_COMPILE([#ifdef TIME_WITH_SYS_TIME
 #endif
 #ifdef HAVE_UTIME_H
 #include <utime.h>
-#endif], [static struct utimbuf x; x.actime = x.modtime;],
+#endif]], [[static struct utimbuf x; x.actime = x.modtime;]])],
  emacs_cv_struct_utimbuf=yes, emacs_cv_struct_utimbuf=no))
 if test $emacs_cv_struct_utimbuf = yes; then
  AC_DEFINE(HAVE_STRUCT_UTIMBUF, 1, [Define to 1 if `struct utimbuf' is declared by <utime.h>.])
 fi
-dnl checks for typedefs
-AC_TYPE_SIGNAL
 dnl Check for speed_t typedef.
 AC_CACHE_CHECK(for speed_t, emacs_cv_speed_t,
-  [AC_TRY_COMPILE([#include <termios.h>], [speed_t x = 1;],
+  [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <termios.h>]], [[speed_t x = 1;]])],
    emacs_cv_speed_t=yes, emacs_cv_speed_t=no)])
 if test $emacs_cv_speed_t = yes; then
  AC_DEFINE(HAVE_SPEED_T, 1,
@@ -1240,7 +1237,7 @@ if test $emacs_cv_speed_t = yes; then
 fi
 AC_CACHE_CHECK(for struct timeval, emacs_cv_struct_timeval,
-AC_TRY_COMPILE([#ifdef TIME_WITH_SYS_TIME
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
 #include <time.h>
 #else
@@ -1249,7 +1246,7 @@ AC_TRY_COMPILE([#ifdef TIME_WITH_SYS_TIME
 #else
 #include <time.h>
 #endif
-#endif], [static struct timeval x; x.tv_sec = x.tv_usec;],
+#endif]], [[static struct timeval x; x.tv_sec = x.tv_usec;]])],
  emacs_cv_struct_timeval=yes, emacs_cv_struct_timeval=no))
 HAVE_TIMEVAL=$emacs_cv_struct_timeval
 if test $emacs_cv_struct_timeval = yes; then
@@ -1257,15 +1254,14 @@ if test $emacs_cv_struct_timeval = yes; then
 fi
 AC_CACHE_CHECK(for struct exception, emacs_cv_struct_exception,
-AC_TRY_COMPILE([#include <math.h>],
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <math.h>]],
-[static struct exception x; x.arg1 = x.arg2 = x.retval; x.name = ""; x.type = 1;],
+[[static struct exception x; x.arg1 = x.arg2 = x.retval; x.name = ""; x.type = 1;]])],
  emacs_cv_struct_exception=yes, emacs_cv_struct_exception=no))
 HAVE_EXCEPTION=$emacs_cv_struct_exception
 if test $emacs_cv_struct_exception != yes; then
  AC_DEFINE(NO_MATHERR, 1, [Define to 1 if you don't have struct exception in math.h.])
 fi
-AC_CHECK_HEADERS(sys/socket.h)
 AC_CHECK_HEADERS(net/if.h, , , [AC_INCLUDES_DEFAULT
 #if HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
@@ -1302,7 +1298,7 @@ dnl This isn't useful because we can't turn on use of `inline' unless
 dnl the compiler groks `extern inline'.
 dnl AC_C_INLINE
 AC_CACHE_CHECK([for void * support], emacs_cv_void_star,
-  [AC_TRY_COMPILE(, [void * foo;],
+  [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [[void * foo;]])],
                   emacs_cv_void_star=yes, emacs_cv_void_star=no)])
 if test $emacs_cv_void_star = yes; then
  AC_DEFINE(POINTER_TYPE, void)
@@ -1350,7 +1346,7 @@ if test "$GCC" = yes && test "$ac_enable_autodepend" = yes; then
      AC_MSG_CHECKING([whether gcc understands -MMD -MF])
      SAVE_CFLAGS="$CFLAGS"
      CFLAGS="$CFLAGS -MMD -MF deps.d"
-      AC_TRY_COMPILE([], [], , ac_enable_autodepend=no)
+      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])], , ac_enable_autodepend=no)
      CFLAGS="$SAVE_CFLAGS"
      test -f deps.d || ac_enable_autodepend=no
      rm -rf deps.d
@@ -1360,7 +1356,7 @@ if test "$GCC" = yes && test "$ac_enable_autodepend" = yes; then
      DEPFLAGS='-MMD -MF ${DEPDIR}/$*.d'
      ## In parallel builds, another make might create depdir between
      ## the first test and mkdir, so stick another test on the end.
-      ## Or use mkinstalldirs?  mkdir -p is not portable.
+      ## Or use install-sh -d?  mkdir -p is not portable.
      MKDEPDIR='test -d ${DEPDIR} || mkdir ${DEPDIR} || test -d ${DEPDIR}'
      deps_frag=autodeps.mk
   fi
@@ -1583,7 +1579,7 @@ AC_CHECK_FUNC(malloc_get_state, ,doug_lea_malloc=no)
 AC_CHECK_FUNC(malloc_set_state, ,doug_lea_malloc=no)
 AC_CACHE_CHECK(whether __after_morecore_hook exists,
               emacs_cv_var___after_morecore_hook,
-[AC_TRY_LINK([extern void (* __after_morecore_hook)();],[__after_morecore_hook = 0],
+[AC_LINK_IFELSE([AC_LANG_PROGRAM([[extern void (* __after_morecore_hook)();]],[[__after_morecore_hook = 0]])],
  emacs_cv_var___after_morecore_hook=yes,
  emacs_cv_var___after_morecore_hook=no)])
 if test $emacs_cv_var___after_morecore_hook = no; then
@@ -1681,7 +1677,7 @@ aix*)
    esac
    LDFLAGS=$LDFLAGS\ $gdb_cv_bigtoc
-    AC_TRY_LINK([], [int i;], [], [gdb_cv_bigtoc=])
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[int i;]])], [], [gdb_cv_bigtoc=])
  ])
  ;;
 esac
@@ -1711,8 +1707,8 @@ if test "${HAVE_X11}" = "yes"; then
  if test "${opsys}" = "gnu-linux"; then
    AC_MSG_CHECKING(whether X on GNU/Linux needs -b to link)
-    AC_TRY_LINK([],
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],
-     [XOpenDisplay ("foo");],
+     [[XOpenDisplay ("foo");]])],
     [xlinux_first_failure=no],
     [xlinux_first_failure=yes])
    if test "${xlinux_first_failure}" = "yes"; then
@@ -1724,8 +1720,8 @@ if test "${HAVE_X11}" = "yes"; then
      C_SWITCH_X_SITE="$C_SWITCH_X_SITE -b i486-linuxaout"
      CPPFLAGS="$CPPFLAGS -b i486-linuxaout"
      LIBS="$LIBS -b i486-linuxaout"
-      AC_TRY_LINK([],
+      AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],
-       [XOpenDisplay ("foo");],
+       [[XOpenDisplay ("foo");]])],
       [xlinux_second_failure=no],
       [xlinux_second_failure=yes])
      if test "${xlinux_second_failure}" = "yes"; then
@@ -1747,9 +1743,9 @@ if test "${HAVE_X11}" = "yes"; then
  # Reportedly, some broken Solaris systems have XKBlib.h but are missing
  # header files included from there.
  AC_MSG_CHECKING(for Xkb)
-  AC_TRY_LINK([#include <X11/Xlib.h>
+  AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>
-#include <X11/XKBlib.h>],
+#include <X11/XKBlib.h>]],
-        [XkbDescPtr kb = XkbGetKeyboard (0, XkbAllComponentsMask, XkbUseCoreKbd);],
+        [[XkbDescPtr kb = XkbGetKeyboard (0, XkbAllComponentsMask, XkbUseCoreKbd);]])],
        emacs_xkb=yes, emacs_xkb=no)
  AC_MSG_RESULT($emacs_xkb)
  if test $emacs_xkb = yes; then
@@ -1763,11 +1759,11 @@ fi
 if test "${window_system}" = "x11"; then
  AC_MSG_CHECKING(X11 version 6)
  AC_CACHE_VAL(emacs_cv_x11_version_6,
-  [AC_TRY_LINK([#include <X11/Xlib.h>],
+  [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>]],
-[#if XlibSpecificationRelease < 6
+[[#if XlibSpecificationRelease < 6
 fail;
 #endif
-], emacs_cv_x11_version_6=yes, emacs_cv_x11_version_6=no)])
+]])], emacs_cv_x11_version_6=yes, emacs_cv_x11_version_6=no)])
  if test $emacs_cv_x11_version_6 = yes; then
    AC_MSG_RESULT(6 or newer)
    AC_DEFINE(HAVE_X11R6, 1,
@@ -1990,10 +1986,10 @@ if test x"${USE_X_TOOLKIT}" = xmaybe || test x"${USE_X_TOOLKIT}" = xLUCID; then
  if test "$with_xaw3d" != no; then
    AC_MSG_CHECKING(for xaw3d)
    AC_CACHE_VAL(emacs_cv_xaw3d,
-    [AC_TRY_LINK([
+    [AC_LINK_IFELSE([AC_LANG_PROGRAM([[
 #include <X11/Intrinsic.h>
-#include <X11/Xaw3d/Simple.h>],
+#include <X11/Xaw3d/Simple.h>]],
-      [],
+      [[]])],
      [AC_CHECK_LIB(Xaw3d, XawScrollbarSetThumb,
                    emacs_cv_xaw3d=yes, emacs_cv_xaw3d=no)],
      emacs_cv_xaw3d=no)])
@@ -2011,10 +2007,10 @@ if test x"${USE_X_TOOLKIT}" = xmaybe || test x"${USE_X_TOOLKIT}" = xLUCID; then
    AC_MSG_RESULT(no)
    AC_MSG_CHECKING(for libXaw)
    AC_CACHE_VAL(emacs_cv_xaw,
-    [AC_TRY_LINK([
+    [AC_LINK_IFELSE([AC_LANG_PROGRAM([[
 #include <X11/Intrinsic.h>
-#include <X11/Xaw/Simple.h>],
+#include <X11/Xaw/Simple.h>]],
-      [],
+      [[]])],
      emacs_cv_xaw=yes,
      emacs_cv_xaw=no)])
    if test $emacs_cv_xaw = yes; then
@@ -2036,11 +2032,11 @@ LIBXTR6=
 if test "${USE_X_TOOLKIT}" != "none"; then
  AC_MSG_CHECKING(X11 toolkit version)
  AC_CACHE_VAL(emacs_cv_x11_toolkit_version_6,
-  [AC_TRY_LINK([#include <X11/Intrinsic.h>],
+  [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <X11/Intrinsic.h>]],
-[#if XtSpecificationRelease < 6
+[[#if XtSpecificationRelease < 6
 fail;
 #endif
-], emacs_cv_x11_toolkit_version_6=yes, emacs_cv_x11_toolkit_version_6=no)])
+]])], emacs_cv_x11_toolkit_version_6=yes, emacs_cv_x11_toolkit_version_6=no)])
  HAVE_X11XTR6=$emacs_cv_x11_toolkit_version_6
  if test $emacs_cv_x11_toolkit_version_6 = yes; then
    AC_MSG_RESULT(6 or newer)
@@ -2089,12 +2085,12 @@ fi
 LIBXP=
 if test "${USE_X_TOOLKIT}" = "MOTIF"; then
  AC_CACHE_CHECK(for Motif version 2.1, emacs_cv_motif_version_2_1,
-  [AC_TRY_COMPILE([#include <Xm/Xm.h>],
+  [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <Xm/Xm.h>]],
-    [#if XmVERSION > 2 || (XmVERSION == 2 && XmREVISION >= 1)
+    [[#if XmVERSION > 2 || (XmVERSION == 2 && XmREVISION >= 1)
 int x = 5;
 #else
 Motif version prior to 2.1.
-#endif],
+#endif]])],
    emacs_cv_motif_version_2_1=yes, emacs_cv_motif_version_2_1=no)])
  if test $emacs_cv_motif_version_2_1 = yes; then
    AC_CHECK_LIB(Xp, XpCreateContext, LIBXP=-lXp)
@@ -2107,8 +2103,8 @@ Motif version prior to 2.1.
    OLD_CFLAGS=$CFLAGS
    CPPFLAGS="-I/usr/X11R6/LessTif/Motif1.2/include $CPPFLAGS"
    CFLAGS="-I/usr/X11R6/LessTif/Motif1.2/include $CFLAGS"
-    [AC_TRY_COMPILE([#include </usr/X11R6/LessTif/Motif1.2/include/Xm/Xm.h>],
+    [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include </usr/X11R6/LessTif/Motif1.2/include/Xm/Xm.h>]],
-      [int x = 5;],
+      [[int x = 5;]])],
      emacs_cv_lesstif=yes, emacs_cv_lesstif=no)])
    if test $emacs_cv_lesstif = yes; then
      # Make sure this -I option remains in CPPFLAGS after it is set
@@ -2152,10 +2148,10 @@ if test "${with_toolkit_scroll_bars}" != "no"; then
 fi
 dnl See if XIM is available.
-AC_TRY_COMPILE([
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
          #include <X11/Xlib.h>
-          #include <X11/Xresource.h>],
+          #include <X11/Xresource.h>]],
-         [XIMProc  callback;],
+         [[XIMProc  callback;]])],
         [HAVE_XIM=yes
         AC_DEFINE(HAVE_XIM, 1, [Define to 1 if XIM is available])],
         HAVE_XIM=no)
@@ -2173,10 +2169,10 @@ if test "${HAVE_XIM}" != "no"; then
  if test "$GCC" = yes; then
    CFLAGS="$CFLAGS --pedantic-errors"
  fi
-  AC_TRY_COMPILE([
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #include <X11/Xlib.h>
-#include <X11/Xresource.h>],
+#include <X11/Xresource.h>]],
-[Display *display;
+[[Display *display;
 XrmDatabase db;
 char *res_name;
 char *res_class;
@@ -2189,7 +2185,7 @@ extern Bool XRegisterIMInstantiateCallback(Display*, XrmDatabase, char*,
                                           char*, XIMProc, XPointer*);
 #endif
 (void)XRegisterIMInstantiateCallback(display, db, res_name, res_class, callback,
-   client_data);],
+   client_data);]])],
    [emacs_cv_arg6_star=yes])
  AH_TEMPLATE(XRegisterIMInstantiateCallback_arg6,
         [Define to the type of the 6th arg of XRegisterIMInstantiateCallback,
@@ -2541,8 +2537,8 @@ AC_SUBST(LIBXML2_CFLAGS)
 # If netdb.h doesn't declare h_errno, we must declare it by hand.
 AC_CACHE_CHECK(whether netdb declares h_errno,
               emacs_cv_netdb_declares_h_errno,
-[AC_TRY_LINK([#include <netdb.h>],
+[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <netdb.h>]],
-  [return h_errno;],
+  [[return h_errno;]])],
  emacs_cv_netdb_declares_h_errno=yes, emacs_cv_netdb_declares_h_errno=no)])
 if test $emacs_cv_netdb_declares_h_errno = yes; then
  AC_DEFINE(HAVE_H_ERRNO, 1, [Define to 1 if netdb.h declares h_errno.])
@@ -2723,11 +2719,11 @@ case "$opsys" in
  freebsd)
    AC_MSG_CHECKING([whether FreeBSD is new enough to use terminfo])
    AC_CACHE_VAL(emacs_cv_freebsd_terminfo,
-    [AC_TRY_LINK([#include <osreldate.h>],
+    [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <osreldate.h>]],
-[#if __FreeBSD_version < 400000
+[[#if __FreeBSD_version < 400000
 fail;
 #endif
-], emacs_cv_freebsd_terminfo=yes, emacs_cv_freebsd_terminfo=no)])
+]])], emacs_cv_freebsd_terminfo=yes, emacs_cv_freebsd_terminfo=no)])
    AC_MSG_RESULT($emacs_cv_freebsd_terminfo)
@@ -2777,19 +2773,19 @@ AC_SUBST(TERMCAP_OBJ)
 # Do we have res_init, for detecting changes in /etc/resolv.conf?
 resolv=no
-AC_TRY_LINK([#include <netinet/in.h>
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <netinet/in.h>
 #include <arpa/nameser.h>
-#include <resolv.h>],
+#include <resolv.h>]],
-    [return res_init();],
+    [[return res_init();]])],
    have_res_init=yes, have_res_init=no)
 if test "$have_res_init" = no; then
  OLIBS="$LIBS"
  LIBS="$LIBS -lresolv"
  AC_MSG_CHECKING(for res_init with -lresolv)
-  AC_TRY_LINK([#include <netinet/in.h>
+  AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <netinet/in.h>
 #include <arpa/nameser.h>
-#include <resolv.h>],
+#include <resolv.h>]],
-    [return res_init();],
+    [[return res_init();]])],
    have_res_init=yes, have_res_init=no)
  AC_MSG_RESULT($have_res_init)
  if test "$have_res_init" = yes ; then
@@ -2925,7 +2921,7 @@ AC_CHECK_LIB(intl, dgettext)
 AC_MSG_CHECKING(whether localtime caches TZ)
 AC_CACHE_VAL(emacs_cv_localtime_cache,
 [if test x$ac_cv_func_tzset = xyes; then
-AC_TRY_RUN([#include <time.h>
+AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <time.h>
 char TZ_GMT0[] = "TZ=GMT0";
 char TZ_PST8[] = "TZ=PST8";
 main()
@@ -2945,7 +2941,7 @@ main()
  if (localtime (&now)->tm_hour != hour_unset)
    exit (1);
  exit (0);
-}], emacs_cv_localtime_cache=no, emacs_cv_localtime_cache=yes,
+}]])], emacs_cv_localtime_cache=no, emacs_cv_localtime_cache=yes,
 [# If we have tzset, assume the worst when cross-compiling.
 emacs_cv_localtime_cache=yes])
 else
@@ -2964,7 +2960,7 @@ if test "x$HAVE_TIMEVAL" = xyes; then
  if test $ac_cv_func_gettimeofday = yes; then
    AC_CACHE_CHECK(whether gettimeofday can accept two arguments,
                   emacs_cv_gettimeofday_two_arguments,
-    [AC_TRY_COMPILE([
+    [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
 #include <time.h>
@@ -2974,9 +2970,9 @@ if test "x$HAVE_TIMEVAL" = xyes; then
 #else
 #include <time.h>
 #endif
-#endif],
+#endif]],
-      [struct timeval time;
+      [[struct timeval time;
-       gettimeofday (&time, 0);],
+       gettimeofday (&time, 0);]])],
      emacs_cv_gettimeofday_two_arguments=yes,
      emacs_cv_gettimeofday_two_arguments=no)])
    if test $emacs_cv_gettimeofday_two_arguments = no; then
@@ -3017,8 +3013,8 @@ AC_FUNC_FORK
 dnl Adapted from Haible's version.
 AC_CACHE_CHECK([for nl_langinfo and CODESET], emacs_cv_langinfo_codeset,
-  [AC_TRY_LINK([#include <langinfo.h>],
+  [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <langinfo.h>]],
-    [char* cs = nl_langinfo(CODESET);],
+    [[char* cs = nl_langinfo(CODESET);]])],
    emacs_cv_langinfo_codeset=yes,
    emacs_cv_langinfo_codeset=no)
  ])
@@ -3032,7 +3028,7 @@ AC_CHECK_TYPES(size_t)
 AC_TYPE_MBSTATE_T
 AC_CACHE_CHECK([for C restricted array declarations], emacs_cv_c_restrict_arr,
-  [AC_TRY_COMPILE([void fred (int x[__restrict]);], [],
+  [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[void fred (int x[__restrict]);]], [[]])],
                  emacs_cv_c_restrict_arr=yes, emacs_cv_c_restrict_arr=no)])
 if test "$emacs_cv_c_restrict_arr" = yes; then
  AC_DEFINE(__restrict_arr, __restrict,
@@ -3494,11 +3490,6 @@ AH_BOTTOM([
 #  define SYSTEM_PURESIZE_EXTRA 30000
 #endif
-/* SIGTYPE is the macro we actually use.  */
-#ifndef SIGTYPE
-#define SIGTYPE RETSIGTYPE
-#endif
 #ifdef emacs /* Don't do this for lib-src.  */
 /* Tell regex.c to use a type compatible with Emacs.  */
 #define RE_TRANSLATE_TYPE Lisp_Object
diff --git a/doc/emacs/Makefile.in b/doc/emacs/Makefile.in
index ae142dba6e6..aca17ce817d 100644
--- a/doc/emacs/Makefile.in
+++ b/doc/emacs/Makefile.in
@@ -111,7 +111,7 @@ EMACSSOURCES= \
 ## This seems pointless.  The info/ directory exists in both the
 ## repository and the release tarfiles.  We do not use any
-## equivalent of mkdir -p/mkinstalldirs, so this is not a general
+## equivalent of mkdir -p/install-sh -d, so this is not a general
 ## solution anyway.  The second test -d is for parallel builds.
 mkinfodir = @test -d ${infodir} || mkdir ${infodir} || test -d ${infodir}
diff --git a/doc/lispref/ChangeLog.trunk b/doc/lispref/ChangeLog.trunk
index c705aae4934..1eb3cfa2556 100644
--- a/doc/lispref/ChangeLog.trunk
+++ b/doc/lispref/ChangeLog.trunk
@@ -1,3 +1,8 @@
+2011-03-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+        * commands.texi (Command Overview): post-command-hook is not reset to
+        nil any more.
 2011-03-19  Stefan Monnier  <monnier@iro.umontreal.ca>
        * strings.texi (String Conversion): Don't mention
diff --git a/doc/lispref/commands.texi b/doc/lispref/commands.texi
index 4f8d554a68b..eb42ddb11a4 100644
--- a/doc/lispref/commands.texi
+++ b/doc/lispref/commands.texi
@@ -91,8 +91,9 @@ and also when the command loop is first entered.  At that time,
  Quitting is suppressed while running @code{pre-command-hook} and
 @code{post-command-hook}.  If an error happens while executing one of
-these hooks, it terminates execution of the hook, and clears the hook
+these hooks, it does not terminate execution of the hook; instead
-variable to @code{nil} so as to prevent an infinite loop of errors.
+the error is silenced and the function in which the error occurred
+is removed from the hook.
  A request coming into the Emacs server (@pxref{Emacs Server,,,
 emacs, The GNU Emacs Manual}) runs these two hooks just as a keyboard
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 50f0e4e45b9..1c29d2598a8 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
+2011-03-19  Antoine Levitt  <antoine.levitt@gmail.com>
+        * gnus.texi (Listing Groups): Document gnus-group-list-ticked
 2011-03-17  Jay Belanger  <jay.p.belanger@gmail.com>
        * calc.texi (Logarithmic Units): Update the function names.
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index b55452cfa82..9771392f0cc 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -3320,6 +3320,11 @@ List all groups with cached articles (@code{gnus-group-list-cached}).
 @findex gnus-group-list-dormant
 List all groups with dormant articles (@code{gnus-group-list-dormant}).
+@item A !
+@kindex A ! (Group)
+@findex gnus-group-list-ticked
+List all groups with ticked articles (@code{gnus-group-list-ticked}).
 @item A /
 @kindex A / (Group)
 @findex gnus-group-list-limit
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 53cd307e3cc..b4a3d6d6ae7 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2011-03-22  Sebastian Hermida  <sebas00@gmail.com>
+        * themes/misterioso-theme.el: New file.
 2011-03-16  Juanma Barranquero  <lekktu@gmail.com>
        * NEWS: Document warning about _emacs.
diff --git a/etc/NEWS b/etc/NEWS
index a7ec965e3d6..969b1cdcf5f 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -162,6 +162,9 @@ cannot be encoded by the `terminal-coding-system'.
 ** On graphical displays, the mode-line no longer ends in dashes.
+** On Nextstep/OSX, the menu bar can be hidden by customizing
+   ns-auto-hide-menu-bar.
 ** Basic SELinux support has been added.
 This requires Emacs to be linked with libselinux at build time.
@@ -745,7 +748,13 @@ sc.el, x-menu.el, rnews.el, rnewspost.el
 * Lisp changes in Emacs 24.1
+** pre/post-command-hook are not reset to nil upon error.
+Instead, the offending function is removed.
+** New low-level function run-hook-wrapped.
 ** byte-compile-disable-print-circle is obsolete.
+** deferred-action-list and deferred-action-function are obsolete.
 ** Removed the stack-trace-on-error variable.
 Also the debugger can now "continue" from an error, which means it will jump
 to the error handler as if the debugger had not been invoked instead of
diff --git a/etc/themes/misterioso-theme.el b/etc/themes/misterioso-theme.el
new file mode 100644
index 00000000000..864d31d9b09
--- /dev/null
+++ b/etc/themes/misterioso-theme.el
@@ -0,0 +1,110 @@
+;;; misterioso-theme.el --- Custom face theme for Emacs
+;; Copyright (C) 2011 Free Software Foundation, Inc.
+;; Author: Sebastian Hermida
+;; 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/>.
+;;; Code:
+(deftheme misterioso
+  "Theme for faces, using light colors on a dark gray background.")
+(let ((class '((class color) (min-colors 89))))
+  (custom-theme-set-faces
+   'misterioso
+   ;; Ensure sufficient contrast on 256-color xterms.
+   `(default ((((class color) (min-colors 4096))
+               (:background "#2d3743" :foreground "#e1e1e0"))
+              (,class
+               (:background "#3a3a3a" :foreground "#e1e1e0"))))
+   `(cursor ((,class (:background "#415160" :foreground "#415160"))))
+   ;; Highlighting faces
+   `(fringe ((,class (:background "#2e3748"))))
+   `(highlight ((,class (:background "#338f86" :foreground "#e1e1e0"))))
+   `(region ((,class (:background "#2d4948" :foreground "#e1e1e0"))))
+   `(isearch ((,class (:background "#fcffad" :foreground "#000000"))))
+   `(lazy-highlight ((,class (:background "#338f86"))))
+   `(trailing-whitespace ((,class (:background "#ff4242"))))
+   ;; Mode line faces
+   `(mode-line ((,class (:background "#212931" :foreground "#eeeeec"))))
+   `(mode-line-inactive
+     ((,class (:background "#878787" :foreground "#eeeeec"))))
+   `(header-line ((,class (:background "#e5e5e5" :foreground "#333333"))))
+   ;; Escape and prompt faces
+   `(minibuffer-prompt ((,class (:foreground "#729fcf" :weight bold))))
+   ;; Font lock faces
+   `(font-lock-builtin-face ((,class (:foreground "#23d7d7"))))
+   `(font-lock-comment-face ((,class (:foreground "#74af68"))))
+   `(font-lock-constant-face ((,class (:foreground "#008b8b"))))
+   `(font-lock-function-name-face
+     ((,class (:foreground "#00ede1" :weight bold))))
+   `(font-lock-keyword-face ((,class (:foreground "#ffad29" :weight bold))))
+   `(font-lock-string-face ((,class (:foreground "#e67128"))))
+   `(font-lock-type-face ((,class (:foreground "#34cae2"))))
+   `(font-lock-variable-name-face ((,class (:foreground "#dbdb95"))))
+   `(font-lock-warning-face ((,class (:foreground "#ff4242" :weight bold))))
+   ;; Buttons and links
+   `(button ((,class (:underline t))))
+   `(link ((,class (:foreground "#59e9ff" :underline t))))
+   `(link-visited ((,class (:foreground "#ed74cd" :underline t))))
+   ;; Gnus faces
+   `(gnus-group-news-1 ((,class (:foreground "#ff4242" :weight bold))))
+   `(gnus-group-news-1-low ((,class (:foreground "#ff4242"))))
+   `(gnus-group-news-2 ((,class (:foreground "#00ede1" :weight bold))))
+   `(gnus-group-news-2-low ((,class (:foreground "#00ede1"))))
+   `(gnus-group-news-3 ((,class (:foreground "#23d7d7" :weight bold))))
+   `(gnus-group-news-3-low ((,class (:foreground "#23d7d7"))))
+   `(gnus-group-news-4 ((,class (:foreground "#74af68" :weight bold))))
+   `(gnus-group-news-4-low ((,class (:foreground "#74af68"))))
+   `(gnus-group-news-5 ((,class (:foreground "#dbdb95" :weight bold))))
+   `(gnus-group-news-5-low ((,class (:foreground "#dbdb95"))))
+   `(gnus-group-news-low ((,class (:foreground "#008b8b"))))
+   `(gnus-group-mail-1 ((,class (:foreground "#ff4242" :weight bold))))
+   `(gnus-group-mail-1-low ((,class (:foreground "#ff4242"))))
+   `(gnus-group-mail-2 ((,class (:foreground "#00ede1" :weight bold))))
+   `(gnus-group-mail-2-low ((,class (:foreground "#00ede1"))))
+   `(gnus-group-mail-3 ((,class (:foreground "#23d7d7"  :weight bold))))
+   `(gnus-group-mail-3-low ((,class (:foreground "#23d7d7"))))
+   `(gnus-group-mail-low ((,class (:foreground "#008b8b"))))
+   `(gnus-header-content ((,class (:weight normal :foreground "#ffad29"))))
+   `(gnus-header-from ((,class (:foreground "#e67128" :weight bold))))
+   `(gnus-header-subject ((,class (:foreground "#dbdb95"))))
+   `(gnus-header-name ((,class (:foreground "#00ede1"))))
+   `(gnus-header-newsgroups ((,class (:foreground "#e67128"))))
+   ;; Message faces
+   `(message-header-name ((,class (:foreground "#ffad29" :weight bold))))
+   `(message-header-cc ((,class (:foreground "#e67128"))))
+   `(message-header-other ((,class (:foreground "#e67128"))))
+   `(message-header-subject ((,class (:foreground "#dbdb95"))))
+   `(message-header-to ((,class (:foreground "#00ede1"))))
+   `(message-cited-text ((,class (:foreground "#74af68"))))
+   `(message-separator ((,class (:foreground "#23d7d7"))))))
+(custom-theme-set-variables
+ 'misterioso
+ '(ansi-color-names-vector ["#2d3743" "#ff4242" "#74af68" "#dbdb95"
+                            "#34cae2" "#008b8b" "#00ede1" "#e1e1e0"]))
+(provide-theme 'misterioso)
+;; Local Variables:
+;; no-byte-compile: t
+;; End:
+;;; misterioso-theme.el  ends here
diff --git a/leim/ChangeLog b/leim/ChangeLog
index 7334fa991c9..08da90c2aa8 100644
--- a/leim/ChangeLog
+++ b/leim/ChangeLog
@@ -1,3 +1,7 @@
+2011-03-23  Glenn Morris  <rgm@gnu.org>
+        * Makefile.in (install): Use `install-sh -d' rather than mkinstalldirs.
 2011-02-28  Juanma Barranquero  <lekktu@gmail.com>
        * quail/ethiopic.el ("ethiopic"): Fix tpo in docstring.
diff --git a/leim/Makefile.in b/leim/Makefile.in
index 8c2baadf15f..531f0481f7a 100644
--- a/leim/Makefile.in
+++ b/leim/Makefile.in
@@ -220,7 +220,7 @@ MV_DIRS = for i in $$dir; do rm -fr `basename "$$i"` ; mv "$$i" . ; done
 install: all
        if [ ! -d ${INSTALLDIR} ] ; then \
-          umask 022; ${srcdir}/../mkinstalldirs ${INSTALLDIR}; \
+          umask 022; ${srcdir}/../install-sh -d ${INSTALLDIR}; \
        else true; fi
        if [ x`(cd ${INSTALLDIR} && /bin/pwd)` != x`(/bin/pwd)` ] ; then \
          rm -f ${INSTALLDIR}/leim-list.el; \
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index bd1a84cf0b9..5007995e14e 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,51 @@
+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-03  Drake Wilson  <drake@begriffli.ch>  (tiny change)
        * emacsclient.c (longopts): Add quiet.
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index d622233efb4..36366a4d2e7 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -235,13 +235,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 \
@@ -353,7 +353,7 @@ movemail.o: ${srcdir}/movemail.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 ${srcdir}/../lib/ignore-value.h ../src/config.h
+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
diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c
index 113b6fdfe40..7871a804997 100644
--- a/lib-src/ebrowse.c
+++ b/lib-src/ebrowse.c
@@ -378,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.  */
@@ -492,7 +492,7 @@ yyerror (const char *format, const char *s)
   available.  */
 static void *
-xmalloc (int nbytes)
+xmalloc (size_t nbytes)
 {
  void *p = malloc (nbytes);
  if (p == NULL)
@@ -507,7 +507,7 @@ xmalloc (int nbytes)
 /* Like realloc but print an error and exit if out of memory.  */
 static void *
-xrealloc (void *p, int sz)
+xrealloc (void *p, size_t sz)
 {
  p = realloc (p, sz);
  if (p == NULL)
@@ -2792,10 +2792,10 @@ parse_classname (void)
 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 ();
@@ -2811,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;
        }
@@ -2832,7 +2832,7 @@ operator_name (int *sc)
    }
  else
    {
-      int tokens_matched = 0;
+      size_t tokens_matched = 0;
      len = 20;
      if (len > id_size)
@@ -2853,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;
            }
@@ -3550,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)
@@ -3574,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.  */
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index abc9aee37c1..737a8d88586 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -1116,7 +1116,7 @@ socket_status (char *name)
 /* A signal handler that passes the signal to the Emacs process.
   Useful for SIGWINCH.  */
-static SIGTYPE
+static void
 pass_signal_to_emacs (int signalnum)
 {
  int old_errno = errno;
@@ -1131,7 +1131,7 @@ pass_signal_to_emacs (int signalnum)
 /* Signal handler for SIGCONT; notify the Emacs process that it can
   now resume our tty frame.  */
-static SIGTYPE
+static void
 handle_sigcont (int signalnum)
 {
  int old_errno = errno;
@@ -1157,7 +1157,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. */
-static SIGTYPE
+static void
 handle_sigtstp (int signalnum)
 {
  int old_errno = errno;
diff --git a/lib-src/etags.c b/lib-src/etags.c
index 385e4cc9721..a2cdf26abc7 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -3978,10 +3978,8 @@ Yacc_entries (FILE *inf)
 static void
 just_read_file (FILE *inf)
 {
-  register char *dummy;
+  while (!feof (inf))
+    readline (&lb, inf);
-  LOOP_ON_INPUT_LINES (inf, lb, dummy)
-    continue;
 }
@@ -4198,7 +4196,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;
@@ -5254,16 +5252,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;
+  size_t len;
-  int allocated;
+  size_t allocated;
  allocated = 0;
  len = 0;
@@ -5320,16 +5318,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;
+  size_t pos;
-  int len;
+  size_t len;
  pos = prolog_atom (s, 0);
-  if (pos < 1)
+  if (! pos)
    return 0;
  len = pos;
@@ -5339,7 +5337,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);
@@ -5351,17 +5349,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
+static size_t
-prolog_atom (char *s, int pos)
+prolog_atom (char *s, size_t pos)
 {
-  int origpos;
+  size_t origpos;
  origpos = pos;
@@ -5390,11 +5388,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
@@ -5403,7 +5401,7 @@ prolog_atom (char *s, int pos)
      return pos - origpos;
    }
  else
-    return -1;
+    return 0;
 }
diff --git a/lib-src/fakemail.c b/lib-src/fakemail.c
index 780a104b405..940d6219425 100644
--- a/lib-src/fakemail.c
+++ b/lib-src/fakemail.c
@@ -62,8 +62,6 @@ main ()
 /* This is to declare cuserid.  */
 #include <unistd.h>
-#include <ignore-value.h>
 /* Type definitions */
@@ -500,7 +498,7 @@ put_line (const char *string)
                }
            }
          /* Output that much, then break the line.  */
-          ignore_value (fwrite (s, 1, breakpos - s, rem->handle));
+          fwrite (s, 1, breakpos - s, rem->handle);
          column = 8;
          /* Skip whitespace and prepare to print more addresses.  */
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/update-game-score.c b/lib-src/update-game-score.c
index 70b79a64f91..e95e2ce259d 100644
--- a/lib-src/update-game-score.c
+++ b/lib-src/update-game-score.c
@@ -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
+     also increment the beginning of the array, to skip over the
-     *smallest* scores.  Otherwise, we just decrement the number of
+     *smallest* scores.  Otherwise, just decrementing the number of
-     scores, since the smallest will be at the end. */
+     scores suffices, since the smallest is at the end. */
  if (scorecount > MAX_SCORES)
-    scorecount -= (scorecount - MAX_SCORES);
+    {
-  if (reverse)
+      if (reverse)
-    scores += (scorecount - MAX_SCORES);
+        scores += (scorecount - MAX_SCORES);
+      scorecount = MAX_SCORES;
+    }
  if (write_scores (scorefile, scores, scorecount) < 0)
    {
      unlock_file (scorefile, lockstate);
diff --git a/lib/gnulib.mk b/lib/gnulib.mk
index cd6a1d00c15..030f95b7a68 100644
--- a/lib/gnulib.mk
+++ b/lib/gnulib.mk
@@ -9,7 +9,7 @@
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=. --makefile-name=gnulib.mk --no-libtool --macro-prefix=gl --no-vc-files crypto/md5 dtoastr filemode getloadavg getopt-gnu ignore-value intprops lstat mktime readlink strftime symlink sys_stat
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=. --makefile-name=gnulib.mk --no-libtool --macro-prefix=gl --no-vc-files crypto/md5 dtoastr filemode getloadavg getopt-gnu ignore-value intprops lstat mktime readlink socklen stdio strftime symlink sys_stat
 MOSTLYCLEANFILES += core *.stackdump
@@ -280,6 +280,117 @@ EXTRA_DIST += stdint.in.h
 ## end   gnulib module stdint
+## begin gnulib module stdio
+BUILT_SOURCES += stdio.h
+# We need the following in order to create <stdio.h> when the system
+# doesn't have one that works with the given compiler.
+stdio.h: stdio.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+        $(AM_V_GEN)rm -f $@-t $@ && \
+        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
+          sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+              -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+              -e 's|@''NEXT_STDIO_H''@|$(NEXT_STDIO_H)|g' \
+              -e 's|@''GNULIB_DPRINTF''@|$(GNULIB_DPRINTF)|g' \
+              -e 's|@''GNULIB_FCLOSE''@|$(GNULIB_FCLOSE)|g' \
+              -e 's|@''GNULIB_FFLUSH''@|$(GNULIB_FFLUSH)|g' \
+              -e 's|@''GNULIB_FOPEN''@|$(GNULIB_FOPEN)|g' \
+              -e 's|@''GNULIB_FPRINTF''@|$(GNULIB_FPRINTF)|g' \
+              -e 's|@''GNULIB_FPRINTF_POSIX''@|$(GNULIB_FPRINTF_POSIX)|g' \
+              -e 's|@''GNULIB_FPURGE''@|$(GNULIB_FPURGE)|g' \
+              -e 's|@''GNULIB_FPUTC''@|$(GNULIB_FPUTC)|g' \
+              -e 's|@''GNULIB_FPUTS''@|$(GNULIB_FPUTS)|g' \
+              -e 's|@''GNULIB_FREOPEN''@|$(GNULIB_FREOPEN)|g' \
+              -e 's|@''GNULIB_FSEEK''@|$(GNULIB_FSEEK)|g' \
+              -e 's|@''GNULIB_FSEEKO''@|$(GNULIB_FSEEKO)|g' \
+              -e 's|@''GNULIB_FTELL''@|$(GNULIB_FTELL)|g' \
+              -e 's|@''GNULIB_FTELLO''@|$(GNULIB_FTELLO)|g' \
+              -e 's|@''GNULIB_FWRITE''@|$(GNULIB_FWRITE)|g' \
+              -e 's|@''GNULIB_GETDELIM''@|$(GNULIB_GETDELIM)|g' \
+              -e 's|@''GNULIB_GETLINE''@|$(GNULIB_GETLINE)|g' \
+              -e 's|@''GNULIB_OBSTACK_PRINTF''@|$(GNULIB_OBSTACK_PRINTF)|g' \
+              -e 's|@''GNULIB_OBSTACK_PRINTF_POSIX''@|$(GNULIB_OBSTACK_PRINTF_POSIX)|g' \
+              -e 's|@''GNULIB_PERROR''@|$(GNULIB_PERROR)|g' \
+              -e 's|@''GNULIB_POPEN''@|$(GNULIB_POPEN)|g' \
+              -e 's|@''GNULIB_PRINTF''@|$(GNULIB_PRINTF)|g' \
+              -e 's|@''GNULIB_PRINTF_POSIX''@|$(GNULIB_PRINTF_POSIX)|g' \
+              -e 's|@''GNULIB_PUTC''@|$(GNULIB_PUTC)|g' \
+              -e 's|@''GNULIB_PUTCHAR''@|$(GNULIB_PUTCHAR)|g' \
+              -e 's|@''GNULIB_PUTS''@|$(GNULIB_PUTS)|g' \
+              -e 's|@''GNULIB_REMOVE''@|$(GNULIB_REMOVE)|g' \
+              -e 's|@''GNULIB_RENAME''@|$(GNULIB_RENAME)|g' \
+              -e 's|@''GNULIB_RENAMEAT''@|$(GNULIB_RENAMEAT)|g' \
+              -e 's|@''GNULIB_SNPRINTF''@|$(GNULIB_SNPRINTF)|g' \
+              -e 's|@''GNULIB_SPRINTF_POSIX''@|$(GNULIB_SPRINTF_POSIX)|g' \
+              -e 's|@''GNULIB_STDIO_H_SIGPIPE''@|$(GNULIB_STDIO_H_SIGPIPE)|g' \
+              -e 's|@''GNULIB_TMPFILE''@|$(GNULIB_TMPFILE)|g' \
+              -e 's|@''GNULIB_VASPRINTF''@|$(GNULIB_VASPRINTF)|g' \
+              -e 's|@''GNULIB_VDPRINTF''@|$(GNULIB_VDPRINTF)|g' \
+              -e 's|@''GNULIB_VFPRINTF''@|$(GNULIB_VFPRINTF)|g' \
+              -e 's|@''GNULIB_VFPRINTF_POSIX''@|$(GNULIB_VFPRINTF_POSIX)|g' \
+              -e 's|@''GNULIB_VPRINTF''@|$(GNULIB_VPRINTF)|g' \
+              -e 's|@''GNULIB_VPRINTF_POSIX''@|$(GNULIB_VPRINTF_POSIX)|g' \
+              -e 's|@''GNULIB_VSNPRINTF''@|$(GNULIB_VSNPRINTF)|g' \
+              -e 's|@''GNULIB_VSPRINTF_POSIX''@|$(GNULIB_VSPRINTF_POSIX)|g' \
+              < $(srcdir)/stdio.in.h | \
+          sed -e 's|@''HAVE_DECL_FPURGE''@|$(HAVE_DECL_FPURGE)|g' \
+              -e 's|@''HAVE_DECL_FSEEKO''@|$(HAVE_DECL_FSEEKO)|g' \
+              -e 's|@''HAVE_DECL_FTELLO''@|$(HAVE_DECL_FTELLO)|g' \
+              -e 's|@''HAVE_DECL_GETDELIM''@|$(HAVE_DECL_GETDELIM)|g' \
+              -e 's|@''HAVE_DECL_GETLINE''@|$(HAVE_DECL_GETLINE)|g' \
+              -e 's|@''HAVE_DECL_OBSTACK_PRINTF''@|$(HAVE_DECL_OBSTACK_PRINTF)|g' \
+              -e 's|@''HAVE_DECL_SNPRINTF''@|$(HAVE_DECL_SNPRINTF)|g' \
+              -e 's|@''HAVE_DECL_VSNPRINTF''@|$(HAVE_DECL_VSNPRINTF)|g' \
+              -e 's|@''HAVE_DPRINTF''@|$(HAVE_DPRINTF)|g' \
+              -e 's|@''HAVE_FSEEKO''@|$(HAVE_FSEEKO)|g' \
+              -e 's|@''HAVE_FTELLO''@|$(HAVE_FTELLO)|g' \
+              -e 's|@''HAVE_RENAMEAT''@|$(HAVE_RENAMEAT)|g' \
+              -e 's|@''HAVE_VASPRINTF''@|$(HAVE_VASPRINTF)|g' \
+              -e 's|@''HAVE_VDPRINTF''@|$(HAVE_VDPRINTF)|g' \
+              -e 's|@''REPLACE_DPRINTF''@|$(REPLACE_DPRINTF)|g' \
+              -e 's|@''REPLACE_FCLOSE''@|$(REPLACE_FCLOSE)|g' \
+              -e 's|@''REPLACE_FFLUSH''@|$(REPLACE_FFLUSH)|g' \
+              -e 's|@''REPLACE_FOPEN''@|$(REPLACE_FOPEN)|g' \
+              -e 's|@''REPLACE_FPRINTF''@|$(REPLACE_FPRINTF)|g' \
+              -e 's|@''REPLACE_FPURGE''@|$(REPLACE_FPURGE)|g' \
+              -e 's|@''REPLACE_FREOPEN''@|$(REPLACE_FREOPEN)|g' \
+              -e 's|@''REPLACE_FSEEK''@|$(REPLACE_FSEEK)|g' \
+              -e 's|@''REPLACE_FSEEKO''@|$(REPLACE_FSEEKO)|g' \
+              -e 's|@''REPLACE_FTELL''@|$(REPLACE_FTELL)|g' \
+              -e 's|@''REPLACE_FTELLO''@|$(REPLACE_FTELLO)|g' \
+              -e 's|@''REPLACE_GETDELIM''@|$(REPLACE_GETDELIM)|g' \
+              -e 's|@''REPLACE_GETLINE''@|$(REPLACE_GETLINE)|g' \
+              -e 's|@''REPLACE_OBSTACK_PRINTF''@|$(REPLACE_OBSTACK_PRINTF)|g' \
+              -e 's|@''REPLACE_PERROR''@|$(REPLACE_PERROR)|g' \
+              -e 's|@''REPLACE_POPEN''@|$(REPLACE_POPEN)|g' \
+              -e 's|@''REPLACE_PRINTF''@|$(REPLACE_PRINTF)|g' \
+              -e 's|@''REPLACE_REMOVE''@|$(REPLACE_REMOVE)|g' \
+              -e 's|@''REPLACE_RENAME''@|$(REPLACE_RENAME)|g' \
+              -e 's|@''REPLACE_RENAMEAT''@|$(REPLACE_RENAMEAT)|g' \
+              -e 's|@''REPLACE_SNPRINTF''@|$(REPLACE_SNPRINTF)|g' \
+              -e 's|@''REPLACE_SPRINTF''@|$(REPLACE_SPRINTF)|g' \
+              -e 's|@''REPLACE_STDIO_WRITE_FUNCS''@|$(REPLACE_STDIO_WRITE_FUNCS)|g' \
+              -e 's|@''REPLACE_TMPFILE''@|$(REPLACE_TMPFILE)|g' \
+              -e 's|@''REPLACE_VASPRINTF''@|$(REPLACE_VASPRINTF)|g' \
+              -e 's|@''REPLACE_VDPRINTF''@|$(REPLACE_VDPRINTF)|g' \
+              -e 's|@''REPLACE_VFPRINTF''@|$(REPLACE_VFPRINTF)|g' \
+              -e 's|@''REPLACE_VPRINTF''@|$(REPLACE_VPRINTF)|g' \
+              -e 's|@''REPLACE_VSNPRINTF''@|$(REPLACE_VSNPRINTF)|g' \
+              -e 's|@''REPLACE_VSPRINTF''@|$(REPLACE_VSPRINTF)|g' \
+              -e 's|@''ASM_SYMBOL_PREFIX''@|$(ASM_SYMBOL_PREFIX)|g' \
+              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+              -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \
+        } > $@-t && \
+        mv $@-t $@
+MOSTLYCLEANFILES += stdio.h stdio.h-t
+EXTRA_DIST += stdio.in.h
+## end   gnulib module stdio
 ## begin gnulib module stdlib
 BUILT_SOURCES += stdlib.h
diff --git a/lib/stdio.in.h b/lib/stdio.in.h
new file mode 100644
index 00000000000..dd31ce29ed1
--- /dev/null
+++ b/lib/stdio.in.h
@@ -0,0 +1,1119 @@
+/* A GNU-like <stdio.h>.
+   Copyright (C) 2004, 2007-2011 Free Software Foundation, Inc.
+   This program 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, or (at your option)
+   any later version.
+   This program 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 this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+#if __GNUC__ >= 3
+@PRAGMA_SYSTEM_HEADER@
+#endif
+@PRAGMA_COLUMNS@
+#if defined __need_FILE || defined __need___FILE || defined _GL_ALREADY_INCLUDING_STDIO_H
+/* Special invocation convention:
+   - Inside glibc header files.
+   - On OSF/1 5.1 we have a sequence of nested includes
+     <stdio.h> -> <getopt.h> -> <ctype.h> -> <sys/localedef.h> ->
+     <sys/lc_core.h> -> <nl_types.h> -> <mesg.h> -> <stdio.h>.
+     In this situation, the functions are not yet declared, therefore we cannot
+     provide the C++ aliases.  */
+#@INCLUDE_NEXT@ @NEXT_STDIO_H@
+#else
+/* Normal invocation convention.  */
+#ifndef _GL_STDIO_H
+#define _GL_ALREADY_INCLUDING_STDIO_H
+/* The include_next requires a split double-inclusion guard.  */
+#@INCLUDE_NEXT@ @NEXT_STDIO_H@
+#undef _GL_ALREADY_INCLUDING_STDIO_H
+#ifndef _GL_STDIO_H
+#define _GL_STDIO_H
+/* Get va_list.  Needed on many systems, including glibc 2.8.  */
+#include <stdarg.h>
+#include <stddef.h>
+/* Get off_t and ssize_t.  Needed on many systems, including glibc 2.8
+   and eglibc 2.11.2.  */
+#include <sys/types.h>
+/* The __attribute__ feature is available in gcc versions 2.5 and later.
+   The __-protected variants of the attributes 'format' and 'printf' are
+   accepted by gcc versions 2.6.4 (effectively 2.7) and later.
+   We enable _GL_ATTRIBUTE_FORMAT only if these are supported too, because
+   gnulib and libintl do '#define printf __printf__' when they override
+   the 'printf' function.  */
+#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
+# define _GL_ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec))
+#else
+# define _GL_ATTRIBUTE_FORMAT(spec) /* empty */
+#endif
+#define _GL_ATTRIBUTE_FORMAT_PRINTF(formatstring_parameter, first_argument) \
+  _GL_ATTRIBUTE_FORMAT ((__printf__, formatstring_parameter, first_argument))
+/* Solaris 10 declares renameat in <unistd.h>, not in <stdio.h>.  */
+/* But in any case avoid namespace pollution on glibc systems.  */
+#if (@GNULIB_RENAMEAT@ || defined GNULIB_POSIXCHECK) && defined __sun \
+    && ! defined __GLIBC__
+# include <unistd.h>
+#endif
+/* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
+/* The definition of _GL_ARG_NONNULL is copied here.  */
+/* The definition of _GL_WARN_ON_USE is copied here.  */
+/* Macros for stringification.  */
+#define _GL_STDIO_STRINGIZE(token) #token
+#define _GL_STDIO_MACROEXPAND_AND_STRINGIZE(token) _GL_STDIO_STRINGIZE(token)
+#if @GNULIB_DPRINTF@
+# if @REPLACE_DPRINTF@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   define dprintf rpl_dprintf
+#  endif
+_GL_FUNCDECL_RPL (dprintf, int, (int fd, const char *format, ...)
+                                _GL_ATTRIBUTE_FORMAT_PRINTF (2, 3)
+                                _GL_ARG_NONNULL ((2)));
+_GL_CXXALIAS_RPL (dprintf, int, (int fd, const char *format, ...));
+# else
+#  if !@HAVE_DPRINTF@
+_GL_FUNCDECL_SYS (dprintf, int, (int fd, const char *format, ...)
+                                _GL_ATTRIBUTE_FORMAT_PRINTF (2, 3)
+                                _GL_ARG_NONNULL ((2)));
+#  endif
+_GL_CXXALIAS_SYS (dprintf, int, (int fd, const char *format, ...));
+# endif
+_GL_CXXALIASWARN (dprintf);
+#elif defined GNULIB_POSIXCHECK
+# undef dprintf
+# if HAVE_RAW_DECL_DPRINTF
+_GL_WARN_ON_USE (dprintf, "dprintf is unportable - "
+                 "use gnulib module dprintf for portability");
+# endif
+#endif
+#if @GNULIB_FCLOSE@
+/* Close STREAM and its underlying file descriptor.  */
+# if @REPLACE_FCLOSE@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   define fclose rpl_fclose
+#  endif
+_GL_FUNCDECL_RPL (fclose, int, (FILE *stream) _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (fclose, int, (FILE *stream));
+# else
+_GL_CXXALIAS_SYS (fclose, int, (FILE *stream));
+# endif
+_GL_CXXALIASWARN (fclose);
+#elif defined GNULIB_POSIXCHECK
+# undef fclose
+/* Assume fclose is always declared.  */
+_GL_WARN_ON_USE (fclose, "fclose is not always POSIX compliant - "
+                 "use gnulib module fclose for portable POSIX compliance");
+#endif
+#if @GNULIB_FFLUSH@
+/* Flush all pending data on STREAM according to POSIX rules.  Both
+   output and seekable input streams are supported.
+   Note! LOSS OF DATA can occur if fflush is applied on an input stream
+   that is _not_seekable_ or on an update stream that is _not_seekable_
+   and in which the most recent operation was input.  Seekability can
+   be tested with lseek(fileno(fp),0,SEEK_CUR).  */
+# if @REPLACE_FFLUSH@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   define fflush rpl_fflush
+#  endif
+_GL_FUNCDECL_RPL (fflush, int, (FILE *gl_stream));
+_GL_CXXALIAS_RPL (fflush, int, (FILE *gl_stream));
+# else
+_GL_CXXALIAS_SYS (fflush, int, (FILE *gl_stream));
+# endif
+_GL_CXXALIASWARN (fflush);
+#elif defined GNULIB_POSIXCHECK
+# undef fflush
+/* Assume fflush is always declared.  */
+_GL_WARN_ON_USE (fflush, "fflush is not always POSIX compliant - "
+                 "use gnulib module fflush for portable POSIX compliance");
+#endif
+/* It is very rare that the developer ever has full control of stdin,
+   so any use of gets warrants an unconditional warning.  Assume it is
+   always declared, since it is required by C89.  */
+#undef gets
+_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+#if @GNULIB_FOPEN@
+# if @REPLACE_FOPEN@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef fopen
+#   define fopen rpl_fopen
+#  endif
+_GL_FUNCDECL_RPL (fopen, FILE *, (const char *filename, const char *mode)
+                                 _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_RPL (fopen, FILE *, (const char *filename, const char *mode));
+# else
+_GL_CXXALIAS_SYS (fopen, FILE *, (const char *filename, const char *mode));
+# endif
+_GL_CXXALIASWARN (fopen);
+#elif defined GNULIB_POSIXCHECK
+# undef fopen
+/* Assume fopen is always declared.  */
+_GL_WARN_ON_USE (fopen, "fopen on Win32 platforms is not POSIX compatible - "
+                 "use gnulib module fopen for portability");
+#endif
+#if @GNULIB_FPRINTF_POSIX@ || @GNULIB_FPRINTF@
+# if (@GNULIB_FPRINTF_POSIX@ && @REPLACE_FPRINTF@) \
+     || (@GNULIB_FPRINTF@ && @REPLACE_STDIO_WRITE_FUNCS@ && @GNULIB_STDIO_H_SIGPIPE@)
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   define fprintf rpl_fprintf
+#  endif
+#  define GNULIB_overrides_fprintf 1
+_GL_FUNCDECL_RPL (fprintf, int, (FILE *fp, const char *format, ...)
+                                _GL_ATTRIBUTE_FORMAT_PRINTF (2, 3)
+                                _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_RPL (fprintf, int, (FILE *fp, const char *format, ...));
+# else
+_GL_CXXALIAS_SYS (fprintf, int, (FILE *fp, const char *format, ...));
+# endif
+_GL_CXXALIASWARN (fprintf);
+#endif
+#if !@GNULIB_FPRINTF_POSIX@ && defined GNULIB_POSIXCHECK
+# if !GNULIB_overrides_fprintf
+#  undef fprintf
+# endif
+/* Assume fprintf is always declared.  */
+_GL_WARN_ON_USE (fprintf, "fprintf is not always POSIX compliant - "
+                 "use gnulib module fprintf-posix for portable "
+                 "POSIX compliance");
+#endif
+#if @GNULIB_FPURGE@
+/* Discard all pending buffered I/O data on STREAM.
+   STREAM must not be wide-character oriented.
+   When discarding pending output, the file position is set back to where it
+   was before the write calls.  When discarding pending input, the file
+   position is advanced to match the end of the previously read input.
+   Return 0 if successful.  Upon error, return -1 and set errno.  */
+# if @REPLACE_FPURGE@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   define fpurge rpl_fpurge
+#  endif
+_GL_FUNCDECL_RPL (fpurge, int, (FILE *gl_stream) _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (fpurge, int, (FILE *gl_stream));
+# else
+#  if !@HAVE_DECL_FPURGE@
+_GL_FUNCDECL_SYS (fpurge, int, (FILE *gl_stream) _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (fpurge, int, (FILE *gl_stream));
+# endif
+_GL_CXXALIASWARN (fpurge);
+#elif defined GNULIB_POSIXCHECK
+# undef fpurge
+# if HAVE_RAW_DECL_FPURGE
+_GL_WARN_ON_USE (fpurge, "fpurge is not always present - "
+                 "use gnulib module fpurge for portability");
+# endif
+#endif
+#if @GNULIB_FPUTC@
+# if @REPLACE_STDIO_WRITE_FUNCS@ && @GNULIB_STDIO_H_SIGPIPE@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef fputc
+#   define fputc rpl_fputc
+#  endif
+_GL_FUNCDECL_RPL (fputc, int, (int c, FILE *stream) _GL_ARG_NONNULL ((2)));
+_GL_CXXALIAS_RPL (fputc, int, (int c, FILE *stream));
+# else
+_GL_CXXALIAS_SYS (fputc, int, (int c, FILE *stream));
+# endif
+_GL_CXXALIASWARN (fputc);
+#endif
+#if @GNULIB_FPUTS@
+# if @REPLACE_STDIO_WRITE_FUNCS@ && @GNULIB_STDIO_H_SIGPIPE@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef fputs
+#   define fputs rpl_fputs
+#  endif
+_GL_FUNCDECL_RPL (fputs, int, (const char *string, FILE *stream)
+                              _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_RPL (fputs, int, (const char *string, FILE *stream));
+# else
+_GL_CXXALIAS_SYS (fputs, int, (const char *string, FILE *stream));
+# endif
+_GL_CXXALIASWARN (fputs);
+#endif
+#if @GNULIB_FREOPEN@
+# if @REPLACE_FREOPEN@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef freopen
+#   define freopen rpl_freopen
+#  endif
+_GL_FUNCDECL_RPL (freopen, FILE *,
+                  (const char *filename, const char *mode, FILE *stream)
+                  _GL_ARG_NONNULL ((2, 3)));
+_GL_CXXALIAS_RPL (freopen, FILE *,
+                  (const char *filename, const char *mode, FILE *stream));
+# else
+_GL_CXXALIAS_SYS (freopen, FILE *,
+                  (const char *filename, const char *mode, FILE *stream));
+# endif
+_GL_CXXALIASWARN (freopen);
+#elif defined GNULIB_POSIXCHECK
+# undef freopen
+/* Assume freopen is always declared.  */
+_GL_WARN_ON_USE (freopen,
+                 "freopen on Win32 platforms is not POSIX compatible - "
+                 "use gnulib module freopen for portability");
+#endif
+/* Set up the following warnings, based on which modules are in use.
+   GNU Coding Standards discourage the use of fseek, since it imposes
+   an arbitrary limitation on some 32-bit hosts.  Remember that the
+   fseek module depends on the fseeko module, so we only have three
+   cases to consider:
+   1. The developer is not using either module.  Issue a warning under
+   GNULIB_POSIXCHECK for both functions, to remind them that both
+   functions have bugs on some systems.  _GL_NO_LARGE_FILES has no
+   impact on this warning.
+   2. The developer is using both modules.  They may be unaware of the
+   arbitrary limitations of fseek, so issue a warning under
+   GNULIB_POSIXCHECK.  On the other hand, they may be using both
+   modules intentionally, so the developer can define
+   _GL_NO_LARGE_FILES in the compilation units where the use of fseek
+   is safe, to silence the warning.
+   3. The developer is using the fseeko module, but not fseek.  Gnulib
+   guarantees that fseek will still work around platform bugs in that
+   case, but we presume that the developer is aware of the pitfalls of
+   fseek and was trying to avoid it, so issue a warning even when
+   GNULIB_POSIXCHECK is undefined.  Again, _GL_NO_LARGE_FILES can be
+   defined to silence the warning in particular compilation units.
+   In C++ compilations with GNULIB_NAMESPACE, in order to avoid that
+   fseek gets defined as a macro, it is recommended that the developer
+   uses the fseek module, even if he is not calling the fseek function.
+   Most gnulib clients that perform stream operations should fall into
+   category 3.  */
+#if @GNULIB_FSEEK@
+# if defined GNULIB_POSIXCHECK && !defined _GL_NO_LARGE_FILES
+#  define _GL_FSEEK_WARN /* Category 2, above.  */
+#  undef fseek
+# endif
+# if @REPLACE_FSEEK@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef fseek
+#   define fseek rpl_fseek
+#  endif
+_GL_FUNCDECL_RPL (fseek, int, (FILE *fp, long offset, int whence)
+                              _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (fseek, int, (FILE *fp, long offset, int whence));
+# else
+_GL_CXXALIAS_SYS (fseek, int, (FILE *fp, long offset, int whence));
+# endif
+_GL_CXXALIASWARN (fseek);
+#endif
+#if @GNULIB_FSEEKO@
+# if !@GNULIB_FSEEK@ && !defined _GL_NO_LARGE_FILES
+#  define _GL_FSEEK_WARN /* Category 3, above.  */
+#  undef fseek
+# endif
+# if @REPLACE_FSEEKO@
+/* Provide an fseeko function that is aware of a preceding fflush(), and which
+   detects pipes.  */
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef fseeko
+#   define fseeko rpl_fseeko
+#  endif
+_GL_FUNCDECL_RPL (fseeko, int, (FILE *fp, off_t offset, int whence)
+                               _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (fseeko, int, (FILE *fp, off_t offset, int whence));
+# else
+#  if ! @HAVE_DECL_FSEEKO@
+_GL_FUNCDECL_SYS (fseeko, int, (FILE *fp, off_t offset, int whence)
+                               _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (fseeko, int, (FILE *fp, off_t offset, int whence));
+# endif
+_GL_CXXALIASWARN (fseeko);
+# if (@REPLACE_FSEEKO@ || !@HAVE_FSEEKO@) && !@GNULIB_FSEEK@
+   /* Provide an fseek function that is consistent with fseeko.  */
+   /* In order to avoid that fseek gets defined as a macro here, the
+      developer can request the 'fseek' module.  */
+#  if !GNULIB_defined_fseek_function
+#   undef fseek
+#   define fseek rpl_fseek
+static inline int _GL_ARG_NONNULL ((1))
+rpl_fseek (FILE *fp, long offset, int whence)
+{
+#   if @REPLACE_FSEEKO@
+  return rpl_fseeko (fp, offset, whence);
+#   else
+  return fseeko (fp, offset, whence);
+#   endif
+}
+#   define GNULIB_defined_fseek_function 1
+#  endif
+# endif
+#elif defined GNULIB_POSIXCHECK
+# define _GL_FSEEK_WARN /* Category 1, above.  */
+# undef fseek
+# undef fseeko
+# if HAVE_RAW_DECL_FSEEKO
+_GL_WARN_ON_USE (fseeko, "fseeko is unportable - "
+                 "use gnulib module fseeko for portability");
+# endif
+#endif
+#ifdef _GL_FSEEK_WARN
+# undef _GL_FSEEK_WARN
+/* Here, either fseek is undefined (but C89 guarantees that it is
+   declared), or it is defined as rpl_fseek (declared above).  */
+_GL_WARN_ON_USE (fseek, "fseek cannot handle files larger than 4 GB "
+                 "on 32-bit platforms - "
+                 "use fseeko function for handling of large files");
+#endif
+/* ftell, ftello.  See the comments on fseek/fseeko.  */
+#if @GNULIB_FTELL@
+# if defined GNULIB_POSIXCHECK && !defined _GL_NO_LARGE_FILES
+#  define _GL_FTELL_WARN /* Category 2, above.  */
+#  undef ftell
+# endif
+# if @REPLACE_FTELL@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef ftell
+#   define ftell rpl_ftell
+#  endif
+_GL_FUNCDECL_RPL (ftell, long, (FILE *fp) _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (ftell, long, (FILE *fp));
+# else
+_GL_CXXALIAS_SYS (ftell, long, (FILE *fp));
+# endif
+_GL_CXXALIASWARN (ftell);
+#endif
+#if @GNULIB_FTELLO@
+# if !@GNULIB_FTELL@ && !defined _GL_NO_LARGE_FILES
+#  define _GL_FTELL_WARN /* Category 3, above.  */
+#  undef ftell
+# endif
+# if @REPLACE_FTELLO@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef ftello
+#   define ftello rpl_ftello
+#  endif
+_GL_FUNCDECL_RPL (ftello, off_t, (FILE *fp) _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (ftello, off_t, (FILE *fp));
+# else
+#  if ! @HAVE_DECL_FTELLO@
+_GL_FUNCDECL_SYS (ftello, off_t, (FILE *fp) _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (ftello, off_t, (FILE *fp));
+# endif
+_GL_CXXALIASWARN (ftello);
+# if (@REPLACE_FTELLO@ || !@HAVE_FTELLO@) && !@GNULIB_FTELL@
+   /* Provide an ftell function that is consistent with ftello.  */
+   /* In order to avoid that ftell gets defined as a macro here, the
+      developer can request the 'ftell' module.  */
+#  if !GNULIB_defined_ftell_function
+#   undef ftell
+#   define ftell rpl_ftell
+static inline long _GL_ARG_NONNULL ((1))
+rpl_ftell (FILE *f)
+{
+#   if @REPLACE_FTELLO@
+  return rpl_ftello (f);
+#   else
+  return ftello (f);
+#   endif
+}
+#   define GNULIB_defined_ftell_function 1
+#  endif
+# endif
+#elif defined GNULIB_POSIXCHECK
+# define _GL_FTELL_WARN /* Category 1, above.  */
+# undef ftell
+# undef ftello
+# if HAVE_RAW_DECL_FTELLO
+_GL_WARN_ON_USE (ftello, "ftello is unportable - "
+                 "use gnulib module ftello for portability");
+# endif
+#endif
+#ifdef _GL_FTELL_WARN
+# undef _GL_FTELL_WARN
+/* Here, either ftell is undefined (but C89 guarantees that it is
+   declared), or it is defined as rpl_ftell (declared above).  */
+_GL_WARN_ON_USE (ftell, "ftell cannot handle files larger than 4 GB "
+                 "on 32-bit platforms - "
+                 "use ftello function for handling of large files");
+#endif
+#if @GNULIB_FWRITE@
+# if @REPLACE_STDIO_WRITE_FUNCS@ && @GNULIB_STDIO_H_SIGPIPE@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef fwrite
+#   define fwrite rpl_fwrite
+#  endif
+_GL_FUNCDECL_RPL (fwrite, size_t,
+                  (const void *ptr, size_t s, size_t n, FILE *stream)
+                  _GL_ARG_NONNULL ((1, 4)));
+_GL_CXXALIAS_RPL (fwrite, size_t,
+                  (const void *ptr, size_t s, size_t n, FILE *stream));
+# else
+_GL_CXXALIAS_SYS (fwrite, size_t,
+                  (const void *ptr, size_t s, size_t n, FILE *stream));
+/* Work around glibc bug 11959
+   <http://sources.redhat.com/bugzilla/show_bug.cgi?id=11959>,
+   which sometimes causes an unwanted diagnostic for fwrite calls.
+   This affects only function declaration attributes, so it's not
+   needed for C++.  */
+#  if !defined __cplusplus && 0 < __USE_FORTIFY_LEVEL
+static inline size_t _GL_ARG_NONNULL ((1, 4))
+rpl_fwrite (const void *ptr, size_t s, size_t n, FILE *stream)
+{
+  size_t r = fwrite (ptr, s, n, stream);
+  (void) r;
+  return r;
+}
+#   undef fwrite
+#   define fwrite rpl_fwrite
+#  endif
+# endif
+_GL_CXXALIASWARN (fwrite);
+#endif
+#if @GNULIB_GETDELIM@
+/* Read input, up to (and including) the next occurrence of DELIMITER, from
+   STREAM, store it in *LINEPTR (and NUL-terminate it).
+   *LINEPTR is a pointer returned from malloc (or NULL), pointing to *LINESIZE
+   bytes of space.  It is realloc'd as necessary.
+   Return the number of bytes read and stored at *LINEPTR (not including the
+   NUL terminator), or -1 on error or EOF.  */
+# if @REPLACE_GETDELIM@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef getdelim
+#   define getdelim rpl_getdelim
+#  endif
+_GL_FUNCDECL_RPL (getdelim, ssize_t,
+                  (char **lineptr, size_t *linesize, int delimiter,
+                   FILE *stream)
+                  _GL_ARG_NONNULL ((1, 2, 4)));
+_GL_CXXALIAS_RPL (getdelim, ssize_t,
+                  (char **lineptr, size_t *linesize, int delimiter,
+                   FILE *stream));
+# else
+#  if !@HAVE_DECL_GETDELIM@
+_GL_FUNCDECL_SYS (getdelim, ssize_t,
+                  (char **lineptr, size_t *linesize, int delimiter,
+                   FILE *stream)
+                  _GL_ARG_NONNULL ((1, 2, 4)));
+#  endif
+_GL_CXXALIAS_SYS (getdelim, ssize_t,
+                  (char **lineptr, size_t *linesize, int delimiter,
+                   FILE *stream));
+# endif
+_GL_CXXALIASWARN (getdelim);
+#elif defined GNULIB_POSIXCHECK
+# undef getdelim
+# if HAVE_RAW_DECL_GETDELIM
+_GL_WARN_ON_USE (getdelim, "getdelim is unportable - "
+                 "use gnulib module getdelim for portability");
+# endif
+#endif
+#if @GNULIB_GETLINE@
+/* Read a line, up to (and including) the next newline, from STREAM, store it
+   in *LINEPTR (and NUL-terminate it).
+   *LINEPTR is a pointer returned from malloc (or NULL), pointing to *LINESIZE
+   bytes of space.  It is realloc'd as necessary.
+   Return the number of bytes read and stored at *LINEPTR (not including the
+   NUL terminator), or -1 on error or EOF.  */
+# if @REPLACE_GETLINE@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef getline
+#   define getline rpl_getline
+#  endif
+_GL_FUNCDECL_RPL (getline, ssize_t,
+                  (char **lineptr, size_t *linesize, FILE *stream)
+                  _GL_ARG_NONNULL ((1, 2, 3)));
+_GL_CXXALIAS_RPL (getline, ssize_t,
+                  (char **lineptr, size_t *linesize, FILE *stream));
+# else
+#  if !@HAVE_DECL_GETLINE@
+_GL_FUNCDECL_SYS (getline, ssize_t,
+                  (char **lineptr, size_t *linesize, FILE *stream)
+                  _GL_ARG_NONNULL ((1, 2, 3)));
+#  endif
+_GL_CXXALIAS_SYS (getline, ssize_t,
+                  (char **lineptr, size_t *linesize, FILE *stream));
+# endif
+# if @HAVE_DECL_GETLINE@
+_GL_CXXALIASWARN (getline);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef getline
+# if HAVE_RAW_DECL_GETLINE
+_GL_WARN_ON_USE (getline, "getline is unportable - "
+                 "use gnulib module getline for portability");
+# endif
+#endif
+#if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@
+struct obstack;
+/* Grow an obstack with formatted output.  Return the number of
+   bytes added to OBS.  No trailing nul byte is added, and the
+   object should be closed with obstack_finish before use.  Upon
+   memory allocation error, call obstack_alloc_failed_handler.  Upon
+   other error, return -1.  */
+# if @REPLACE_OBSTACK_PRINTF@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   define obstack_printf rpl_obstack_printf
+#  endif
+_GL_FUNCDECL_RPL (obstack_printf, int,
+                  (struct obstack *obs, const char *format, ...)
+                  _GL_ATTRIBUTE_FORMAT_PRINTF (2, 3)
+                  _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_RPL (obstack_printf, int,
+                  (struct obstack *obs, const char *format, ...));
+# else
+#  if !@HAVE_DECL_OBSTACK_PRINTF@
+_GL_FUNCDECL_SYS (obstack_printf, int,
+                  (struct obstack *obs, const char *format, ...)
+                  _GL_ATTRIBUTE_FORMAT_PRINTF (2, 3)
+                  _GL_ARG_NONNULL ((1, 2)));
+#  endif
+_GL_CXXALIAS_SYS (obstack_printf, int,
+                  (struct obstack *obs, const char *format, ...));
+# endif
+_GL_CXXALIASWARN (obstack_printf);
+# if @REPLACE_OBSTACK_PRINTF@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   define obstack_vprintf rpl_obstack_vprintf
+#  endif
+_GL_FUNCDECL_RPL (obstack_vprintf, int,
+                  (struct obstack *obs, const char *format, va_list args)
+                  _GL_ATTRIBUTE_FORMAT_PRINTF (2, 0)
+                  _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_RPL (obstack_vprintf, int,
+                  (struct obstack *obs, const char *format, va_list args));
+# else
+#  if !@HAVE_DECL_OBSTACK_PRINTF@
+_GL_FUNCDECL_SYS (obstack_vprintf, int,
+                  (struct obstack *obs, const char *format, va_list args)
+                  _GL_ATTRIBUTE_FORMAT_PRINTF (2, 0)
+                  _GL_ARG_NONNULL ((1, 2)));
+#  endif
+_GL_CXXALIAS_SYS (obstack_vprintf, int,
+                  (struct obstack *obs, const char *format, va_list args));
+# endif
+_GL_CXXALIASWARN (obstack_vprintf);
+#endif
+#if @GNULIB_PERROR@
+/* Print a message to standard error, describing the value of ERRNO,
+   (if STRING is not NULL and not empty) prefixed with STRING and ": ",
+   and terminated with a newline.  */
+# if @REPLACE_PERROR@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   define perror rpl_perror
+#  endif
+_GL_FUNCDECL_RPL (perror, void, (const char *string));
+_GL_CXXALIAS_RPL (perror, void, (const char *string));
+# else
+_GL_CXXALIAS_SYS (perror, void, (const char *string));
+# endif
+_GL_CXXALIASWARN (perror);
+#elif defined GNULIB_POSIXCHECK
+# undef perror
+/* Assume perror is always declared.  */
+_GL_WARN_ON_USE (perror, "perror is not always POSIX compliant - "
+                 "use gnulib module perror for portability");
+#endif
+#if @GNULIB_POPEN@
+# if @REPLACE_POPEN@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef popen
+#   define popen rpl_popen
+#  endif
+_GL_FUNCDECL_RPL (popen, FILE *, (const char *cmd, const char *mode)
+                                 _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_RPL (popen, FILE *, (const char *cmd, const char *mode));
+# else
+_GL_CXXALIAS_SYS (popen, FILE *, (const char *cmd, const char *mode));
+# endif
+_GL_CXXALIASWARN (popen);
+#elif defined GNULIB_POSIXCHECK
+# undef popen
+# if HAVE_RAW_DECL_POPEN
+_GL_WARN_ON_USE (popen, "popen is buggy on some platforms - "
+                 "use gnulib module popen or pipe for more portability");
+# endif
+#endif
+#if @GNULIB_PRINTF_POSIX@ || @GNULIB_PRINTF@
+# if (@GNULIB_PRINTF_POSIX@ && @REPLACE_PRINTF@) \
+     || (@GNULIB_PRINTF@ && @REPLACE_STDIO_WRITE_FUNCS@ && @GNULIB_STDIO_H_SIGPIPE@)
+#  if defined __GNUC__
+#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+/* Don't break __attribute__((format(printf,M,N))).  */
+#    define printf __printf__
+#   endif
+_GL_FUNCDECL_RPL_1 (__printf__, int,
+                    (const char *format, ...)
+                    __asm__ (@ASM_SYMBOL_PREFIX@
+                             _GL_STDIO_MACROEXPAND_AND_STRINGIZE(rpl_printf))
+                    _GL_ATTRIBUTE_FORMAT_PRINTF (1, 2)
+                    _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL_1 (printf, __printf__, int, (const char *format, ...));
+#  else
+#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#    define printf rpl_printf
+#   endif
+_GL_FUNCDECL_RPL (printf, int,
+                  (const char *format, ...)
+                  _GL_ATTRIBUTE_FORMAT_PRINTF (1, 2)
+                  _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (printf, int, (const char *format, ...));
+#  endif
+#  define GNULIB_overrides_printf 1
+# else
+_GL_CXXALIAS_SYS (printf, int, (const char *format, ...));
+# endif
+_GL_CXXALIASWARN (printf);
+#endif
+#if !@GNULIB_PRINTF_POSIX@ && defined GNULIB_POSIXCHECK
+# if !GNULIB_overrides_printf
+#  undef printf
+# endif
+/* Assume printf is always declared.  */
+_GL_WARN_ON_USE (printf, "printf is not always POSIX compliant - "
+                 "use gnulib module printf-posix for portable "
+                 "POSIX compliance");
+#endif
+#if @GNULIB_PUTC@
+# if @REPLACE_STDIO_WRITE_FUNCS@ && @GNULIB_STDIO_H_SIGPIPE@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef putc
+#   define putc rpl_fputc
+#  endif
+_GL_FUNCDECL_RPL (fputc, int, (int c, FILE *stream) _GL_ARG_NONNULL ((2)));
+_GL_CXXALIAS_RPL_1 (putc, rpl_fputc, int, (int c, FILE *stream));
+# else
+_GL_CXXALIAS_SYS (putc, int, (int c, FILE *stream));
+# endif
+_GL_CXXALIASWARN (putc);
+#endif
+#if @GNULIB_PUTCHAR@
+# if @REPLACE_STDIO_WRITE_FUNCS@ && @GNULIB_STDIO_H_SIGPIPE@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef putchar
+#   define putchar rpl_putchar
+#  endif
+_GL_FUNCDECL_RPL (putchar, int, (int c));
+_GL_CXXALIAS_RPL (putchar, int, (int c));
+# else
+_GL_CXXALIAS_SYS (putchar, int, (int c));
+# endif
+_GL_CXXALIASWARN (putchar);
+#endif
+#if @GNULIB_PUTS@
+# if @REPLACE_STDIO_WRITE_FUNCS@ && @GNULIB_STDIO_H_SIGPIPE@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef puts
+#   define puts rpl_puts
+#  endif
+_GL_FUNCDECL_RPL (puts, int, (const char *string) _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (puts, int, (const char *string));
+# else
+_GL_CXXALIAS_SYS (puts, int, (const char *string));
+# endif
+_GL_CXXALIASWARN (puts);
+#endif
+#if @GNULIB_REMOVE@
+# if @REPLACE_REMOVE@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef remove
+#   define remove rpl_remove
+#  endif
+_GL_FUNCDECL_RPL (remove, int, (const char *name) _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (remove, int, (const char *name));
+# else
+_GL_CXXALIAS_SYS (remove, int, (const char *name));
+# endif
+_GL_CXXALIASWARN (remove);
+#elif defined GNULIB_POSIXCHECK
+# undef remove
+/* Assume remove is always declared.  */
+_GL_WARN_ON_USE (remove, "remove cannot handle directories on some platforms - "
+                 "use gnulib module remove for more portability");
+#endif
+#if @GNULIB_RENAME@
+# if @REPLACE_RENAME@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef rename
+#   define rename rpl_rename
+#  endif
+_GL_FUNCDECL_RPL (rename, int,
+                  (const char *old_filename, const char *new_filename)
+                  _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_RPL (rename, int,
+                  (const char *old_filename, const char *new_filename));
+# else
+_GL_CXXALIAS_SYS (rename, int,
+                  (const char *old_filename, const char *new_filename));
+# endif
+_GL_CXXALIASWARN (rename);
+#elif defined GNULIB_POSIXCHECK
+# undef rename
+/* Assume rename is always declared.  */
+_GL_WARN_ON_USE (rename, "rename is buggy on some platforms - "
+                 "use gnulib module rename for more portability");
+#endif
+#if @GNULIB_RENAMEAT@
+# if @REPLACE_RENAMEAT@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef renameat
+#   define renameat rpl_renameat
+#  endif
+_GL_FUNCDECL_RPL (renameat, int,
+                  (int fd1, char const *file1, int fd2, char const *file2)
+                  _GL_ARG_NONNULL ((2, 4)));
+_GL_CXXALIAS_RPL (renameat, int,
+                  (int fd1, char const *file1, int fd2, char const *file2));
+# else
+#  if !@HAVE_RENAMEAT@
+_GL_FUNCDECL_SYS (renameat, int,
+                  (int fd1, char const *file1, int fd2, char const *file2)
+                  _GL_ARG_NONNULL ((2, 4)));
+#  endif
+_GL_CXXALIAS_SYS (renameat, int,
+                  (int fd1, char const *file1, int fd2, char const *file2));
+# endif
+_GL_CXXALIASWARN (renameat);
+#elif defined GNULIB_POSIXCHECK
+# undef renameat
+# if HAVE_RAW_DECL_RENAMEAT
+_GL_WARN_ON_USE (renameat, "renameat is not portable - "
+                 "use gnulib module renameat for portability");
+# endif
+#endif
+#if @GNULIB_SNPRINTF@
+# if @REPLACE_SNPRINTF@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   define snprintf rpl_snprintf
+#  endif
+_GL_FUNCDECL_RPL (snprintf, int,
+                  (char *str, size_t size, const char *format, ...)
+                  _GL_ATTRIBUTE_FORMAT_PRINTF (3, 4)
+                  _GL_ARG_NONNULL ((3)));
+_GL_CXXALIAS_RPL (snprintf, int,
+                  (char *str, size_t size, const char *format, ...));
+# else
+#  if !@HAVE_DECL_SNPRINTF@
+_GL_FUNCDECL_SYS (snprintf, int,
+                  (char *str, size_t size, const char *format, ...)
+                  _GL_ATTRIBUTE_FORMAT_PRINTF (3, 4)
+                  _GL_ARG_NONNULL ((3)));
+#  endif
+_GL_CXXALIAS_SYS (snprintf, int,
+                  (char *str, size_t size, const char *format, ...));
+# endif
+_GL_CXXALIASWARN (snprintf);
+#elif defined GNULIB_POSIXCHECK
+# undef snprintf
+# if HAVE_RAW_DECL_SNPRINTF
+_GL_WARN_ON_USE (snprintf, "snprintf is unportable - "
+                 "use gnulib module snprintf for portability");
+# endif
+#endif
+/* Some people would argue that sprintf should be handled like gets
+   (for example, OpenBSD issues a link warning for both functions),
+   since both can cause security holes due to buffer overruns.
+   However, we believe that sprintf can be used safely, and is more
+   efficient than snprintf in those safe cases; and as proof of our
+   belief, we use sprintf in several gnulib modules.  So this header
+   intentionally avoids adding a warning to sprintf except when
+   GNULIB_POSIXCHECK is defined.  */
+#if @GNULIB_SPRINTF_POSIX@
+# if @REPLACE_SPRINTF@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   define sprintf rpl_sprintf
+#  endif
+_GL_FUNCDECL_RPL (sprintf, int, (char *str, const char *format, ...)
+                                _GL_ATTRIBUTE_FORMAT_PRINTF (2, 3)
+                                _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_RPL (sprintf, int, (char *str, const char *format, ...));
+# else
+_GL_CXXALIAS_SYS (sprintf, int, (char *str, const char *format, ...));
+# endif
+_GL_CXXALIASWARN (sprintf);
+#elif defined GNULIB_POSIXCHECK
+# undef sprintf
+/* Assume sprintf is always declared.  */
+_GL_WARN_ON_USE (sprintf, "sprintf is not always POSIX compliant - "
+                 "use gnulib module sprintf-posix for portable "
+                 "POSIX compliance");
+#endif
+#if @GNULIB_TMPFILE@
+# if @REPLACE_TMPFILE@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   define tmpfile rpl_tmpfile
+#  endif
+_GL_FUNCDECL_RPL (tmpfile, FILE *, (void));
+_GL_CXXALIAS_RPL (tmpfile, FILE *, (void));
+# else
+_GL_CXXALIAS_SYS (tmpfile, FILE *, (void));
+# endif
+_GL_CXXALIASWARN (tmpfile);
+#elif defined GNULIB_POSIXCHECK
+# undef tmpfile
+# if HAVE_RAW_DECL_TMPFILE
+_GL_WARN_ON_USE (tmpfile, "tmpfile is not usable on mingw - "
+                 "use gnulib module tmpfile for portability");
+# endif
+#endif
+#if @GNULIB_VASPRINTF@
+/* Write formatted output to a string dynamically allocated with malloc().
+   If the memory allocation succeeds, store the address of the string in
+   *RESULT and return the number of resulting bytes, excluding the trailing
+   NUL.  Upon memory allocation error, or some other error, return -1.  */
+# if @REPLACE_VASPRINTF@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   define asprintf rpl_asprintf
+#  endif
+_GL_FUNCDECL_RPL (asprintf, int,
+                  (char **result, const char *format, ...)
+                  _GL_ATTRIBUTE_FORMAT_PRINTF (2, 3)
+                  _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_RPL (asprintf, int,
+                  (char **result, const char *format, ...));
+# else
+#  if !@HAVE_VASPRINTF@
+_GL_FUNCDECL_SYS (asprintf, int,
+                  (char **result, const char *format, ...)
+                  _GL_ATTRIBUTE_FORMAT_PRINTF (2, 3)
+                  _GL_ARG_NONNULL ((1, 2)));
+#  endif
+_GL_CXXALIAS_SYS (asprintf, int,
+                  (char **result, const char *format, ...));
+# endif
+_GL_CXXALIASWARN (asprintf);
+# if @REPLACE_VASPRINTF@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   define vasprintf rpl_vasprintf
+#  endif
+_GL_FUNCDECL_RPL (vasprintf, int,
+                  (char **result, const char *format, va_list args)
+                  _GL_ATTRIBUTE_FORMAT_PRINTF (2, 0)
+                  _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_RPL (vasprintf, int,
+                  (char **result, const char *format, va_list args));
+# else
+#  if !@HAVE_VASPRINTF@
+_GL_FUNCDECL_SYS (vasprintf, int,
+                  (char **result, const char *format, va_list args)
+                  _GL_ATTRIBUTE_FORMAT_PRINTF (2, 0)
+                  _GL_ARG_NONNULL ((1, 2)));
+#  endif
+_GL_CXXALIAS_SYS (vasprintf, int,
+                  (char **result, const char *format, va_list args));
+# endif
+_GL_CXXALIASWARN (vasprintf);
+#endif
+#if @GNULIB_VDPRINTF@
+# if @REPLACE_VDPRINTF@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   define vdprintf rpl_vdprintf
+#  endif
+_GL_FUNCDECL_RPL (vdprintf, int, (int fd, const char *format, va_list args)
+                                 _GL_ATTRIBUTE_FORMAT_PRINTF (2, 0)
+                                 _GL_ARG_NONNULL ((2)));
+_GL_CXXALIAS_RPL (vdprintf, int, (int fd, const char *format, va_list args));
+# else
+#  if !@HAVE_VDPRINTF@
+_GL_FUNCDECL_SYS (vdprintf, int, (int fd, const char *format, va_list args)
+                                 _GL_ATTRIBUTE_FORMAT_PRINTF (2, 0)
+                                 _GL_ARG_NONNULL ((2)));
+#  endif
+/* Need to cast, because on Solaris, the third parameter will likely be
+                                                    __va_list args.  */
+_GL_CXXALIAS_SYS_CAST (vdprintf, int,
+                       (int fd, const char *format, va_list args));
+# endif
+_GL_CXXALIASWARN (vdprintf);
+#elif defined GNULIB_POSIXCHECK
+# undef vdprintf
+# if HAVE_RAW_DECL_VDPRINTF
+_GL_WARN_ON_USE (vdprintf, "vdprintf is unportable - "
+                 "use gnulib module vdprintf for portability");
+# endif
+#endif
+#if @GNULIB_VFPRINTF_POSIX@ || @GNULIB_VFPRINTF@
+# if (@GNULIB_VFPRINTF_POSIX@ && @REPLACE_VFPRINTF@) \
+     || (@GNULIB_VFPRINTF@ && @REPLACE_STDIO_WRITE_FUNCS@ && @GNULIB_STDIO_H_SIGPIPE@)
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   define vfprintf rpl_vfprintf
+#  endif
+#  define GNULIB_overrides_vfprintf 1
+_GL_FUNCDECL_RPL (vfprintf, int, (FILE *fp, const char *format, va_list args)
+                                 _GL_ATTRIBUTE_FORMAT_PRINTF (2, 0)
+                                 _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_RPL (vfprintf, int, (FILE *fp, const char *format, va_list args));
+# else
+/* Need to cast, because on Solaris, the third parameter is
+                                                      __va_list args
+   and GCC's fixincludes did not change this to __gnuc_va_list.  */
+_GL_CXXALIAS_SYS_CAST (vfprintf, int,
+                       (FILE *fp, const char *format, va_list args));
+# endif
+_GL_CXXALIASWARN (vfprintf);
+#endif
+#if !@GNULIB_VFPRINTF_POSIX@ && defined GNULIB_POSIXCHECK
+# if !GNULIB_overrides_vfprintf
+#  undef vfprintf
+# endif
+/* Assume vfprintf is always declared.  */
+_GL_WARN_ON_USE (vfprintf, "vfprintf is not always POSIX compliant - "
+                 "use gnulib module vfprintf-posix for portable "
+                      "POSIX compliance");
+#endif
+#if @GNULIB_VPRINTF_POSIX@ || @GNULIB_VPRINTF@
+# if (@GNULIB_VPRINTF_POSIX@ && @REPLACE_VPRINTF@) \
+     || (@GNULIB_VPRINTF@ && @REPLACE_STDIO_WRITE_FUNCS@ && @GNULIB_STDIO_H_SIGPIPE@)
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   define vprintf rpl_vprintf
+#  endif
+#  define GNULIB_overrides_vprintf 1
+_GL_FUNCDECL_RPL (vprintf, int, (const char *format, va_list args)
+                                _GL_ATTRIBUTE_FORMAT_PRINTF (1, 0)
+                                _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (vprintf, int, (const char *format, va_list args));
+# else
+/* Need to cast, because on Solaris, the second parameter is
+                                                          __va_list args
+   and GCC's fixincludes did not change this to __gnuc_va_list.  */
+_GL_CXXALIAS_SYS_CAST (vprintf, int, (const char *format, va_list args));
+# endif
+_GL_CXXALIASWARN (vprintf);
+#endif
+#if !@GNULIB_VPRINTF_POSIX@ && defined GNULIB_POSIXCHECK
+# if !GNULIB_overrides_vprintf
+#  undef vprintf
+# endif
+/* Assume vprintf is always declared.  */
+_GL_WARN_ON_USE (vprintf, "vprintf is not always POSIX compliant - "
+                 "use gnulib module vprintf-posix for portable "
+                 "POSIX compliance");
+#endif
+#if @GNULIB_VSNPRINTF@
+# if @REPLACE_VSNPRINTF@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   define vsnprintf rpl_vsnprintf
+#  endif
+_GL_FUNCDECL_RPL (vsnprintf, int,
+                  (char *str, size_t size, const char *format, va_list args)
+                  _GL_ATTRIBUTE_FORMAT_PRINTF (3, 0)
+                  _GL_ARG_NONNULL ((3)));
+_GL_CXXALIAS_RPL (vsnprintf, int,
+                  (char *str, size_t size, const char *format, va_list args));
+# else
+#  if !@HAVE_DECL_VSNPRINTF@
+_GL_FUNCDECL_SYS (vsnprintf, int,
+                  (char *str, size_t size, const char *format, va_list args)
+                  _GL_ATTRIBUTE_FORMAT_PRINTF (3, 0)
+                  _GL_ARG_NONNULL ((3)));
+#  endif
+_GL_CXXALIAS_SYS (vsnprintf, int,
+                  (char *str, size_t size, const char *format, va_list args));
+# endif
+_GL_CXXALIASWARN (vsnprintf);
+#elif defined GNULIB_POSIXCHECK
+# undef vsnprintf
+# if HAVE_RAW_DECL_VSNPRINTF
+_GL_WARN_ON_USE (vsnprintf, "vsnprintf is unportable - "
+                 "use gnulib module vsnprintf for portability");
+# endif
+#endif
+#if @GNULIB_VSPRINTF_POSIX@
+# if @REPLACE_VSPRINTF@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   define vsprintf rpl_vsprintf
+#  endif
+_GL_FUNCDECL_RPL (vsprintf, int,
+                  (char *str, const char *format, va_list args)
+                  _GL_ATTRIBUTE_FORMAT_PRINTF (2, 0)
+                  _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_RPL (vsprintf, int,
+                  (char *str, const char *format, va_list args));
+# else
+/* Need to cast, because on Solaris, the third parameter is
+                                                       __va_list args
+   and GCC's fixincludes did not change this to __gnuc_va_list.  */
+_GL_CXXALIAS_SYS_CAST (vsprintf, int,
+                       (char *str, const char *format, va_list args));
+# endif
+_GL_CXXALIASWARN (vsprintf);
+#elif defined GNULIB_POSIXCHECK
+# undef vsprintf
+/* Assume vsprintf is always declared.  */
+_GL_WARN_ON_USE (vsprintf, "vsprintf is not always POSIX compliant - "
+                 "use gnulib module vsprintf-posix for portable "
+                      "POSIX compliance");
+#endif
+#endif /* _GL_STDIO_H */
+#endif /* _GL_STDIO_H */
+#endif
diff --git a/lib/strftime.c b/lib/strftime.c
index 0a02b507744..acebc9adfad 100644
--- a/lib/strftime.c
+++ b/lib/strftime.c
@@ -172,15 +172,16 @@ extern char *tzname[];
 #define add(n, f)                                                             \
  do                                                                          \
    {                                                                         \
-      int _n = (n);                                                           \
+      size_t _n = (n);                                                        \
-      int _delta = width - _n;                                                \
+      size_t _w = (width < 0 ? 0 : width);                                    \
-      int _incr = _n + (_delta > 0 ? _delta : 0);                             \
+      size_t _incr = _n < _w ? _w : _n;                                       \
-      if ((size_t) _incr >= maxsize - i)                                      \
+      if (_incr >= maxsize - i)                                               \
        return 0;                                                             \
      if (p)                                                                  \
        {                                                                     \
-          if (digits == 0 && _delta > 0)                                      \
+          if (digits == 0 && _n < _w)                                         \
            {                                                                 \
+              size_t _delta = width - _n;                                     \
              if (pad == L_('0'))                                             \
                memset_zero (p, _delta);                                      \
              else                                                            \
diff --git a/lisp/ChangeLog.trunk b/lisp/ChangeLog.trunk
index d087982edee..7ce8b62b333 100644
--- a/lisp/ChangeLog.trunk
+++ b/lisp/ChangeLog.trunk
@@ -1,3 +1,154 @@
+2011-03-30  Leo Liu  <sdl.web@gmail.com>
+        * abbrev.el (abbrev-edit-save-to-file, abbrev-edit-save-buffer):
+        New commands.
+        (edit-abbrevs-map): Bind them here.
+        (write-abbrev-file): New optinal arg VERBOSE.  (Bug#5937)
+2011-03-29  Ken Manheimer  <ken.manheimer@gmail.com>
+        * allout.el (allout-hide-by-annotation, allout-flag-region):
+        Reduce possibility of overlay leakage by making them volatile.
+        * allout-widgets.el (allout-widgets-tally): Define as nil so the
+        hash is not shared between buffers.  Mode initialization is
+        responsible for giving it a useful starting value.
+        (allout-item-span): Reduce possibility of overlay leakage by
+        making them volatile.
+        (allout-widgets-count-buttons-in-region): Add diagnostic function
+        for tracking down button overlay leaks.
+2011-03-29  Leo Liu  <sdl.web@gmail.com>
+        * ido.el (ido-read-internal): Use the default history var
+        minibuffer-history if no HISTORY is specified.
+2011-03-28  Brian T. Sniffen  <bsniffen@akamai.com>  (tiny change)
+        * net/imap.el (imap-shell-open, imap-process-connection-type): Use
+        imap-process-connection-type for 'shell' streams as well as
+        Kerberos, SSL, other subprocesses.
+2011-03-28  Leo Liu  <sdl.web@gmail.com>
+        * abbrev.el (abbrev-table-empty-p): New function.
+        (prepare-abbrev-list-buffer): Place empty abbrev tables after
+        nonempty ones.  (Bug#5937)
+2011-03-27  Jan Djärv  <jan.h.d@swipnet.se>
+        * cus-start.el (all): Add boolean ns-auto-hide-menu-bar.
+2011-03-27  Leo Liu  <sdl.web@gmail.com>
+        * ansi-color.el (ansi-color-names-vector): Allow cons cell value
+        for foreground and background colors.
+        (ansi-color-make-color-map): Adapt.
+2011-03-25  Leo Liu  <sdl.web@gmail.com>
+        * midnight.el (midnight-time-float): Remove.  Note it calculates
+        the microsecond component incorrectly and seconds-to-time does the
+        same job.
+        Remove redundant (require 'timer).
+        * ido.el (ido-read-internal): Simplify with read-from-minibuffer.
+        (ido-completions): Remove unused arguments.  (Bug#8329)
+2011-03-24  Stefan Monnier  <monnier@iro.umontreal.ca>
+        * minibuffer.el (completion--flush-all-sorted-completions):
+        Remove itself from hook.
+        (completion-at-point): Let the functions perform the completion
+        immediately and return nil or t.
+        * comint.el (comint-dynamic-complete-functions): Now identical to
+        completion-at-point-functions.
+        (comint-dynamic-list-input-ring): Remove unused var `index'.
+        (comint--match-partial-filename, comint--unquote&expand-filename):
+        New funs, split from comint-match-partial-filename.
+        (comint-dynamic-complete): Use completion-at-point.
+        (comint-dynamic-complete-filename): Use comint--match-partial-filename.
+2011-03-24  Drew Adams  <drew.adams@oracle.com>
+        * thingatpt.el: Support `defun'.
+2011-03-23  Leo Liu  <sdl.web@gmail.com>
+        * abbrevlist.el: Move to obsolete/abbrevlist.el.
+        * help-mode.el (help-mode-finish): Tweak regexp.
+2011-03-23  Glenn Morris  <rgm@gnu.org>
+        * eshell/esh-opt.el (eshell-eval-using-options):
+        Do not bind unused local variable `eshell-option-stub'.
+        * progmodes/gdb-mi.el (gdb): Fix typo in previous change.
+2011-03-22  Juanma Barranquero  <lekktu@gmail.com>
+        * emacs-lisp/derived.el (define-derived-mode): Wrap declaration of
+        keymap variable in `with-no-warnings' to avoid a warning when the
+        keymap has been already `defconst'ed.
+2011-03-22  Leo Liu  <sdl.web@gmail.com>
+        * abbrev.el (write-abbrev-file): Use utf-8 for writing if it can
+        encode all chars in abbrevs; otherwise use emacs-mule or
+        utf-8-emacs.  (Bug#8308)
+2011-03-22  Juanma Barranquero  <lekktu@gmail.com>
+        * simple.el (backward-delete-char-untabify):
+        Avoid warning about using `delete-backward-char'.
+        * image.el (image-type-file-name-regexps): Make it variable.
+        `imagemagick-register-types' modifies it, and the user may want
+        to add new extensions for known image types.
+        (imagemagick-register-types): Throw error if not using ImageMagick.
+2011-03-22  Leo Liu  <sdl.web@gmail.com>
+        * net/rcirc.el (rcirc-completion-at-point): Return nil if point is
+        located before rcirc-prompt-end-marker.
+        (rcirc-complete): Error if point is not after rcirc prompt.
+        Handle the case when table is nil.
+        (rcirc-user-authenticated): Define to fix compiler warning.
+2011-03-22  Chong Yidong  <cyd@stupidchicken.com>
+        * custom.el (custom--inhibit-theme-enable): Make it affect only
+        custom-theme-set-variables and custom-theme-set-faces.
+        (provide-theme): Ignore custom--inhibit-theme-enable.
+        (load-theme): Enable the theme explicitly if NO-ENABLE is non-nil.
+        (custom-enabling-themes): Delete variable.
+        (enable-theme): Accept only loaded themes as arguments.
+        Ignore the special custom-enabled-themes variable.
+        (custom-enabled-themes): Forbid themes from setting this.
+        Eliminate use of custom-enabling-themes.
+        (custom-push-theme): Quote "changed" custom var entry.
+2011-03-21  Leo Liu  <sdl.web@gmail.com>
+        * ido.el (ido-read-internal): Add ido-selected to history instead
+        of user input.
+2011-03-21  Stefan Monnier  <monnier@iro.umontreal.ca>
+        * subr.el (deferred-action-list, deferred-action-function):
+        Mark obsolete.
+2011-03-21  Leo Liu  <sdl.web@gmail.com>
+        * vc/log-view.el: Remove (require 'wid-edit), not needed after the
+        change on 2011-02-13 (bug#8309).
+        * minibuffer.el (read-file-name-function): Change default value.
+        (read-file-name--defaults): Rename from read-file-name-defaults.
+        (read-file-name-default): Rename from read-file-name.
+        (read-file-name): Call read-file-name-function.
 2011-03-21  Glenn Morris  <rgm@gnu.org>
        * eshell/esh-opt.el (eshell-eval-using-options, eshell-process-args):
@@ -310,8 +461,8 @@
 2011-03-09  Michael Albinus  <michael.albinus@gmx.de>
-        * net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band): Do
+        * net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band):
-        not use `tramp-file-name-port', because this returns also
+        Do not use `tramp-file-name-port', because this returns also
        `tramp-default-port'.
 2011-03-09  Deniz Dogan  <deniz.a.m.dogan@gmail.com>
@@ -340,8 +491,8 @@
        * emacs-lisp/package.el (package-tar-file-info): Handle also
        remote files.
-        * emacs-lisp/package-x.el (package-upload-buffer-internal): Use
+        * emacs-lisp/package-x.el (package-upload-buffer-internal):
-        `equal' for upload base check.
+        Use `equal' for upload base check.
 2011-03-08  Arni Magnusson  <arnima@hafro.is>  (tiny change)
@@ -670,9 +821,9 @@
 2011-03-03  Christian Ohler  <ohler@gnu.org>
        * emacs-lisp/ert.el (ert--explain-equal): New function.
-        (ert--explain-equal-rec): Renamed from `ert--explain-not-equal'.
+        (ert--explain-equal-rec): Rename from `ert--explain-not-equal'.
        All callers changed.
-        (ert--explain-equal-including-properties): Renamed from
+        (ert--explain-equal-including-properties): Rename from
        `ert--explain-not-equal-including-properties'.  All callers
        changed.
@@ -8195,8 +8346,8 @@
        Sync with Tramp 2.1.19.
-        * net/tramp-gvfs.el (tramp-gvfs-handle-write-region): Protect
+        * net/tramp-gvfs.el (tramp-gvfs-handle-write-region):
-        deleting tmpfile.
+        Protect deleting tmpfile.
        (tramp-gvfs-maybe-open-connection): Use `tramp-compat-funcall'.
        * net/tramp.el (tramp-handle-expand-file-name)
@@ -10474,8 +10625,8 @@
        * net/tramp-ftp.el (tramp-ftp-file-name-handler):
        Use `delete-file' instead of `tramp-compat-delete-file'.
-        * net/tramp-gvfs.el (tramp-gvfs-handle-write-region): Use
+        * net/tramp-gvfs.el (tramp-gvfs-handle-write-region):
-        `delete-file' instead of `tramp-compat-delete-file'.
+        Use `delete-file' instead of `tramp-compat-delete-file'.
        * net/tramp-imap.el (tramp-imap-do-copy-or-rename-file):
        Use `delete-file' instead of `tramp-compat-delete-file'.
diff --git a/lisp/abbrev.el b/lisp/abbrev.el
index 3844391a180..b2cd2064da2 100644
--- a/lisp/abbrev.el
+++ b/lisp/abbrev.el
@@ -65,7 +65,8 @@ abbreviation causes it to expand and be replaced by its expansion."
 (defvar edit-abbrevs-map
  (let ((map (make-sparse-keymap)))
-    (define-key map "\C-x\C-s" 'edit-abbrevs-redefine)
+    (define-key map "\C-x\C-s" 'abbrev-edit-save-buffer)
+    (define-key map "\C-x\C-w" 'abbrev-edit-save-to-file)
    (define-key map "\C-c\C-c" 'edit-abbrevs-redefine)
    map)
  "Keymap used in `edit-abbrevs'.")
@@ -123,8 +124,13 @@ Otherwise display all abbrevs."
      (if local
          (insert-abbrev-table-description
           (abbrev-table-name local-table) t)
-        (dolist (table abbrev-table-name-list)
+        (let (empty-tables)
-          (insert-abbrev-table-description table t)))
+          (dolist (table abbrev-table-name-list)
+            (if (abbrev-table-empty-p (symbol-value table))
+                (push table empty-tables)
+              (insert-abbrev-table-description table t)))
+          (dolist (table (nreverse empty-tables))
+            (insert-abbrev-table-description table t))))
      (goto-char (point-min))
      (set-buffer-modified-p nil)
      (edit-abbrevs-mode)
@@ -211,13 +217,15 @@ Does not display any message."
                                        ;(interactive "fRead abbrev file: ")
  (read-abbrev-file file t))
-(defun write-abbrev-file (&optional file)
+(defun write-abbrev-file (&optional file verbose)
  "Write all user-level abbrev definitions to a file of Lisp code.
 This does not include system abbrevs; it includes only the abbrev tables
 listed in listed in `abbrev-table-name-list'.
 The file written can be loaded in another session to define the same abbrevs.
 The argument FILE is the file name to write.  If omitted or nil, the file
-specified in `abbrev-file-name' is used."
+specified in `abbrev-file-name' is used.
+If VERBOSE is non-nil, display a message indicating where abbrevs
+have been saved."
  (interactive
   (list
    (read-file-name "Write abbrev file: "
@@ -225,21 +233,47 @@ specified in `abbrev-file-name' is used."
                    abbrev-file-name)))
  (or (and file (> (length file) 0))
      (setq file abbrev-file-name))
-  (let ((coding-system-for-write 'emacs-mule))
+  (let ((coding-system-for-write 'utf-8))
-    (with-temp-file file
+    (with-temp-buffer
-      (insert ";;-*-coding: emacs-mule;-*-\n")
      (dolist (table
-               ;; We sort the table in order to ease the automatic
+               ;; We sort the table in order to ease the automatic
-               ;; merging of different versions of the user's abbrevs
+               ;; merging of different versions of the user's abbrevs
-               ;; file.  This is useful, for example, for when the
+               ;; file.  This is useful, for example, for when the
-               ;; user keeps their home directory in a revision
+               ;; user keeps their home directory in a revision
-               ;; control system, and is therefore keeping multiple
+               ;; control system, and is therefore keeping multiple
-               ;; slightly-differing copies loosely synchronized.
+               ;; slightly-differing copies loosely synchronized.
-               (sort (copy-sequence abbrev-table-name-list)
+               (sort (copy-sequence abbrev-table-name-list)
-                     (lambda (s1 s2)
+                     (lambda (s1 s2)
-                       (string< (symbol-name s1)
+                       (string< (symbol-name s1)
-                                (symbol-name s2)))))
+                                (symbol-name s2)))))
-        (insert-abbrev-table-description table nil)))))
+        (insert-abbrev-table-description table nil))
+      (when (unencodable-char-position (point-min) (point-max) 'utf-8)
+        (setq coding-system-for-write
+              (if (> emacs-major-version 24)
+                  'utf-8-emacs
+                ;; For compatibility with Emacs 22 (See Bug#8308)
+                'emacs-mule)))
+      (goto-char (point-min))
+      (insert (format ";;-*-coding: %s;-*-\n" coding-system-for-write))
+      (write-region nil nil file nil (and (not verbose) 0)))))
+(defun abbrev-edit-save-to-file (file)
+  "Save all user-level abbrev definitions in current buffer to FILE."
+  (interactive
+   (list (read-file-name "Save abbrevs to file: "
+                         (file-name-directory
+                          (expand-file-name abbrev-file-name))
+                         abbrev-file-name)))
+  (edit-abbrevs-redefine)
+  (write-abbrev-file file t))
+(defun abbrev-edit-save-buffer ()
+  "Save all user-level abbrev definitions in current buffer.
+The saved abbrevs are written to the file specified by
+`abbrev-file-name'."
+  (interactive)
+  (abbrev-edit-save-to-file abbrev-file-name))
 (defun add-mode-abbrev (arg)
  "Define mode-specific abbrev for last word(s) before point.
@@ -412,6 +446,19 @@ PROPS is a list of properties."
  (and (vectorp object)
       (numberp (abbrev-table-get object :abbrev-table-modiff))))
+(defun abbrev-table-empty-p (object &optional ignore-system)
+  "Return nil if there are no abbrev symbols in OBJECT.
+If IGNORE-SYSTEM is non-nil, system definitions are ignored."
+  (unless (abbrev-table-p object)
+    (error "Non abbrev table object"))
+  (not (catch 'some
+         (mapatoms (lambda (abbrev)
+                     (unless (or (zerop (length (symbol-name abbrev)))
+                                 (and ignore-system
+                                      (abbrev-get abbrev :system)))
+                       (throw 'some t)))
+                   object))))
 (defvar global-abbrev-table (make-abbrev-table)
  "The abbrev table whose abbrevs affect all buffers.
 Each buffer may also have a local abbrev table.
diff --git a/lisp/allout-widgets.el b/lisp/allout-widgets.el
index 47f181ab76b..ae4265bda1f 100644
--- a/lisp/allout-widgets.el
+++ b/lisp/allout-widgets.el
@@ -238,7 +238,7 @@ buffer, and tracking increases as new widgets are added and
 decreases as obsolete widgets are garbage collected."
  :type 'boolean
  :group 'allout-widgets-developer)
-(defvar allout-widgets-tally (make-hash-table :test 'eq :weakness 'key)
+(defvar allout-widgets-tally nil
  "Hash-table of existing allout widgets, for debugging.
 Table is maintained iff `allout-widgets-maintain-tally' is non-nil.
@@ -2100,6 +2100,7 @@ previously established or is not moved."
    (cond ((not overlay) (when start
                           (setq overlay (make-overlay start end nil t nil))
                           (overlay-put overlay 'button item-widget)
+                           (overlay-put overlay 'evaporate t)
                           (widget-put item-widget :span-overlay overlay)
                           t))
          ;; report:
@@ -2343,6 +2344,19 @@ The elements of LIST are not copied, just the list structure itself."
        (while (consp list) (push (pop list) res))
        (prog1 (nreverse res) (setcdr res list)))
    (car list)))
+;;;_  . allout-widgets-count-buttons-in-region (start end)
+(defun allout-widgets-count-buttons-in-region (start end)
+  "Debugging/diagnostic tool - count overlays with 'button' property in region."
+  (interactive "r")
+  (setq start (or start (point-min))
+        end (or end (point-max)))
+  (if (> start end) (let ((interim start)) (setq start end end interim)))
+  (let ((button-overlays (delq nil
+                               (mapcar (function (lambda (o)
+                                                   (if (overlay-get o 'button)
+                                                       o)))
+                                       (overlays-in start end)))))
+    (length button-overlays)))
 ;;;_ : Run unit tests:
 (defun allout-widgets-run-unit-tests ()
diff --git a/lisp/allout.el b/lisp/allout.el
index 3fb8ed7ccd5..736ec42718b 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -4489,8 +4489,9 @@ Topic exposure is marked with text-properties, to be used by
            ;; advance to just after end of this annotation:
            (setq next (allout-next-single-char-property-change
                        (point) 'allout-was-hidden nil end))
-            (overlay-put (make-overlay prev next nil 'front-advance)
+            (let ((o (make-overlay prev next nil 'front-advance)))
-                         'category 'allout-exposure-category)
+              (overlay-put o 'category 'allout-exposure-category)
+              (overlay-put o 'evaporate t))
            (allout-deannotate-hidden prev next)
            (setq prev next)
            (if next (goto-char next)))))
diff --git a/lisp/ansi-color.el b/lisp/ansi-color.el
index 2b43940c1bd..ff7edf40dcb 100644
--- a/lisp/ansi-color.el
+++ b/lisp/ansi-color.el
@@ -132,8 +132,18 @@ Parameter  Color
  37  47   white
 This vector is used by `ansi-color-make-color-map' to create a color
-map.  This color map is stored in the variable `ansi-color-map'."
+map.  This color map is stored in the variable `ansi-color-map'.
-  :type '(vector string string string string string string string string)
+Each element may also be a cons cell where the car and cdr specify the
+foreground and background colors, respectively."
+  :type '(vector (choice color (cons color color))
+                 (choice color (cons color color))
+                 (choice color (cons color color))
+                 (choice color (cons color color))
+                 (choice color (cons color color))
+                 (choice color (cons color color))
+                 (choice color (cons color color))
+                 (choice color (cons color color)))
  :set 'ansi-color-map-update
  :initialize 'custom-initialize-default
  :group 'ansi-colors)
@@ -528,7 +538,8 @@ The face definitions are based upon the variables
    (mapc
     (function (lambda (e)
                 (aset ansi-color-map index
-                       (ansi-color-make-face 'foreground e))
+                       (ansi-color-make-face 'foreground
+                                             (if (consp e) (car e) e)))
                 (setq index (1+ index)) ))
     ansi-color-names-vector)
    ;; background attributes
@@ -536,7 +547,8 @@ The face definitions are based upon the variables
    (mapc
     (function (lambda (e)
                 (aset ansi-color-map index
-                       (ansi-color-make-face 'background e))
+                       (ansi-color-make-face 'background
+                                             (if (consp e) (cdr e) e)))
                 (setq index (1+ index)) ))
     ansi-color-names-vector)
    ansi-color-map))
diff --git a/lisp/comint.el b/lisp/comint.el
index 711ebce20a3..c9d2108f132 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -368,7 +368,7 @@ text matching `comint-prompt-regexp', depending on the value of
 (defvar comint-dynamic-complete-functions
  '(comint-replace-by-expanded-history comint-dynamic-complete-filename)
  "List of functions called to perform completion.
-Functions should return non-nil if completion was performed.
+Works like `completion-at-point-functions'.
 See also `comint-dynamic-complete'.
 This is a good thing to set in mode hooks.")
@@ -1008,7 +1008,6 @@ See also `comint-read-input-ring'."
      (message "No history")
    (let ((history nil)
          (history-buffer " *Input History*")
-          (index (1- (ring-length comint-input-ring)))
          (conf (current-window-configuration)))
      ;; We have to build up a list ourselves from the ring vector.
      (dotimes (index (ring-length comint-input-ring))
@@ -2946,13 +2945,22 @@ interpreter (e.g., the percent notation of cmd.exe on NT)."
              (setq name (replace-match env-var-val t t name))))))
    name))
+(defun comint--match-partial-filename ()
+  "Return the filename at point as-is, or nil if none is found.
+See `comint-word'."
+  (comint-word comint-file-name-chars))
+(defun comint--unquote&expand-filename (filename)
+  ;; FIXME: The code below does unquote-then-expand which means that "\\$HOME"
+  ;; gets expanded to the same as "$HOME"
+  (comint-substitute-in-file-name
+   (comint-unquote-filename filename)))
 (defun comint-match-partial-filename ()
-  "Return the filename at point, or nil if none is found.
+  "Return the unquoted&expanded filename at point, or nil if none is found.
 Environment variables are substituted.  See `comint-word'."
-  (let ((filename (comint-word comint-file-name-chars)))
+  (let ((filename (comint--match-partial-filename)))
-    (and filename (comint-substitute-in-file-name
+    (and filename (comint--unquote&expand-filename filename))))
-                   (comint-unquote-filename filename)))))
 (defun comint-quote-filename (filename)
  "Return FILENAME with magic characters quoted.
@@ -2987,13 +2995,13 @@ Calls the functions in `comint-dynamic-complete-functions' to perform
 completion until a function returns non-nil, at which point completion is
 assumed to have occurred."
  (interactive)
-  (run-hook-with-args-until-success 'comint-dynamic-complete-functions))
+  (let ((completion-at-point-functions comint-dynamic-complete-functions))
+    (completion-at-point)))
 (defun comint-dynamic-complete-filename ()
  "Dynamically complete the filename at point.
-Completes if after a filename.  See `comint-match-partial-filename' and
+Completes if after a filename.
-`comint-dynamic-complete-as-filename'.
 This function is similar to `comint-replace-by-expanded-filename', except that
 it won't change parts of the filename already entered in the buffer; it just
 adds completion characters to the end of the filename.  A completions listing
@@ -3005,7 +3013,7 @@ completions listing is dependent on the value of `comint-completion-autolist'.
 Returns t if successful."
  (interactive)
-  (when (comint-match-partial-filename)
+  (when (comint--match-partial-filename)
    (unless (window-minibuffer-p (selected-window))
      (message "Completing file name..."))
    (comint-dynamic-complete-as-filename)))
@@ -3021,18 +3029,12 @@ See `comint-dynamic-complete-filename'.  Returns t if successful."
         ;;(file-name-handler-alist nil)
         (minibuffer-p (window-minibuffer-p (selected-window)))
         (success t)
-         (dirsuffix (cond ((not comint-completion-addsuffix)
+         (dirsuffix (cond ((not comint-completion-addsuffix) "")
-                           "")
+                          ((not (consp comint-completion-addsuffix)) "/")
-                          ((not (consp comint-completion-addsuffix))
+                          (t (car comint-completion-addsuffix))))
-                           "/")
+         (filesuffix (cond ((not comint-completion-addsuffix) "")
-                          (t
+                           ((not (consp comint-completion-addsuffix)) " ")
-                           (car comint-completion-addsuffix))))
+                           (t (cdr comint-completion-addsuffix))))
-         (filesuffix (cond ((not comint-completion-addsuffix)
-                            "")
-                           ((not (consp comint-completion-addsuffix))
-                            " ")
-                           (t
-                            (cdr comint-completion-addsuffix))))
         (filename (comint-match-partial-filename))
         (filename-beg (if filename (match-beginning 0) (point)))
         (filename-end (if filename (match-end 0) (point)))
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 788731e4dbc..1188d37150a 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -356,6 +356,7 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
                      (const alt) (const hyper)
                      (const super)) "23.1")
             (ns-antialias-text ns boolean "23.1")
+             (ns-auto-hide-menu-bar ns boolean "24.0")
             ;; process.c
             (delete-exited-processes processes-basics boolean)
             ;; syntax.c
diff --git a/lisp/custom.el b/lisp/custom.el
index d9bb4f954bc..5b5592698d8 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -852,10 +852,10 @@ See `custom-known-themes' for a list of known themes."
        ;; theme is later disabled.
        (cond ((and (eq prop 'theme-value)
                    (boundp symbol))
-               (let ((sv (get symbol 'standard-value)))
+               (let ((sv  (get symbol 'standard-value))
-                 (unless (and sv
+                     (val (symbol-value symbol)))
-                              (equal (eval (car sv)) (symbol-value symbol)))
+                 (unless (and sv (equal (eval (car sv)) val))
-                   (setq old (list (list 'changed (symbol-value symbol)))))))
+                   (setq old `((changed ,(custom-quote val)))))))
              ((and (facep symbol)
                    (not (face-attr-match-p
                          symbol
@@ -1084,10 +1084,10 @@ name."
  :version "24.1")
 (defvar custom--inhibit-theme-enable nil
-  "If non-nil, loading a theme does not enable it.
+  "Whether the custom-theme-set-* functions act immediately.
-This internal variable is set by `load-theme' when its NO-ENABLE
+If nil, `custom-theme-set-variables' and `custom-theme-set-faces'
-argument is non-nil, and it affects `custom-theme-set-variables',
+change the current values of the given variable or face.  If
-`custom-theme-set-faces', and `provide-theme'." )
+non-nil, they just make a record of the theme settings.")
 (defun provide-theme (theme)
  "Indicate that this file provides THEME.
@@ -1097,15 +1097,7 @@ property `theme-feature' (which is usually a symbol created by
  (unless (custom-theme-name-valid-p theme)
    (error "Custom theme cannot be named %S" theme))
  (custom-check-theme theme)
-  (provide (get theme 'theme-feature))
+  (provide (get theme 'theme-feature)))
-  (unless custom--inhibit-theme-enable
-    ;; By default, loading a theme also enables it.
-    (push theme custom-enabled-themes)
-    ;; `user' must always be the highest-precedence enabled theme.
-    ;; Make that remain true.  (This has the effect of making user
-    ;; settings override the ones just loaded, too.)
-    (let ((custom-enabling-themes t))
-      (enable-theme 'user))))
 (defcustom custom-safe-themes '(default)
  "List of themes that are considered safe to load.
@@ -1157,9 +1149,11 @@ Return t if THEME was successfully loaded, nil otherwise."
                            (expand-file-name "themes/" data-directory)))
                (member hash custom-safe-themes)
                (custom-theme-load-confirm hash))
-        (let ((custom--inhibit-theme-enable no-enable))
+        (let ((custom--inhibit-theme-enable t))
-          (eval-buffer)
+          (eval-buffer))
-          t)))))
+        (unless no-enable
+          (enable-theme theme))
+        t))))
 (defun custom-theme-load-confirm (hash)
  "Query the user about loading a Custom theme that may not be safe.
@@ -1238,68 +1232,70 @@ NAME should be a symbol."
 ;;; Enabling and disabling loaded themes.
-(defvar custom-enabling-themes nil)
 (defun enable-theme (theme)
  "Reenable all variable and face settings defined by THEME.
-The newly enabled theme gets the highest precedence (after `user').
+THEME should be either `user', or a theme loaded via `load-theme'.
-If it is already enabled, just give it highest precedence (after `user').
+After this function completes, THEME will have the highest
+precedence (after `user')."
-If THEME does not specify any theme settings, this tries to load
-the theme from its theme file, by calling `load-theme'."
  (interactive (list (intern
                      (completing-read
                       "Enable custom theme: "
-                       obarray (lambda (sym) (get sym 'theme-settings))))))
+                       obarray (lambda (sym) (get sym 'theme-settings)) t))))
  (if (not (custom-theme-p theme))
-      (load-theme theme)
+      (error "Undefined Custom theme %s" theme))
-    ;; This could use a bit of optimization -- cyd
+  (let ((settings (get theme 'theme-settings)))
-    (let ((settings (get theme 'theme-settings)))
+    ;; Loop through theme settings, recalculating vars/faces.
-      (dolist (s settings)
+    (dolist (s settings)
-        (let* ((prop (car s))
+      (let* ((prop (car s))
-               (symbol (cadr s))
+             (symbol (cadr s))
-               (spec-list (get symbol prop)))
+             (spec-list (get symbol prop)))
-          (put symbol prop (cons (cddr s) (assq-delete-all theme spec-list)))
+        (put symbol prop (cons (cddr s) (assq-delete-all theme spec-list)))
-          (if (eq prop 'theme-value)
+        (cond
-              (custom-theme-recalc-variable symbol)
+         ((eq prop 'theme-face)
-            (custom-theme-recalc-face symbol)))))
+          (custom-theme-recalc-face symbol))
-    (unless (eq theme 'user)
+         ((eq prop 'theme-value)
-      (setq custom-enabled-themes
+          ;; Don't change `custom-enabled-themes'; that's special.
-            (cons theme (delq theme custom-enabled-themes)))
+          (unless (eq symbol 'custom-enabled-themes)
-      (unless custom-enabling-themes
+            (custom-theme-recalc-variable symbol)))))))
-        (enable-theme 'user)))))
+  (unless (eq theme 'user)
+    (setq custom-enabled-themes
+          (cons theme (delq theme custom-enabled-themes)))
+    ;; Give the `user' theme the highest priority.
+    (enable-theme 'user)))
 (defcustom custom-enabled-themes nil
  "List of enabled Custom Themes, highest precedence first.
+This list does not include the `user' theme, which is set by
+Customize and always takes precedence over other Custom Themes.
-This does not include the `user' theme, which is set by Customize,
+This variable cannot be defined inside a Custom theme; there, it
-and always takes precedence over other Custom Themes."
+is simply ignored."
  :group 'customize
  :type  '(repeat symbol)
  :set-after '(custom-theme-directory custom-theme-load-path
                                      custom-safe-themes)
  :risky t
  :set (lambda (symbol themes)
-         ;; Avoid an infinite loop when custom-enabled-themes is
+         (let (failures)
-         ;; defined in a theme (e.g. `user').  Enabling the theme sets
+           (setq themes (delq 'user (delete-dups themes)))
-         ;; custom-enabled-themes, which enables the theme...
+           ;; Disable all themes not in THEMES.
-         (unless custom-enabling-themes
+           (if (boundp symbol)
-           (let ((custom-enabling-themes t) failures)
+               (dolist (theme (symbol-value symbol))
-             (setq themes (delq 'user (delete-dups themes)))
+                 (if (not (memq theme themes))
-             (if (boundp symbol)
+                     (disable-theme theme))))
-                 (dolist (theme (symbol-value symbol))
+           ;; Call `enable-theme' or `load-theme' on each of THEMES.
-                   (if (not (memq theme themes))
+           (dolist (theme (reverse themes))
-                       (disable-theme theme))))
+             (condition-case nil
-             (dolist (theme (reverse themes))
+                 (if (custom-theme-p theme)
-               (condition-case nil
+                     (enable-theme theme)
-                   (enable-theme theme)
+                   (load-theme theme))
-                 (error (progn (push theme failures)
+               (error (setq failures (cons theme failures)
-                               (setq themes (delq theme themes))))))
+                            themes (delq theme themes)))))
-             (enable-theme 'user)
+           (enable-theme 'user)
-             (custom-set-default symbol themes)
+           (custom-set-default symbol themes)
-             (if failures
+           (if failures
-                 (message "Failed to enable themes: %s"
+               (message "Failed to enable theme: %s"
-                          (mapconcat 'symbol-name failures " ")))))))
+                        (mapconcat 'symbol-name failures ", "))))))
 (defsubst custom-theme-enabled-p (theme)
  "Return non-nil if THEME is enabled."
diff --git a/lisp/emacs-lisp/derived.el b/lisp/emacs-lisp/derived.el
index 425a77ee77f..1db98ac39c8 100644
--- a/lisp/emacs-lisp/derived.el
+++ b/lisp/emacs-lisp/derived.el
@@ -201,7 +201,7 @@ No problems result if this variable is not bound.
                       name))))
       (unless (boundp ',map)
         (put ',map 'definition-name ',child))
-       (defvar ,map (make-sparse-keymap))
+       (with-no-warnings (defvar ,map (make-sparse-keymap)))
       (unless (get ',map 'variable-documentation)
         (put ',map 'variable-documentation
              (purecopy ,(format "Keymap for `%s'." child))))
diff --git a/lisp/eshell/esh-opt.el b/lisp/eshell/esh-opt.el
index a9e8f11c39a..91d3cac198a 100644
--- a/lisp/eshell/esh-opt.el
+++ b/lisp/eshell/esh-opt.el
@@ -102,10 +102,9 @@ interned variable `args' (created using a `let' form)."
               macro-args
             (list 'eshell-stringify-list
                   (list 'eshell-flatten-list macro-args)))))
-     (let ,(append (mapcar (lambda (opt)
+     (let ,(append (delq nil (mapcar (lambda (opt)
-                             (or (and (listp opt) (nth 3 opt))
+                                       (and (listp opt) (nth 3 opt)))
-                                 'eshell-option-stub))
+                                     (cadr options)))
-                           (cadr options))
                   '(usage-msg last-value ext-command args))
       (eshell-do-opt ,name ,options (quote ,body-forms)))))
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 7eca03bd93b..51169f7b9df 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,137 @@
+2011-03-30  Chong Yidong  <cyd@stupidchicken.com>
+        * proto-stream.el (open-protocol-stream): Bring back `network' type.
+        Make this the default type.
+        (proto-stream-open-plain): Rename from proto-stream-open-default.
+        (open-protocol-stream, proto-stream-open-starttls)
+        (proto-stream-open-tls, proto-stream-open-shell): Replace `default'
+        with `plain'.
+        * nnimap.el (nnimap-stream, nnimap-open-connection-1): Accept `network'
+        value.
+        * nntp.el (nntp-open-connection-function): Document the fact that some
+        values are not functions but are instead handled specially.  Recognize
+        nntp-open-plain-stream value.
+        (nntp-open-connection): Recognize that value.
+2011-03-29  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+        * gssapi.el (open-gssapi-stream): Remove the last mentions of the IMAP
+        stuff.
+        * gnus-score.el (gnus-score-string): Fix calling convention of
+        `gnus-simplify-buffer-fuzzy' after last patches.
+        * gnus-sum.el (gnus-update-marks): Don't send any marks updates to the
+        server for articles we didn't get any headers for.  This is a sanity
+        check.
+2011-03-29  Michael Welsh Duggan  <md5i@md5i.com>
+        * nnimap.el (nnimap-open-connection-1): Is the login responds with a
+        new CAPABILITY, use it.
+2011-03-29  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+        * gnus-agent.el (gnus-agent-fetch-headers): Don't message if we're not
+        downloading anything.
+        * gnus.el (gnus-splash-svg-color-symbols): Removed superfluous `and'.
+2011-03-29  Adam Sjøgren  <asjo@koldfront.dk>
+        * gnus.el (gnus-group-startup-message): Prefer svg file and replace
+        colors.
+        (gnus-splash-svg-color-symbols): New function.
+2011-03-29  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+        * gnus-sum.el (gnus-simplify-buffer-fuzzy): Take the regexp explicitly
+        instead of using the global gnus-simplify-subject-fuzzy-regexp.
+        (gnus-simplify-subject-fuzzy): Use the local
+        gnus-simplify-subject-fuzzy-regex instead of the global one.  This
+        makes using this variable in group parameters work.
+2011-03-29  Teodor Zlatanov  <tzz@lifelogs.com>
+        * gnus-registry.el (gnus-registry-unfollowed-groups): Add
+        "archive:sent" to the unfollowed group regex (for the recent Gnus
+        archive:sent-YYYY-MM-DD groups).
+        (gnus-registry-split-fancy-with-parent): Bail out early in sender
+        tracking if there are more than `gnus-registry-max-track-groups'
+        matches.
+2011-03-29  Stefan Monnier  <monnier@iro.umontreal.ca>
+        * message.el (message--yank-original-internal): New function to do the
+        insertion cleanly inside eval in `message-yank-original'.
+        (message-yank-original): Use it.
+2011-03-29  Julien Danjou  <julien@danjou.info>
+        * mm-view.el (mm-display-inline-fontify): Use `set-normal-mode' with
+        local variables disabled rather than `normal-mode'.
+2011-03-26  Chong Yidong  <cyd@stupidchicken.com>
+        * proto-stream.el: Changes preparatory to merging open-protocol-stream
+        with open-network-stream.
+        (proto-stream-always-use-starttls): Option removed.
+        (open-protocol-stream): Return a process object by default.  Provide a
+        new parameter :return-list specifying a list-type return value, which
+        now has the form (PROP . PLIST) instead of a fixed-length list.  Change
+        :type `network' to `try-starttls', and `network-only' to `default'.
+        Make `default' the default, for compatibility with open-network-stream.
+        Handle the no-parameter case exactly as open-network-stream, with no
+        additional stream processing.  Search plists using plist-get.
+        Explicitly add :end-of-commend parameter if it is missing.
+        (proto-stream-open-default): Renamed from
+        proto-stream-open-network-only.  Return 'default as the type.
+        (proto-stream-open-starttls): Rename from proto-stream-open-network.
+        Use plist-get.  Don't return `tls' as the type if STARTTLS negotiation
+        failed.  Always return a list with a (possibly dead) process as the
+        first element, for compatibility with open-network-stream.
+        (proto-stream-open-tls): Use plist-get.  Always return a list.
+        (proto-stream-open-shell): Return `default' as connection type.
+        (proto-stream-capability-open): Use plist-get.
+        (proto-stream-eoc): Function deleted.
+        * nnimap.el (nnimap-stream, nnimap-open-connection)
+        (nnimap-open-connection-1): Handle renaming of :type parameter for
+        open-protocol-stream.
+        (nnimap-open-connection-1): Pass a :return-list parameter
+        open-protocol-stream to obtain a list return value.  Parse this list
+        using plist-get.
+        * nntp.el (nntp-open-connection): Handle renaming of :type parameter
+        for open-protocol-stream.  Accept open-protocol-stream return value
+        that is a subprocess object instead of a list.  Handle the case of a
+        dead returned process.
+2011-03-25  Teodor Zlatanov  <tzz@lifelogs.com>
+        * mm-util.el (mm-handle-filename): Move to mm-decode.el (bug#8330).
+        * mm-decode.el (mm-handle-filename): Move from mm-util.el (bug#8330).
+2011-03-21  Julien Danjou  <julien@danjou.info>
+        * mm-view.el (mm-display-inline-fontify): Make mode optional, and call
+        normal-mode if not set. Set temp buffer unmodified to avoid kill-buffer
+        query.
+        (mm-inline-text): Render normal text with fontification whenever
+        possible.
+        * gnus-sum.el (gnus-summary-save-parts-1):
+        * gnus-art.el (gnus-article-browse-html-save-cid-content)
+        (gnus-article-browse-html-parts, gnus-mime-delete-part)
+        (gnus-mime-copy-part, gnus-mime-inline-part, gnus-insert-mime-button):
+        Use `mm-handle-filename'.
+        * mm-util.el (mm-handle-filename): New function, return the filename of
+        an handle.
 2011-03-18  Julien Danjou  <julien@danjou.info>
        * gnus-util.el (gnus-buffer-live-p): Simplify gnus-buffer-live-p.
diff --git a/lisp/gnus/gnus-agent.el b/lisp/gnus/gnus-agent.el
index 989488c0995..52fbe9da11f 100644
--- a/lisp/gnus/gnus-agent.el
+++ b/lisp/gnus/gnus-agent.el
@@ -1925,9 +1925,10 @@ article numbers will be returned."
            (setq articles (gnus-list-range-intersection
                            articles (list (cons low high)))))))
-      (gnus-message
+      (when articles
-       10 "gnus-agent-fetch-headers: undownloaded articles are '%s'"
+        (gnus-message
-       (gnus-compress-sequence articles t))
+         10 "gnus-agent-fetch-headers: undownloaded articles are '%s'"
+         (gnus-compress-sequence articles t)))
      (with-current-buffer nntp-server-buffer
        (if articles
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 7c7e0531926..97677988f0a 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -2811,14 +2811,11 @@ Return file name."
           ((equal (concat "<" cid ">") (mm-handle-id handle))
            (setq file
                  (expand-file-name
-                   (or (mail-content-type-get
+                   (or (mm-handle-filename handle)
-                        (mm-handle-disposition handle) 'filename)
+                       (concat
-                       (mail-content-type-get
+                        (make-temp-name "cid")
-                        (setq type (mm-handle-type handle)) 'name)
+                        (car (rassoc (car (mm-handle-type handle)) mailcap-mime-extensions))))
-                       (concat
+                   directory))
-                        (make-temp-name "cid")
-                        (car (rassoc (car type) mailcap-mime-extensions))))
-                   directory))
            (mm-save-part-to-file handle file)
            (throw 'found file))))))))
@@ -2835,10 +2832,7 @@ message header will be added to the bodies of the \"text/html\" parts."
            ((or (equal (car (setq type (mm-handle-type handle))) "text/html")
                 (and (equal (car type) "message/external-body")
                      (or header
-                          (setq file (or (mail-content-type-get type 'name)
+                          (setq file (mm-handle-filename handle)))
-                                         (mail-content-type-get
-                                          (mm-handle-disposition handle)
-                                          'filename))))
                      (or (mm-handle-cache handle)
                          (condition-case code
                              (progn (mm-extern-cache-contents handle) t)
@@ -5043,14 +5037,11 @@ Deleting parts may malfunction or destroy the article; continue? "))
    (let* ((data (get-text-property (point) 'gnus-data))
           (id (get-text-property (point) 'gnus-part))
           (handles gnus-article-mime-handles)
-           (none "(none)")
           (description
            (let ((desc (mm-handle-description data)))
              (when desc
                (mail-decode-encoded-word-string desc))))
-           (filename
+           (filename (or (mm-handle-filename (mm-handle-disposition data)) "(none)"))
-            (or (mail-content-type-get (mm-handle-disposition data) 'filename)
-                none))
           (type (mm-handle-media-type data)))
      (unless data
        (error "No MIME part under point"))
@@ -5168,10 +5159,7 @@ are decompressed."
  (unless handle
    (setq handle (get-text-property (point) 'gnus-data)))
  (when handle
-    (let ((filename (or (mail-content-type-get (mm-handle-type handle)
+    (let ((filename (mm-handle-filename handle))
-                                               'name)
-                        (mail-content-type-get (mm-handle-disposition handle)
-                                               'filename)))
          contents dont-decode charset coding-system)
      (mm-with-unibyte-buffer
        (mm-insert-part handle)
@@ -5261,12 +5249,7 @@ Compressed files like .gz and .bz2 are decompressed."
        (mm-with-unibyte-buffer
          (mm-insert-part handle)
          (setq contents
-                (or (mm-decompress-buffer
+                (or (mm-decompress-buffer (mm-handle-filename handle) nil t)
-                     (or (mail-content-type-get (mm-handle-type handle)
-                                                'name)
-                         (mail-content-type-get (mm-handle-disposition handle)
-                                                'filename))
-                     nil t)
                    (buffer-string))))
        (cond
         ((not arg)
@@ -5671,8 +5654,7 @@ all parts."
 (defun gnus-insert-mime-button (handle gnus-tmp-id &optional displayed)
  (let ((gnus-tmp-name
-         (or (mail-content-type-get (mm-handle-type handle) 'name)
+         (or (mm-handle-filename handle)
-             (mail-content-type-get (mm-handle-disposition handle) 'filename)
             (mail-content-type-get (mm-handle-type handle) 'url)
             ""))
        (gnus-tmp-type (mm-handle-media-type handle))
diff --git a/lisp/gnus/gnus-registry.el b/lisp/gnus/gnus-registry.el
index cef173ce1ec..db3cc06e9aa 100644
--- a/lisp/gnus/gnus-registry.el
+++ b/lisp/gnus/gnus-registry.el
@@ -124,7 +124,7 @@ display."
  :type 'symbol)
 (defcustom gnus-registry-unfollowed-groups
-  '("delayed$" "drafts$" "queue$" "INBOX$" "^nnmairix:")
+  '("delayed$" "drafts$" "queue$" "INBOX$" "^nnmairix:" "archive")
  "List of groups that gnus-registry-split-fancy-with-parent won't return.
 The group names are matched, they don't have to be fully
 qualified.  This parameter tells the Registry 'never split a
@@ -541,24 +541,26 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
                       user-mail-address)))
      (maphash
       (lambda (key value)
-         (let ((this-sender (cdr
+         ;; don't use more than gnus-registry-max-track-groups
-                             (gnus-registry-fetch-extra key 'sender)))
+         (when (< (length found-full) gnus-registry-max-track-groups)
-               matches)
+           (let ((this-sender
-           (when (and this-sender
+                  (cdr (gnus-registry-fetch-extra key 'sender)))
-                      (equal sender this-sender))
+                 matches)
-             (let ((groups (gnus-registry-fetch-groups
+             (when (and this-sender
-                            key
+                        (equal sender this-sender))
-                            gnus-registry-max-track-groups)))
+               (let ((groups (gnus-registry-fetch-groups
-               (dolist (group groups)
+                              key
-                 (when (and group (gnus-registry-follow-group-p group))
+                              gnus-registry-max-track-groups)))
-                   (push group found-full)
+                 (dolist (group groups)
-                   (setq found (append (list group) (delete group found))))))
+                   (when (and group (gnus-registry-follow-group-p group))
-             (push key matches)
+                     (push group found-full)
-             (gnus-message
+                     (setq found (append (list group) (delete group found))))))
-              ;; raise level of messaging if gnus-registry-track-extra
+               (push key matches)
-              (if gnus-registry-track-extra 7 9)
+               (gnus-message
-              "%s (extra tracking) traced sender %s to groups %s (keys %s)"
+                ;; raise level of messaging if gnus-registry-track-extra
-              log-agent sender found matches))))
+                (if gnus-registry-track-extra 7 9)
+                "%s (extra tracking) traced sender %s to groups %s (keys %s)"
+                log-agent sender found matches)))))
       gnus-registry-hashtb)
      ;; filter the found groups and return them
      ;; the found groups are NOT the full groups
diff --git a/lisp/gnus/gnus-score.el b/lisp/gnus/gnus-score.el
index e376b7a7b6e..9bbfbfb057e 100644
--- a/lisp/gnus/gnus-score.el
+++ b/lisp/gnus/gnus-score.el
@@ -2151,7 +2151,7 @@ score in `gnus-newsgroup-scored' by SCORE."
    ;; Find fuzzy matches.
    (when fuzzies
      ;; Simplify the entire buffer for easy matching.
-      (gnus-simplify-buffer-fuzzy)
+      (gnus-simplify-buffer-fuzzy gnus-simplify-subject-fuzzy-regexp)
      (while (setq kill (cadaar fuzzies))
        (let* ((match (nth 0 kill))
               (type (nth 3 kill))
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 29a98b7d11d..91dc6fb9595 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -1734,7 +1734,7 @@ If RE-ONLY is non-nil, strip leading `Re:'s only."
  (while (re-search-forward regexp nil t)
    (replace-match (or newtext ""))))
-(defun gnus-simplify-buffer-fuzzy ()
+(defun gnus-simplify-buffer-fuzzy (regexp)
  "Simplify string in the buffer fuzzily.
 The string in the accessible portion of the current buffer is simplified.
 It is assumed to be a single-line subject.
@@ -1748,11 +1748,10 @@ matter is removed.  Additional things can be deleted by setting
    (while (not (eq modified-tick (buffer-modified-tick)))
      (setq modified-tick (buffer-modified-tick))
      (cond
-       ((listp gnus-simplify-subject-fuzzy-regexp)
+       ((listp regexp)
-        (mapc 'gnus-simplify-buffer-fuzzy-step
+        (mapc 'gnus-simplify-buffer-fuzzy-step regexp))
-              gnus-simplify-subject-fuzzy-regexp))
+       (regexp
-       (gnus-simplify-subject-fuzzy-regexp
+        (gnus-simplify-buffer-fuzzy-step regexp)))
-        (gnus-simplify-buffer-fuzzy-step gnus-simplify-subject-fuzzy-regexp)))
      (gnus-simplify-buffer-fuzzy-step "^ *\\[[-+?*!][-+?*!]\\] *")
      (gnus-simplify-buffer-fuzzy-step
       "^ *\\(re\\|fw\\|fwd\\)[[{(^0-9]*[])}]?[:;] *")
@@ -1767,15 +1766,16 @@ matter is removed.  Additional things can be deleted by setting
  "Simplify a subject string fuzzily.
 See `gnus-simplify-buffer-fuzzy' for details."
  (save-excursion
-    (gnus-set-work-buffer)
+    (let ((regexp gnus-simplify-subject-fuzzy-regexp))
-    (let ((case-fold-search t))
+      (gnus-set-work-buffer)
-      ;; Remove uninteresting prefixes.
+      (let ((case-fold-search t))
-      (when (and gnus-simplify-ignored-prefixes
+        ;; Remove uninteresting prefixes.
-                 (string-match gnus-simplify-ignored-prefixes subject))
+        (when (and gnus-simplify-ignored-prefixes
-        (setq subject (substring subject (match-end 0))))
+                   (string-match gnus-simplify-ignored-prefixes subject))
-      (insert subject)
+          (setq subject (substring subject (match-end 0))))
-      (inline (gnus-simplify-buffer-fuzzy))
+        (insert subject)
-      (buffer-string))))
+        (inline (gnus-simplify-buffer-fuzzy regexp))
+        (buffer-string)))))
 (defsubst gnus-simplify-subject-fully (subject)
  "Simplify a subject string according to `gnus-summary-gather-subject-limit'."
@@ -6068,14 +6068,23 @@ If SELECT-ARTICLES, only select those articles from GROUP."
                    'request-set-mark gnus-newsgroup-name)
                   (not (gnus-article-unpropagatable-p (cdr type))))
          (let* ((old (cdr (assq (cdr type) (gnus-info-marks info))))
-                 (del (gnus-remove-from-range (gnus-copy-sequence old) list))
+                 ;; Don't do anything about marks for articles we
-                 (add (gnus-remove-from-range
+                 ;; didn't actually get any headers for.
-                       (gnus-copy-sequence list) old)))
+                 (existing (gnus-compress-sequence gnus-newsgroup-articles))
+                 (del
+                  (gnus-sorted-range-intersection
+                   existing
+                   (gnus-remove-from-range (gnus-copy-sequence old) list)))
+                 (add
+                  (gnus-sorted-range-intersection
+                   existing
+                   (gnus-remove-from-range
+                    (gnus-copy-sequence list) old))))
            (when add
              (push (list add 'add (list (cdr type))) delta-marks))
            (when del
-              ;; Don't delete marks from outside the active range.  This
+              ;; Don't delete marks from outside the active range.
-              ;; shouldn't happen, but is a sanity check.
+              ;; This shouldn't happen, but is a sanity check.
              (setq del (gnus-sorted-range-intersection
                         (gnus-active gnus-newsgroup-name) del))
              (push (list del 'del (list (cdr type))) delta-marks))))
@@ -12142,10 +12151,7 @@ If REVERSE, save parts that do not match TYPE."
                    mm-file-name-rewrite-functions
                    (file-name-nondirectory
                     (or
-                      (mail-content-type-get
+                      (mm-handle-filename handle)
-                       (mm-handle-disposition handle) 'filename)
-                      (mail-content-type-get
-                       (mm-handle-type handle) 'name)
                      (format "%s.%d.%d" gnus-newsgroup-name
                              (cdr gnus-article-current)
                              gnus-summary-save-parts-counter))))
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index 57d085a0380..d4ecd89db92 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -1043,12 +1043,15 @@ be set in `.emacs' instead."
                                         ((boundp 'image-load-path)
                                          (symbol-value 'image-load-path))
                                         (t load-path)))
-                  (image (find-image
+                  (image (gnus-splash-svg-color-symbols (find-image
-                          `((:type xpm :file "gnus.xpm"
+                          `((:type svg :file "gnus.svg"
+                                   :color-symbols
+                                   (("#bf9900" . ,(car gnus-logo-colors))
+                                    ("#ffcc00" . ,(cadr gnus-logo-colors))))
+                            (:type xpm :file "gnus.xpm"
                                   :color-symbols
                                   (("thing" . ,(car gnus-logo-colors))
                                    ("shadow" . ,(cadr gnus-logo-colors))))
-                            (:type svg :file "gnus.svg")
                            (:type png :file "gnus.png")
                            (:type pbm :file "gnus.pbm"
                                   ;; Account for the pbm's background.
@@ -1057,7 +1060,7 @@ be set in `.emacs' instead."
                            (:type xbm :file "gnus.xbm"
                                   ;; Account for the xbm's background.
                                   :background ,(face-foreground 'gnus-splash)
-                                   :foreground ,(face-background 'default))))))
+                                   :foreground ,(face-background 'default)))))))
             (when image
               (let ((size (image-size image)))
                 (insert-char ?\n (max 0 (round (- (window-height)
@@ -1103,6 +1106,20 @@ be set in `.emacs' instead."
    (setq mode-line-buffer-identification (concat " " gnus-version))
    (set-buffer-modified-p t)))
+(defun gnus-splash-svg-color-symbols (list)
+  "Do color-symbol search-and-replace in svg file"
+  (let ((type (plist-get (cdr list) :type))
+        (file (plist-get (cdr list) :file))
+        (color-symbols (plist-get (cdr list) :color-symbols)))
+    (if (string= type "svg")
+        (let ((data (with-temp-buffer (insert-file file) (buffer-string))))
+          (mapc (lambda (rule)
+                  (setq data (replace-regexp-in-string
+                              (concat "fill:" (car rule))
+                              (concat "fill:" (cdr rule)) data))) color-symbols)
+          (cons (car list) (list :type type :data data)))
+       list)))
 (eval-when (load)
  (let ((command (format "%s" this-command)))
    (when (string-match "gnus" command)
diff --git a/lisp/gnus/gssapi.el b/lisp/gnus/gssapi.el
index 3765fb84ee8..e96c23b14ac 100644
--- a/lisp/gnus/gssapi.el
+++ b/lisp/gnus/gssapi.el
@@ -33,14 +33,14 @@
                                   "--authentication-id %l")
                           "imtest -m gssapi -u %l -p %p %s")
  "List of strings containing commands for GSSAPI (krb5) authentication.
-%s is replaced with server hostname, %p with port to connect to, and
+%s is replaced with server hostname, %p with port to connect to,
-%l with the value of `imap-default-user'.  The program should accept
+and %l with the user name.  The program should accept commands on
-IMAP commands on stdin and return responses to stdout.  Each entry in
+stdin and return responses to stdout.  Each entry in the list is
-the list is tried until a successful connection is made."
+tried until a successful connection is made."
  :group 'network
  :type '(repeat string))
-(defun open-gssapi-stream (name buffer server port)
+(defun open-gssapi-stream (name buffer server port user)
  (let ((cmds gssapi-program)
        cmd done)
    (with-current-buffer buffer
@@ -57,7 +57,7 @@ the list is tried until a successful connection is made."
                          (format-spec-make
                           ?s server
                           ?p (number-to-string port)
-                           ?l imap-default-user))))
+                           ?l user))))
               response)
          (when process
            (while (and (memq (process-status process) '(open run))
@@ -92,7 +92,7 @@ the list is tried until a successful connection is made."
              (accept-process-output process 1)
              (sit-for 1))
            (erase-buffer)
-            (message "GSSAPI IMAP connection: %s" (or response "failed"))
+            (message "GSSAPI connection: %s" (or response "failed"))
            (if (and response (let ((case-fold-search nil))
                                (not (string-match "failed" response))))
                (setq done process)
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index bb9215aca7c..6d9fd712c33 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -3712,22 +3712,9 @@ To use this automatically, you may add this function to
      (while (re-search-forward citexp nil t)
        (replace-match (if remove "" "\n"))))))
-(defun message-yank-original (&optional arg)
+(defun message--yank-original-internal (arg)
-  "Insert the message being replied to, if any.
-Puts point before the text and mark after.
-Normally indents each nonblank line ARG spaces (default 3).  However,
-if `message-yank-prefix' is non-nil, insert that prefix on each line.
-This function uses `message-cite-function' to do the actual citing.
-Just \\[universal-argument] as argument means don't indent, insert no
-prefix, and don't delete any headers."
-  (interactive "P")
  (let ((modified (buffer-modified-p))
        body-text)
-    ;; eval the let forms contained in message-cite-style
-    (eval
-     `(let ,message-cite-style
        (when (and message-reply-buffer
                   message-cite-function)
          (when (equal message-cite-reply-position 'above)
@@ -3767,7 +3754,23 @@ prefix, and don't delete any headers."
          ;; Add a `message-setup-very-last-hook' here?
          ;; Add `gnus-article-highlight-citation' here?
          (unless modified
-            (setq message-checksum (message-checksum))))))))
+        (setq message-checksum (message-checksum))))))
+(defun message-yank-original (&optional arg)
+  "Insert the message being replied to, if any.
+Puts point before the text and mark after.
+Normally indents each nonblank line ARG spaces (default 3).  However,
+if `message-yank-prefix' is non-nil, insert that prefix on each line.
+This function uses `message-cite-function' to do the actual citing.
+Just \\[universal-argument] as argument means don't indent, insert no
+prefix, and don't delete any headers."
+  (interactive "P")
+  ;; eval the let forms contained in message-cite-style
+  (eval
+   `(let ,message-cite-style
+      (message--yank-original-internal ',arg))))
 (defun message-yank-buffer (buffer)
  "Insert BUFFER into the current buffer and quote it."
diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el
index 3909e12186f..f543920446b 100644
--- a/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/mm-decode.el
@@ -1744,6 +1744,13 @@ If RECURSIVE, search recursively."
            (delete-region ,(point-min-marker)
                           ,(point-max-marker))))))))
+(defun mm-handle-filename (handle)
+  "Return filename of HANDLE if any."
+  (or (mail-content-type-get (mm-handle-type handle)
+                             'name)
+      (mail-content-type-get (mm-handle-disposition handle)
+                             'filename)))
 (provide 'mm-decode)
 ;;; mm-decode.el ends here
diff --git a/lisp/gnus/mm-view.el b/lisp/gnus/mm-view.el
index d63d20239dc..abd78b8de02 100644
--- a/lisp/gnus/mm-view.el
+++ b/lisp/gnus/mm-view.el
@@ -455,7 +455,7 @@
          (narrow-to-region (point) (point))
          (mm-insert-part handle)
          (goto-char (point-max)))
-      (insert (mm-decode-string (mm-get-part handle) charset)))
+      (mm-display-inline-fontify handle))
    (when (and mm-fill-flowed
               (equal type "plain")
               (equal (cdr (assoc 'format (mm-handle-type handle)))
@@ -565,15 +565,16 @@
                     (face-property 'default prop) (current-buffer))))
              (delete-region ,(point-min-marker) ,(point-max-marker)))))))))
-(defun mm-display-inline-fontify (handle mode)
+(defun mm-display-inline-fontify (handle &optional mode)
+  "Insert HANDLE inline fontifying with MODE.
+If MODE is not set, try to find mode automatically."
  (let ((charset (mail-content-type-get (mm-handle-type handle) 'charset))
        text coding-system)
    (unless (eq charset 'gnus-decoded)
      (mm-with-unibyte-buffer
        (mm-insert-part handle)
        (mm-decompress-buffer
-         (or (mail-content-type-get (mm-handle-disposition handle) 'name)
+         (mm-handle-filename handle)
-             (mail-content-type-get (mm-handle-disposition handle) 'filename))
         t t)
        (unless charset
          (setq coding-system (mm-find-buffer-file-coding-system)))
@@ -601,7 +602,11 @@
            (font-lock-support-mode nil)
            ;; I find font-lock a bit too verbose.
            (font-lock-verbose nil))
-        (funcall mode)
+        (setq buffer-file-name (mm-handle-filename handle))
+        (set (make-local-variable 'enable-local-variables) nil)
+        (if mode
+            (funcall mode)
+          (set-auto-mode))
        ;; The mode function might have already turned on font-lock.
        (unless (symbol-value 'font-lock-mode)
          (font-lock-fontify-buffer)))
@@ -614,6 +619,9 @@
                       nil)
                     nil nil nil nil nil 'text-prop))
      (setq text (buffer-string))
+      ;; Set buffer unmodified to avoid confirmation when killing the
+      ;; buffer.
+      (set-buffer-modified-p nil)
      (kill-buffer (current-buffer)))
    (mm-insert-inline handle text)))
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index bcbe7b678d5..fa09c7ff165 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -61,10 +61,12 @@ If nnimap-stream is `ssl', this will default to `imaps'.  If not,
 it will default to `imap'.")
 (defvoo nnimap-stream 'undecided
-  "How nnimap will talk to the IMAP server.
+  "How nnimap talks to the IMAP server.
-Values are `ssl', `network', `network-only, `starttls' or
+The value should be either `undecided', `ssl' or `tls',
-`shell'.  The default is to try `ssl' first, and then
+`network', `starttls', `plain', or `shell'.
-`network'.")
+If the value is `undecided', nnimap tries `ssl' first, then falls
+back on `network'.")
 (defvoo nnimap-shell-program (if (boundp 'imap-shell-program)
                                 (if (listp imap-shell-program)
@@ -339,9 +341,7 @@ textual parts.")
           (port nil)
           (ports
            (cond
-             ((or (eq nnimap-stream 'network)
+             ((memq nnimap-stream '(network plain starttls))
-                  (eq nnimap-stream 'network-only)
-                  (eq nnimap-stream 'starttls))
              (nnheader-message 7 "Opening connection to %s..."
                                nnimap-address)
              '("imap" "143"))
@@ -355,21 +355,28 @@ textual parts.")
              '("imaps" "imap" "993" "143"))
             (t
              (error "Unknown stream type: %s" nnimap-stream))))
-           (proto-stream-always-use-starttls t)
           login-result credentials)
      (when nnimap-server-port
        (push nnimap-server-port ports))
-      (destructuring-bind (stream greeting capabilities stream-type)
+      (let* ((stream-list
-          (open-protocol-stream
+              (open-protocol-stream
-           "*nnimap*" (current-buffer) nnimap-address (car ports)
+               "*nnimap*" (current-buffer) nnimap-address (car ports)
-           :type nnimap-stream
+               :type nnimap-stream
-           :shell-command nnimap-shell-program
+               :return-list t
-           :capability-command "1 CAPABILITY\r\n"
+               :shell-command nnimap-shell-program
-           :success " OK "
+               :capability-command "1 CAPABILITY\r\n"
-           :starttls-function
+               :success " OK "
-           (lambda (capabilities)
+               :starttls-function
-             (when (gnus-string-match-p "STARTTLS" capabilities)
+               (lambda (capabilities)
-               "1 STARTTLS\r\n")))
+                 (when (gnus-string-match-p "STARTTLS" capabilities)
+                   "1 STARTTLS\r\n"))))
+             (stream (car stream-list))
+             (props (cdr stream-list))
+             (greeting (plist-get props :greeting))
+             (capabilities (plist-get props :capabilities))
+             (stream-type (plist-get props :type)))
+        (when (and stream (not (memq (process-status stream) '(open run))))
+          (setq stream nil))
        (setf (nnimap-process nnimap-object) stream)
        (setf (nnimap-stream-type nnimap-object) stream-type)
        (if (not stream)
@@ -403,11 +410,18 @@ textual parts.")
                  (setq login-result
                        (nnimap-login (car credentials) (cadr credentials))))
                (if (car login-result)
-                    ;; save the credentials if a save function exists
+                    (progn
+                    ;; Save the credentials if a save function exists
                    ;; (such a function will only be passed if a new
-                    ;; token was created)
+                    ;; token was created).
-                    (when (functionp (nth 2 credentials))
+                      (when (functionp (nth 2 credentials))
-                      (funcall (nth 2 credentials)))
+                        (funcall (nth 2 credentials)))
+                      ;; See if CAPABILITY is set as part of login
+                      ;; response.
+                      (dolist (response (cddr login-result))
+                        (when (string= "CAPABILITY" (upcase (car response)))
+                          (setf (nnimap-capabilities nnimap-object)
+                                (mapcar #'upcase (cdr response))))))
                  ;; If the login failed, then forget the credentials
                  ;; that are now possibly cached.
                  (dolist (host (list (nnoo-current-server 'nnimap)
diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el
index 66a6365cb3b..fa765e17463 100644
--- a/lisp/gnus/nntp.el
+++ b/lisp/gnus/nntp.el
@@ -76,27 +76,27 @@ to innd, you could say something like:
 You probably don't want to do that, though.")
 (defvoo nntp-open-connection-function 'nntp-open-network-stream
-  "*Function used for connecting to a remote system.
+  "Method for connecting to a remote system.
-It will be called with the buffer to output in as argument.
+It should be a function, which is called with the output buffer
+as its single argument, or one of the following special values:
-Currently, five such functions are provided (please refer to their
-respective doc string for more information), three of them establishing
+- `nntp-open-network-stream' specifies a network connection,
-direct connections to the nntp server, and two of them using an indirect
+  upgrading to a TLS connection via STARTTLS if possible.
-host.
+- `nntp-open-plain-stream' specifies an unencrypted network
+  connection (no STARTTLS upgrade is attempted).
-Direct connections:
+- `nntp-open-ssl-stream' or `nntp-open-tls-stream' specify a TLS
- `nntp-open-network-stream' (the default),
+  network connection.
- `network-only' (the same as the above, but don't do automatic
-  STARTTLS upgrades).
+Apart from the above special values, valid functions are as
- `nntp-open-ssl-stream',
+follows; please refer to their respective doc string for more
- `nntp-open-tls-stream',
+information.
- `nntp-open-netcat-stream'.
+For direct connections:
- `nntp-open-telnet-stream'.
+- `nntp-open-netcat-stream'
+- `nntp-open-telnet-stream'
-Indirect connections:
+For indirect connections:
- `nntp-open-via-rlogin-and-netcat',
+- `nntp-open-via-rlogin-and-netcat'
- `nntp-open-via-rlogin-and-telnet',
+- `nntp-open-via-rlogin-and-telnet'
- `nntp-open-via-telnet-and-telnet'.")
+- `nntp-open-via-telnet-and-telnet'")
 (defvoo nntp-never-echoes-commands nil
  "*Non-nil means the nntp server never echoes commands.
@@ -1340,25 +1340,25 @@ password contained in '~/.nntp-authinfo'."
              (let ((coding-system-for-read nntp-coding-system-for-read)
                    (coding-system-for-write nntp-coding-system-for-write)
                    (map '((nntp-open-network-stream network)
-                           (network-only network-only)
+                           (network-only plain) ; compat
+                           (nntp-open-plain-stream plain)
                           (nntp-open-ssl-stream tls)
                           (nntp-open-tls-stream tls))))
                (if (assoc nntp-open-connection-function map)
-                    (car (open-protocol-stream
+                    (open-protocol-stream
-                          "nntpd" pbuffer nntp-address nntp-port-number
+                     "nntpd" pbuffer nntp-address nntp-port-number
-                          :type (cadr
+                     :type (cadr (assoc nntp-open-connection-function map))
-                                 (assoc nntp-open-connection-function map))
+                     :end-of-command "^\\([2345]\\|[.]\\).*\n"
-                          :end-of-command "^\\([2345]\\|[.]\\).*\n"
+                     :capability-command "CAPABILITIES\r\n"
-                          :capability-command "CAPABILITIES\r\n"
+                     :success "^3"
-                          :success "^3"
+                     :starttls-function
-                          :starttls-function
+                     (lambda (capabilities)
-                          (lambda (capabilities)
+                       (if (not (string-match "STARTTLS" capabilities))
-                            (if (not (string-match "STARTTLS" capabilities))
+                           nil
-                                nil
+                         "STARTTLS\r\n")))
-                              "STARTTLS\r\n"))))
                  (funcall nntp-open-connection-function pbuffer)))
            (error
-             (nnheader-report 'nntp "%s" err))
+             (nnheader-report 'nntp ">>> %s" err))
            (quit
             (message "Quit opening connection to %s" nntp-address)
             (nntp-kill-buffer pbuffer)
@@ -1366,6 +1366,9 @@ password contained in '~/.nntp-authinfo'."
             nil))))
    (when timer
      (nnheader-cancel-timer timer))
+    (when (and process
+               (not (memq (process-status process) '(open run))))
+      (setq process nil))
    (unless process
      (nntp-kill-buffer pbuffer))
    (when (and (buffer-name pbuffer)
diff --git a/lisp/gnus/proto-stream.el b/lisp/gnus/proto-stream.el
index fdf2abfea05..45cc974e7a9 100644
--- a/lisp/gnus/proto-stream.el
+++ b/lisp/gnus/proto-stream.el
@@ -48,171 +48,162 @@
 ;;; Code:
-(eval-when-compile
-  (require 'cl))
 (require 'tls)
 (require 'starttls)
-(require 'format-spec)
-(defcustom proto-stream-always-use-starttls (fboundp 'open-gnutls-stream)
-  "If non-nil, always try to upgrade network connections with STARTTLS."
-  :version "24.1"
-  :type 'boolean
-  :group 'comm)
 (declare-function gnutls-negotiate "gnutls"
                  (proc type &optional priority-string trustfiles keyfiles))
 ;;;###autoload
 (defun open-protocol-stream (name buffer host service &rest parameters)
-  "Open a network stream to HOST, upgrading to STARTTLS if possible.
+  "Open a network stream to HOST, possibly with encryption.
-The first four parameters have the same meaning as in
+Normally, return a network process object; with a non-nil
-`open-network-stream'.  The function returns a list where the
+:return-list parameter, return a list instead (see below).
-first element is the stream, the second element is the greeting
-the server replied with after connecting, and the third element
+The first four parameters, NAME, BUFFER, HOST, and SERVICE, have
-is a string representing the capabilities of the server (if any).
+the same meanings as in `open-network-stream'.  The remaining
+PARAMETERS should be a sequence of keywords and values:
-The PARAMETERS is a keyword list that can have the following
-values:
+:type specifies the connection type, one of the following:
+  nil or `network'
-:type -- either `network', `network-only, `tls', `shell' or
+             -- Begin with an ordinary network connection, and if
-`starttls'.  If omitted, the default is `network'.  `network'
+                the parameters :success and :capability-command
-will be opportunistically upgraded to STARTTLS if both the server
+                are also supplied, try to upgrade to an encrypted
-and Emacs supports it.  If you don't want STARTTLS upgrades, use
+                connection via STARTTLS.  Even if that
-`network-only'.
+                fails (e.g. if HOST does not support TLS), retain
+                an unencrypted connection.
-:end-of-command -- a regexp saying what the end of a command is.
+  `plain'    -- An ordinary, unencrypted network connection.
-This defaults to \"\\n\".
+  `starttls' -- Begin with an ordinary connection, and try
+                upgrading via STARTTLS.  If that fails for any
-:success -- a regexp saying whether the STARTTLS command was
+                reason, drop the connection; in that case the
-successful or not.  For instance, for NNTP this is \"^3\".
+                returned object is a killed process.
+  `tls'      -- A TLS connection.
-:capability-command -- a string representing the command used to
+  `ssl'      -- Equivalent to `tls'.
-query server for capabilities.  For instance, for IMAP this is
+  `shell'    -- A shell connection.
-\"1 CAPABILITY\\r\\n\".
+:return-list specifies this function's return value.
-:starttls-function -- a function that takes one parameter, which
+  If omitted or nil, return a process object.  A non-nil means to
-is the response to the capaibility command.  It should return nil
+  return (PROC . PROPS), where PROC is a process object and PROPS
-if it turns out that the server doesn't support STARTTLS, or the
+  is a plist of connection properties, with these keywords:
-command to switch on STARTTLS otherwise.
+   :greeting -- the greeting returned by HOST (a string), or nil.
+   :capabilities -- a string representing HOST's capabilities,
-The return value from this function is a four-element list, where
+                    or nil if none could be found.
-the first element is the stream (if connection was successful);
+   :type -- the resulting connection type; `plain' (unencrypted)
-the second element is the \"greeting\", i. e., the string the
+            or `tls' (TLS-encrypted).
-server sent over on initial contact; the third element is the
-capability string; and the fourth element is either `network' or
+:end-of-command specifies a regexp matching the end of a command.
-`tls', depending on whether the connection ended up being
+  If non-nil, it defaults to \"\\n\".
-encrypted or not."
-  (let ((type (or (cadr (memq :type parameters)) 'network)))
+:success specifies a regexp matching a message indicating a
-    (cond
+  successful STARTTLS negotiation.  For instance, the default
-     ((eq type 'starttls)
+  should be \"^3\" for an NNTP connection.
-      (setq type 'network))
-     ((eq type 'ssl)
+:capability-command specifies a command used to query the HOST
-      (setq type 'tls)))
+  for its capabilities.  For instance, for IMAP this should be
-    (let ((open-result
+  \"1 CAPABILITY\\r\\n\".
-           (funcall (intern (format "proto-stream-open-%s" type) obarray)
-                    name buffer host service parameters)))
+:starttls-function specifies a function for handling STARTTLS.
-      (if (null open-result)
+  This function should take one parameter, the response to the
-          (list nil nil nil type)
+  capability command, and should return the command to switch on
-        (let ((stream (car open-result)))
+  STARTTLS if the server supports STARTTLS, and nil otherwise."
-          (list (and stream
+  (let ((type (plist-get parameters :type))
-                     (memq (process-status stream)
+        (return-list (plist-get parameters :return-list)))
-                           '(open run))
+    (if (and (not return-list)
-                     stream)
+             (or (eq type 'plain)
-                (nth 1 open-result)
+                 (and (memq type '(nil network))
-                (nth 2 open-result)
+                      (not (and (plist-get parameters :success)
-                (nth 3 open-result)))))))
+                                (plist-get parameters :capability-command))))))
+        ;; The simplest case is equivalent to `open-network-stream'.
-(defun proto-stream-open-network-only (name buffer host service parameters)
+        (open-network-stream name buffer host service)
+      ;; For everything else, refer to proto-stream-open-*.
+      (unless (plist-get parameters :end-of-command)
+        (setq parameters (append '(:end-of-command "\r\n") parameters)))
+      (let* ((connection-function
+              (cond
+               ((eq type 'plain) 'proto-stream-open-plain)
+               ((memq type '(nil network starttls))
+                'proto-stream-open-starttls)
+               ((memq type '(tls ssl)) 'proto-stream-open-tls)
+               ((eq type 'shell) 'proto-stream-open-shell)
+               (t (error "Invalid connection type %s" type))))
+             (result (funcall connection-function
+                              name buffer host service parameters)))
+        (if return-list
+            (list (car result)
+                  :greeting     (nth 1 result)
+                  :capabilities (nth 2 result)
+                  :type         (nth 3 result))
+          (car result))))))
+(defun proto-stream-open-plain (name buffer host service parameters)
  (let ((start (with-current-buffer buffer (point)))
        (stream (open-network-stream name buffer host service)))
    (list stream
-          (proto-stream-get-response
+          (proto-stream-get-response stream start
-           stream start (proto-stream-eoc parameters))
+                                     (plist-get parameters :end-of-command))
          nil
-          'network)))
+          'plain)))
-(defun proto-stream-open-network (name buffer host service parameters)
+(defun proto-stream-open-starttls (name buffer host service parameters)
  (let* ((start (with-current-buffer buffer (point)))
+         (require-tls    (eq (plist-get parameters :type) 'starttls))
+         (starttls-function  (plist-get parameters :starttls-function))
+         (success-string     (plist-get parameters :success))
+         (capability-command (plist-get parameters :capability-command))
+         (eoc                (plist-get parameters :end-of-command))
+         ;; Return (STREAM GREETING CAPABILITIES RESULTING-TYPE)
         (stream (open-network-stream name buffer host service))
-         (capability-command (cadr (memq :capability-command parameters)))
-         (eoc (proto-stream-eoc parameters))
-         (type (cadr (memq :type parameters)))
         (greeting (proto-stream-get-response stream start eoc))
-         success)
+         (capabilities (when capability-command
-    (if (not capability-command)
+                         (proto-stream-command stream
-        (list stream greeting nil 'network)
+                                               capability-command eoc)))
-      (let* ((capabilities
+         (resulting-type 'plain)
-              (proto-stream-command stream capability-command eoc))
+         starttls-command)
-             (starttls-command
-              (funcall (cadr (memq :starttls-function parameters))
+    ;; If we have STARTTLS support, try to upgrade the connection.
-                       capabilities)))
+    (when (and (or (fboundp 'open-gnutls-stream)
-        (cond
+                   (executable-find "gnutls-cli"))
-          ;; If this server doesn't support STARTTLS, but we have
+               capabilities success-string starttls-function
-          ;; requested it explicitly, then close the connection and
+               (setq starttls-command
-          ;; return nil.
+                     (funcall starttls-function capabilities)))
-         ((or (not starttls-command)
+      ;; If using external STARTTLS, drop this connection and start
-              (and (not (eq type 'starttls))
+      ;; anew with `starttls-open-stream'.
-                   (not proto-stream-always-use-starttls)))
+      (unless (fboundp 'open-gnutls-stream)
-          (if (eq type 'starttls)
+        (delete-process stream)
-              (progn
+        (setq start (with-current-buffer buffer (point-max)))
-                (delete-process stream)
+        (let* ((starttls-use-gnutls t)
-                nil)
+               (starttls-extra-arguments
-            ;; Otherwise, just return this plain network connection.
+                (if require-tls
-            (list stream greeting capabilities 'network)))
+                    starttls-extra-arguments
-         ;; We have some kind of STARTTLS support, so we try to
+                  ;; For opportunistic TLS upgrades, we don't really
-         ;; upgrade the connection opportunistically.
+                  ;; care about the identity of the peer.
-         ((or (fboundp 'open-gnutls-stream)
+                  (cons "--insecure" starttls-extra-arguments))))
-              (executable-find "gnutls-cli"))
+          (setq stream (starttls-open-stream name buffer host service)))
-          (unless (fboundp 'open-gnutls-stream)
+        (proto-stream-get-response stream start eoc))
-            (delete-process stream)
+      (when (string-match success-string
-            (setq start (with-current-buffer buffer (point-max)))
+                          (proto-stream-command stream starttls-command eoc))
-            (let* ((starttls-use-gnutls t)
+        ;; The server said it was OK to begin STARTTLS negotiations.
-                   (starttls-extra-arguments
+        (if (fboundp 'open-gnutls-stream)
-                    (if (not (eq type 'starttls))
+            (gnutls-negotiate stream nil)
-                        ;; When doing opportunistic TLS upgrades we
+          (unless (starttls-negotiate stream)
-                        ;; don't really care about the identity of the
+            (delete-process stream)))
-                        ;; peer.
+        (if (memq (process-status stream) '(open run))
-                        (cons "--insecure" starttls-extra-arguments)
+            (setq resulting-type 'tls)
-                      starttls-extra-arguments)))
+          ;; We didn't successfully negotiate STARTTLS; if TLS
-              (setq stream (starttls-open-stream name buffer host service)))
+          ;; isn't demanded, reopen an unencrypted connection.
-            (proto-stream-get-response stream start eoc))
+          (unless require-tls
-          (if (not
+            (setq stream (open-network-stream name buffer host service))
-               (string-match
+            (proto-stream-get-response stream start eoc)))
-                (cadr (memq :success parameters))
+        ;; Re-get the capabilities, which may have now changed.
-                (proto-stream-command stream starttls-command eoc)))
+        (setq capabilities
-              ;; We got an error back from the STARTTLS command.
+              (proto-stream-command stream capability-command eoc))))
-              (progn
-                (if (eq type 'starttls)
+    ;; If TLS is mandatory, close the connection if it's unencrypted.
-                    (progn
+    (and require-tls
-                      (delete-process stream)
+         (eq resulting-type 'plain)
-                      nil)
+         (delete-process stream))
-                  (list stream greeting capabilities 'network)))
+    ;; Return value:
-            ;; The server said it was OK to start doing STARTTLS negotiations.
+    (list stream greeting capabilities resulting-type)))
-            (if (fboundp 'open-gnutls-stream)
-                (gnutls-negotiate stream nil)
-              (unless (starttls-negotiate stream)
-                (delete-process stream)
-                (setq stream nil)))
-            (when (or (null stream)
-                      (not (memq (process-status stream)
-                                 '(open run))))
-              ;; It didn't successfully negotiate STARTTLS, so we reopen
-              ;; the connection.
-              (setq stream (open-network-stream name buffer host service))
-              (proto-stream-get-response stream start eoc))
-            ;; Re-get the capabilities, since they may have changed
-            ;; after switching to TLS.
-            (list stream greeting
-                  (proto-stream-command stream capability-command eoc) 'tls)))
-         ;; We don't have STARTTLS support available, but the caller
-         ;; requested a STARTTLS connection, so we give up.
-         ((eq (cadr (memq :type parameters)) 'starttls)
-          (delete-process stream)
-          nil)
-         ;; Fall back on using a plain network stream.
-         (t
-          (list stream greeting capabilities 'network)))))))
 (defun proto-stream-command (stream command eoc)
  (let ((start (with-current-buffer (process-buffer stream) (point-max))))
@@ -241,47 +232,43 @@ encrypted or not."
           (funcall (if (fboundp 'open-gnutls-stream)
                        'open-gnutls-stream
                      'open-tls-stream)
-                    name buffer host service)))
+                    name buffer host service))
+          (eoc (plist-get parameters :end-of-command)))
      (if (null stream)
-          nil
+          (list nil nil nil 'plain)
        ;; If we're using tls.el, we have to delete the output from
        ;; openssl/gnutls-cli.
        (unless (fboundp 'open-gnutls-stream)
-          (proto-stream-get-response
+          (proto-stream-get-response stream start eoc)
-           stream start (proto-stream-eoc parameters))
          (goto-char (point-min))
-          (when (re-search-forward (proto-stream-eoc parameters) nil t)
+          (when (re-search-forward eoc nil t)
            (goto-char (match-beginning 0))
            (delete-region (point-min) (line-beginning-position))))
        (proto-stream-capability-open start stream parameters 'tls)))))
 (defun proto-stream-open-shell (name buffer host service parameters)
+  (require 'format-spec)
  (proto-stream-capability-open
   (with-current-buffer buffer (point))
   (let ((process-connection-type nil))
     (start-process name buffer shell-file-name
                    shell-command-switch
                    (format-spec
-                     (cadr (memq :shell-command parameters))
+                     (plist-get parameters :shell-command)
                     (format-spec-make
                      ?s host
                      ?p service))))
-   parameters 'network))
+   parameters 'plain))
 (defun proto-stream-capability-open (start stream parameters stream-type)
-  (let ((capability-command (cadr (memq :capability-command parameters)))
+  (let* ((capability-command (plist-get parameters :capability-command))
-        (greeting (proto-stream-get-response
+         (eoc                (plist-get parameters :end-of-command))
-                   stream start (proto-stream-eoc parameters))))
+         (greeting (proto-stream-get-response stream start eoc)))
    (list stream greeting
          (and capability-command
-               (proto-stream-command
+               (proto-stream-command stream capability-command eoc))
-                stream capability-command (proto-stream-eoc parameters)))
          stream-type)))
-(defun proto-stream-eoc (parameters)
-  (or (cadr (memq :end-of-command parameters))
-      "\r\n"))
 (provide 'proto-stream)
 ;;; proto-stream.el ends here
diff --git a/lisp/help-mode.el b/lisp/help-mode.el
index 51d18235e1b..005358e3c7d 100644
--- a/lisp/help-mode.el
+++ b/lisp/help-mode.el
@@ -330,7 +330,7 @@ Commands:
    (save-excursion
      (goto-char (point-min))
      (let ((inhibit-read-only t))
-        (when (re-search-forward "^This \\w+ is advised.$" nil t)
+        (when (re-search-forward "^This [^[:space:]]+ is advised.$" nil t)
          (put-text-property (match-beginning 0)
                             (match-end 0)
                             'face 'font-lock-warning-face))))
diff --git a/lisp/ido.el b/lisp/ido.el
index 2a5c7cf2f0e..0ce83d9b88c 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -1964,31 +1964,24 @@ If INITIAL is non-nil, it specifies the initial input string."
      (ido-set-matches)
      (if (and ido-matches (eq ido-try-merged-list 'auto))
          (setq ido-try-merged-list t))
-      (let
+      (let ((max-mini-window-height (or ido-max-window-height
-          ((minibuffer-local-completion-map
+                                        (and (boundp 'max-mini-window-height)
-            (if (memq ido-cur-item '(file dir))
+                                             max-mini-window-height)))
-                minibuffer-local-completion-map
-              ido-completion-map))
-           (minibuffer-local-filename-completion-map
-            (if (memq ido-cur-item '(file dir))
-                ido-completion-map
-              minibuffer-local-filename-completion-map))
-           (max-mini-window-height (or ido-max-window-height
-                                       (and (boundp 'max-mini-window-height) max-mini-window-height)))
           (ido-completing-read t)
           (ido-require-match require-match)
           (ido-use-mycompletion-depth (1+ (minibuffer-depth)))
-           (show-paren-mode nil))
+           (show-paren-mode nil)
+           ;; Postpone history adding till later
+           (history-add-new-input nil))
        ;; prompt the user for the file name
        (setq ido-exit nil)
        (setq ido-final-text
              (catch 'ido
-                (completing-read-default
+                (read-from-minibuffer (ido-make-prompt item prompt)
-                 (ido-make-prompt item prompt)
+                                      (prog1 ido-text-init
-                 '(("dummy" . 1)) nil nil ; table predicate require-match
+                                        (setq ido-text-init nil))
-                 (prog1 ido-text-init (setq ido-text-init nil)) ;initial-contents
+                                      ido-completion-map nil history))))
-                 history))))
+      (ido-trace "read-from-minibuffer" ido-final-text)
-      (ido-trace "completing-read" ido-final-text)
      (if (get-buffer ido-completion-buffer)
          (kill-buffer ido-completion-buffer))
@@ -2158,6 +2151,7 @@ If INITIAL is non-nil, it specifies the initial input string."
         (t
          (setq done t))))))
+    (add-to-history (or history 'minibuffer-history) ido-selected)
    ido-selected))
 (defun ido-edit-input ()
@@ -4491,17 +4485,13 @@ For details of keybindings, see `ido-find-file'."
        ;; Insert the match-status information:
        (ido-set-common-completion)
-        (let ((inf (ido-completions
+        (let ((inf (ido-completions contents)))
-                    contents
-                    minibuffer-completion-table
-                    minibuffer-completion-predicate
-                    (not minibuffer-completion-confirm))))
          (setq ido-show-confirm-message nil)
          (ido-trace "inf" inf)
          (insert inf))
        ))))
-(defun ido-completions (name candidates predicate require-match)
+(defun ido-completions (name)
  ;; Return the string that is displayed after the user's text.
  ;; Modified from `icomplete-completions'.
diff --git a/lisp/image.el b/lisp/image.el
index 627d4c69e44..3b90ac46bd1 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -60,7 +60,7 @@ IMAGE-TYPE must be a pair (PREDICATE . TYPE).  PREDICATE is called
 with one argument, a string containing the image data.  If PREDICATE returns
 a non-nil value, TYPE is the image's type.")
-(defconst image-type-file-name-regexps
+(defvar image-type-file-name-regexps
  '(("\\.png\\'" . png)
    ("\\.gif\\'" . gif)
    ("\\.jpe?g\\'" . jpeg)
@@ -710,17 +710,19 @@ shall be displayed."
 ;;;###autoload
 (defun imagemagick-register-types ()
  "Register the file types that ImageMagick is able to handle."
-  (let ((im-types (imagemagick-types)))
+  (if (fboundp 'imagemagick-types)
-    (dolist (im-inhibit imagemagick-types-inhibit)
+      (let ((im-types (imagemagick-types)))
-      (setq im-types (remove im-inhibit im-types)))
+        (dolist (im-inhibit imagemagick-types-inhibit)
-    (dolist (im-type im-types)
+          (setq im-types (remove im-inhibit im-types)))
-      (let ((extension (downcase (symbol-name im-type))))
+        (dolist (im-type im-types)
-        (push
+          (let ((extension (downcase (symbol-name im-type))))
-         (cons (concat "\\." extension "\\'") 'image-mode)
+            (push
-         auto-mode-alist)
+             (cons (concat "\\." extension "\\'") 'image-mode)
-        (push
+             auto-mode-alist)
-         (cons (concat "\\." extension "\\'") 'imagemagick)
+            (push
-         image-type-file-name-regexps)))))
+             (cons (concat "\\." extension "\\'") 'imagemagick)
+             image-type-file-name-regexps))))
+    (error "Emacs was not built with ImageMagick support")))
 (provide 'image)
diff --git a/lisp/midnight.el b/lisp/midnight.el
index 9a6b162e986..762bc5445ba 100644
--- a/lisp/midnight.el
+++ b/lisp/midnight.el
@@ -39,8 +39,6 @@
 (eval-when-compile
 (require 'cl))
-(require 'timer)
 (defgroup midnight nil
  "Run something every day at midnight."
  :group 'calendar
@@ -66,12 +64,6 @@ call `cancel-timer' or `timer-activate' on `midnight-timer' instead."
 ;;; time conversion
-(defun midnight-time-float (num)
-  "Convert the float number of seconds since epoch to the list of 3 integers."
-  (let* ((div (ash 1 16)) (1st (floor num div)))
-    (list 1st (floor (- num (* (float div) 1st)))
-          (round (* 10000000 (mod num 1))))))
 (defun midnight-buffer-display-time (&optional buffer)
  "Return the time-stamp of BUFFER, or current buffer, as float."
  (with-current-buffer (or buffer (current-buffer))
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 4a2deb6b3bf..9d304ca8156 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -682,6 +682,8 @@ scroll the window of possible completions."
        (t     t)))))
 (defun completion--flush-all-sorted-completions (&rest _ignore)
+  (remove-hook 'after-change-functions
+               'completion--flush-all-sorted-completions t)
  (setq completion-cycling nil)
  (setq completion-all-sorted-completions nil))
@@ -1236,6 +1238,8 @@ Point needs to be somewhere between START and END."
  (assert (<= start (point)) (<= (point) end))
  ;; FIXME: undisplay the *Completions* buffer once the completion is done.
  (with-wrapper-hook
+      ;; FIXME: Maybe we should use this hook to provide a "display
+      ;; completions" operation as well.
      completion-in-region-functions (start end collection predicate)
    (let ((minibuffer-completion-table collection)
          (minibuffer-completion-predicate predicate)
@@ -1247,7 +1251,9 @@ Point needs to be somewhere between START and END."
 (defvar completion-at-point-functions '(tags-completion-at-point-function)
  "Special hook to find the completion table for the thing at point.
-It is called without any argument and should return either nil,
+Each function on this hook is called in turns without any argument and should
+return either nil to mean that it is not applicable at point,
+or t to mean that it already performed completion (discouraged),
 or a function of no argument to perform completion (discouraged),
 or a list of the form (START END COLLECTION &rest PROPS) where
 START and END delimit the entity to complete and should include point,
@@ -1265,7 +1271,7 @@ The completion method is determined by `completion-at-point-functions'."
              'completion-at-point-functions)))
    (cond
     ((functionp res) (funcall res))
-     (res
+     ((consp res)
      (let* ((plist (nthcdr 3 res))
             (start (nth 0 res))
             (end (nth 1 res))
@@ -1273,7 +1279,8 @@ The completion method is determined by `completion-at-point-functions'."
              (or (plist-get plist :annotation-function)
                  completion-annotate-function)))
        (completion-in-region start end (nth 2 res)
-                              (plist-get plist :predicate)))))))
+                              (plist-get plist :predicate))))
+     (res))))  ;Maybe completion already happened and the function returned t.
 ;;; Key bindings.
@@ -1480,8 +1487,9 @@ except that it passes the file name through `substitute-in-file-name'."
                            'completion--file-name-table)
  "Internal subroutine for `read-file-name'.  Do not call this.")
-(defvar read-file-name-function nil
+(defvar read-file-name-function 'read-file-name-default
-  "If this is non-nil, `read-file-name' does its work by calling this function.")
+  "The function called by `read-file-name' to do its work.
+It should accept the same arguments as `read-file-name'.")
 (defcustom read-file-name-completion-ignore-case
  (if (memq system-type '(ms-dos windows-nt darwin cygwin))
@@ -1519,7 +1527,7 @@ such as making the current buffer visit no file in the case of
 (declare-function x-file-dialog "xfns.c"
                  (prompt dir &optional default-filename mustmatch only-dir-p))
-(defun read-file-name-defaults (&optional dir initial)
+(defun read-file-name--defaults (&optional dir initial)
  (let ((default
          (cond
           ;; With non-nil `initial', use `dir' as the first default.
@@ -1586,6 +1594,12 @@ treated as equivalent to nil.
 See also `read-file-name-completion-ignore-case'
 and `read-file-name-function'."
+  (funcall (or read-file-name-function #'read-file-name-default)
+           prompt dir default-filename mustmatch initial predicate))
+(defun read-file-name-default (prompt &optional dir default-filename mustmatch initial predicate)
+  "Default method for reading file names.
+See `read-file-name' for the meaning of the arguments."
  (unless dir (setq dir default-directory))
  (unless (file-name-absolute-p dir) (setq dir (expand-file-name dir)))
  (unless default-filename
@@ -1607,9 +1621,6 @@ and `read-file-name-function'."
                    (minibuffer--double-dollars dir)))
                 (initial (cons (minibuffer--double-dollars initial) 0)))))
-    (if read-file-name-function
-        (funcall read-file-name-function
-                 prompt dir default-filename mustmatch initial predicate)
      (let ((completion-ignore-case read-file-name-completion-ignore-case)
            (minibuffer-completing-file-name t)
            (pred (or predicate 'file-exists-p))
@@ -1645,7 +1656,7 @@ and `read-file-name-function'."
                                 (lambda ()
                                   (with-current-buffer
                                       (window-buffer (minibuffer-selected-window))
-                                     (read-file-name-defaults dir initial)))))
+                                   (read-file-name--defaults dir initial)))))
                        (completing-read prompt 'read-file-name-internal
                                         pred mustmatch insdef
                                         'file-name-history default-filename)))
@@ -1719,7 +1730,7 @@ and `read-file-name-function'."
                                (if history-delete-duplicates
                                    (delete val1 file-name-history)
                                  file-name-history)))))))
-          val)))))
+        val))))
 (defun internal-complete-buffer-except (&optional buffer)
  "Perform completion on all buffers excluding BUFFER.
diff --git a/lisp/net/imap.el b/lisp/net/imap.el
index 6d80b97fd23..f4af03f100f 100644
--- a/lisp/net/imap.el
+++ b/lisp/net/imap.el
@@ -211,7 +211,7 @@ until a successful connection is made."
  :type '(repeat string))
 (defcustom imap-process-connection-type nil
-  "*Value for `process-connection-type' to use for Kerberos4, GSSAPI and SSL.
+  "*Value for `process-connection-type' to use for Kerberos4, GSSAPI, shell, and SSL.
 The `process-connection-type' variable controls the type of device
 used to communicate with subprocesses.  Values are nil to use a
 pipe, or t or `pty' to use a pty.  The value has no effect if the
@@ -770,6 +770,7 @@ sure of changing the value of `foo'."
      (let* ((port (or port imap-default-port))
             (coding-system-for-read imap-coding-system-for-read)
             (coding-system-for-write imap-coding-system-for-write)
+             (process-connection-type imap-process-connection-type)
             (process (start-process
                       name buffer shell-file-name shell-command-switch
                       (format-spec
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 71aa0dd22bc..eb4ad01ecd7 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -491,6 +491,7 @@ If ARG is non-nil, instead prompt for connection parameters."
 (defvar rcirc-server nil)               ; server provided by server
 (defvar rcirc-server-name nil)          ; server name given by 001 response
 (defvar rcirc-timeout-timer nil)
+(defvar rcirc-user-authenticated nil)
 (defvar rcirc-user-disconnect nil)
 (defvar rcirc-connecting nil)
 (defvar rcirc-process nil)
@@ -828,18 +829,21 @@ The list is updated automatically by `defun-rcirc-command'.")
 (defun rcirc-completion-at-point ()
  "Function used for `completion-at-point-functions' in `rcirc-mode'."
-  (let* ((beg (save-excursion
+  (and (rcirc-looking-at-input)
-                (if (re-search-backward " " rcirc-prompt-end-marker t)
+       (let* ((beg (save-excursion
-                    (1+ (point))
+                     (if (re-search-backward " " rcirc-prompt-end-marker t)
-                  rcirc-prompt-end-marker)))
+                         (1+ (point))
-         (table (if (and (= beg rcirc-prompt-end-marker)
+                       rcirc-prompt-end-marker)))
-                         (eq (char-after beg) ?/))
+              (table (if (and (= beg rcirc-prompt-end-marker)
-                    (delete-dups
+                              (eq (char-after beg) ?/))
-                     (nconc
+                         (delete-dups
-                      (sort (copy-sequence rcirc-client-commands) 'string-lessp)
+                          (nconc (sort (copy-sequence rcirc-client-commands)
-                      (sort (copy-sequence rcirc-server-commands) 'string-lessp)))
+                                       'string-lessp)
-                  (rcirc-channel-nicks (rcirc-buffer-process) rcirc-target))))
+                                 (sort (copy-sequence rcirc-server-commands)
-    (list beg (point) table)))
+                                       'string-lessp)))
+                       (rcirc-channel-nicks (rcirc-buffer-process)
+                                            rcirc-target))))
+         (list beg (point) table))))
 (defvar rcirc-completions nil)
 (defvar rcirc-completion-start nil)
@@ -848,6 +852,8 @@ The list is updated automatically by `defun-rcirc-command'.")
  "Cycle through completions from list of nicks in channel or IRC commands.
 IRC command completion is performed only if '/' is the first input char."
  (interactive)
+  (unless (rcirc-looking-at-input)
+    (error "Point not located after rcirc prompt"))
  (if (eq last-command this-command)
      (setq rcirc-completions
            (append (cdr rcirc-completions) (list (car rcirc-completions))))
@@ -855,9 +861,10 @@ IRC command completion is performed only if '/' is the first input char."
          (table (rcirc-completion-at-point)))
      (setq rcirc-completion-start (car table))
      (setq rcirc-completions
-            (all-completions (buffer-substring rcirc-completion-start
+            (and rcirc-completion-start
-                                               (cadr table))
+                 (all-completions (buffer-substring rcirc-completion-start
-                             (nth 2 table)))))
+                                                    (cadr table))
+                                  (nth 2 table))))))
  (let ((completion (car rcirc-completions)))
    (when completion
      (delete-region rcirc-completion-start (point))
diff --git a/lisp/abbrevlist.el b/lisp/obsolete/abbrevlist.el
index 79080780005..55940dfc1ce 100644
--- a/lisp/abbrevlist.el
+++ b/lisp/obsolete/abbrevlist.el
@@ -6,6 +6,7 @@
 ;; Maintainer: FSF
 ;; Keywords: abbrev
 ;; Package: emacs
+;; Obsolete-since: 24.1
 ;; This file is part of GNU Emacs.
diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el
index ab315f9eefd..6aece579d5d 100644
--- a/lisp/progmodes/gdb-mi.el
+++ b/lisp/progmodes/gdb-mi.el
@@ -648,7 +648,7 @@ detailed description of this mode.
  (set (make-local-variable 'gud-minor-mode) 'gdbmi)
  (setq comint-input-sender 'gdb-send)
  (when (ring-empty-p comint-input-ring) ; cf shell-mode
-    (let ((hfile (expand-file-name (or (getenv "GBDHISTFILE")
+    (let ((hfile (expand-file-name (or (getenv "GDBHISTFILE")
                                       (if (eq system-type 'ms-dos)
                                           "_gdb_history"
                                         ".gdb_history"))))
diff --git a/lisp/simple.el b/lisp/simple.el
index e4c742b56f4..a414fc77a39 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -3346,16 +3346,16 @@ and KILLP is t if a prefix arg was specified."
                (delete-char 1)))
          (forward-char -1)
          (setq count (1- count))))))
-  (delete-backward-char
+  (let* ((skip (cond ((eq backward-delete-char-untabify-method 'hungry) " \t")
-   (let ((skip (cond ((eq backward-delete-char-untabify-method 'hungry) " \t")
                     ((eq backward-delete-char-untabify-method 'all)
-                      " \t\n\r"))))
+                      " \t\n\r")))
-     (if skip
+         (n (if skip
-         (let ((wh (- (point) (save-excursion (skip-chars-backward skip)
+                (let ((wh (- (point) (save-excursion (skip-chars-backward skip)
-                                            (point)))))
+                                                     (point)))))
-         (+ arg (if (zerop wh) 0 (1- wh))))
+                  (+ arg (if (zerop wh) 0 (1- wh))))
-         arg))
+              arg)))
-   killp))
+    ;; Avoid warning about delete-backward-char
+    (with-no-warnings (delete-backward-char n killp))))
 (defun zap-to-char (arg char)
  "Kill up to and including ARGth occurrence of CHAR.
diff --git a/lisp/subr.el b/lisp/subr.el
index 205828b4169..e6e0c62e0b4 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1122,6 +1122,8 @@ is converted into a string by expressing it in decimal."
 (make-obsolete-variable 'define-key-rebound-commands nil "23.2")
 (make-obsolete-variable 'redisplay-end-trigger-functions 'jit-lock-register "23.1")
+(make-obsolete-variable 'deferred-action-list 'post-command-hook "24.1")
+(make-obsolete-variable 'deferred-action-function 'post-command-hook "24.1")
 (make-obsolete 'window-redisplay-end-trigger nil "23.1")
 (make-obsolete 'set-window-redisplay-end-trigger nil "23.1")
diff --git a/lisp/thingatpt.el b/lisp/thingatpt.el
index 020faa197cd..a56c3e4d501 100644
--- a/lisp/thingatpt.el
+++ b/lisp/thingatpt.el
@@ -207,6 +207,12 @@ a symbol as a valid THING."
                  (cons opoint end))))
        (error nil)))))
+;; Defuns
+(put 'defun 'beginning-op 'beginning-of-defun)
+(put 'defun 'end-op       'end-of-defun)
+(put 'defun 'forward-op   'end-of-defun)
 ;;  Filenames and URLs  www.com/foo%32bar
 (defvar thing-at-point-file-name-chars "-~/[:alnum:]_.${}#%,:"
diff --git a/lisp/vc/log-view.el b/lisp/vc/log-view.el
index d9a06c8a401..9f6ad19fdb1 100644
--- a/lisp/vc/log-view.el
+++ b/lisp/vc/log-view.el
@@ -122,9 +122,6 @@
  :group 'pcl-cvs
  :prefix "log-view-")
-;; Needed because log-view-mode-map inherits from widget-keymap.  (Bug#5311)
-(require 'wid-edit)
 (easy-mmode-defmap log-view-mode-map
  '(
    ;; FIXME: (copy-keymap special-mode-map) instead
diff --git a/m4/gl-comp.m4 b/m4/gl-comp.m4
index 8bf5a64a5f9..af3cae75abb 100644
--- a/m4/gl-comp.m4
+++ b/m4/gl-comp.m4
@@ -45,10 +45,12 @@ AC_DEFUN([gl_EARLY],
  # Code from module mktime:
  # Code from module multiarch:
  # Code from module readlink:
+  # Code from module socklen:
  # Code from module stat:
  # Code from module stdbool:
  # Code from module stddef:
  # Code from module stdint:
+  # Code from module stdio:
  # Code from module stdlib:
  # Code from module strftime:
  # Code from module symlink:
@@ -111,6 +113,8 @@ AC_DEFUN([gl_INIT],
  # Code from module readlink:
  gl_FUNC_READLINK
  gl_UNISTD_MODULE_INDICATOR([readlink])
+  # Code from module socklen:
+  gl_TYPE_SOCKLEN_T
  # Code from module stat:
  gl_FUNC_STAT
  gl_SYS_STAT_MODULE_INDICATOR([stat])
@@ -120,6 +124,8 @@ AC_DEFUN([gl_INIT],
  gl_STDDEF_H
  # Code from module stdint:
  gl_STDINT_H
+  # Code from module stdio:
+  gl_STDIO_H
  # Code from module stdlib:
  gl_STDLIB_H
  # Code from module strftime:
@@ -305,6 +311,7 @@ AC_DEFUN([gl_FILE_LIST], [
  lib/stdbool.in.h
  lib/stddef.in.h
  lib/stdint.in.h
+  lib/stdio.in.h
  lib/stdlib.in.h
  lib/strftime.c
  lib/strftime.h
@@ -327,11 +334,13 @@ AC_DEFUN([gl_FILE_LIST], [
  m4/mktime.m4
  m4/multiarch.m4
  m4/readlink.m4
+  m4/socklen.m4
  m4/st_dm_mode.m4
  m4/stat.m4
  m4/stdbool.m4
  m4/stddef_h.m4
  m4/stdint.m4
+  m4/stdio_h.m4
  m4/stdlib_h.m4
  m4/strftime.m4
  m4/symlink.m4
diff --git a/m4/socklen.m4 b/m4/socklen.m4
new file mode 100644
index 00000000000..44751544485
--- /dev/null
+++ b/m4/socklen.m4
@@ -0,0 +1,77 @@
+# socklen.m4 serial 10
+dnl Copyright (C) 2005-2007, 2009-2011 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl From Albert Chin, Windows fixes from Simon Josefsson.
+dnl Check for socklen_t: historically on BSD it is an int, and in
+dnl POSIX 1g it is a type of its own, but some platforms use different
+dnl types for the argument to getsockopt, getpeername, etc.:
+dnl HP-UX 10.20, IRIX 6.5, OSF/1 4.0, Interix 3.5, BeOS.
+dnl So we have to test to find something that will work.
+AC_DEFUN([gl_TYPE_SOCKLEN_T],
+  [AC_REQUIRE([gl_CHECK_SOCKET_HEADERS])dnl
+   AC_CHECK_TYPE([socklen_t], ,
+     [AC_MSG_CHECKING([for socklen_t equivalent])
+      AC_CACHE_VAL([gl_cv_socklen_t_equiv],
+        [# Systems have either "struct sockaddr *" or
+         # "void *" as the second argument to getpeername
+         gl_cv_socklen_t_equiv=
+         for arg2 in "struct sockaddr" void; do
+           for t in int size_t "unsigned int" "long int" "unsigned long int"; do
+             AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+                 [[#include <sys/types.h>
+                   #include <sys/socket.h>
+                   int getpeername (int, $arg2 *, $t *);]],
+                 [[$t len;
+                  getpeername (0, 0, &len);]])],
+               [gl_cv_socklen_t_equiv="$t"])
+             test "$gl_cv_socklen_t_equiv" != "" && break
+           done
+           test "$gl_cv_socklen_t_equiv" != "" && break
+         done
+      ])
+      if test "$gl_cv_socklen_t_equiv" = ""; then
+        AC_MSG_ERROR([Cannot find a type to use in place of socklen_t])
+      fi
+      AC_MSG_RESULT([$gl_cv_socklen_t_equiv])
+      AC_DEFINE_UNQUOTED([socklen_t], [$gl_cv_socklen_t_equiv],
+        [type to use in place of socklen_t if not defined])],
+     [gl_SOCKET_HEADERS])])
+dnl On mingw32, socklen_t is in ws2tcpip.h ('int'), so we try to find
+dnl it there too.  But on Cygwin, wc2tcpip.h must not be included.  Users
+dnl of this module should use the same include pattern as gl_SOCKET_HEADERS.
+dnl When you change this macro, keep also in sync:
+dnl   - gl_CHECK_SOCKET_HEADERS,
+dnl   - the Include section of modules/socklen.
+AC_DEFUN([gl_SOCKET_HEADERS],
+[
+/* <sys/types.h> is not needed according to POSIX, but the
+   <sys/socket.h> in i386-unknown-freebsd4.10 and
+   powerpc-apple-darwin5.5 required it. */
+#include <sys/types.h>
+#if HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
+#elif HAVE_WS2TCPIP_H
+# include <ws2tcpip.h>
+#endif
+])
+dnl Tests for the existence of the header for socket facilities.
+dnl Defines the C macros HAVE_SYS_SOCKET_H, HAVE_WS2TCPIP_H.
+dnl This macro must match gl_SOCKET_HEADERS.
+AC_DEFUN([gl_CHECK_SOCKET_HEADERS],
+  [AC_CHECK_HEADERS_ONCE([sys/socket.h])
+   if test $ac_cv_header_sys_socket_h = no; then
+     dnl We cannot use AC_CHECK_HEADERS_ONCE here, because that would make
+     dnl the check for those headers unconditional; yet cygwin reports
+     dnl that the headers are present but cannot be compiled (since on
+     dnl cygwin, all socket information should come from sys/socket.h).
+     AC_CHECK_HEADERS([ws2tcpip.h])
+   fi
+  ])
diff --git a/m4/stdio_h.m4 b/m4/stdio_h.m4
new file mode 100644
index 00000000000..7f3ae56295f
--- /dev/null
+++ b/m4/stdio_h.m4
@@ -0,0 +1,140 @@
+# stdio_h.m4 serial 33
+dnl Copyright (C) 2007-2011 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+AC_DEFUN([gl_STDIO_H],
+[
+  AC_REQUIRE([gl_STDIO_H_DEFAULTS])
+  AC_REQUIRE([AC_C_INLINE])
+  gl_NEXT_HEADERS([stdio.h])
+  dnl No need to create extra modules for these functions. Everyone who uses
+  dnl <stdio.h> likely needs them.
+  GNULIB_FPRINTF=1
+  GNULIB_PRINTF=1
+  GNULIB_VFPRINTF=1
+  GNULIB_VPRINTF=1
+  GNULIB_FPUTC=1
+  GNULIB_PUTC=1
+  GNULIB_PUTCHAR=1
+  GNULIB_FPUTS=1
+  GNULIB_PUTS=1
+  GNULIB_FWRITE=1
+  dnl This ifdef is just an optimization, to avoid performing a configure
+  dnl check whose result is not used. It does not make the test of
+  dnl GNULIB_STDIO_H_SIGPIPE or GNULIB_SIGPIPE redundant.
+  m4_ifdef([gl_SIGNAL_SIGPIPE], [
+    gl_SIGNAL_SIGPIPE
+    if test $gl_cv_header_signal_h_SIGPIPE != yes; then
+      REPLACE_STDIO_WRITE_FUNCS=1
+      AC_LIBOBJ([stdio-write])
+    fi
+  ])
+  dnl Check for declarations of anything we want to poison if the
+  dnl corresponding gnulib module is not in use, and which is not
+  dnl guaranteed by C89.
+  gl_WARN_ON_USE_PREPARE([[#include <stdio.h>
+    ]], [dprintf fpurge fseeko ftello getdelim getline popen renameat
+    snprintf tmpfile vdprintf vsnprintf])
+])
+AC_DEFUN([gl_STDIO_MODULE_INDICATOR],
+[
+  dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
+  AC_REQUIRE([gl_STDIO_H_DEFAULTS])
+  gl_MODULE_INDICATOR_SET_VARIABLE([$1])
+  dnl Define it also as a C macro, for the benefit of the unit tests.
+  gl_MODULE_INDICATOR_FOR_TESTS([$1])
+])
+AC_DEFUN([gl_STDIO_H_DEFAULTS],
+[
+  GNULIB_DPRINTF=0;              AC_SUBST([GNULIB_DPRINTF])
+  GNULIB_FCLOSE=0;               AC_SUBST([GNULIB_FCLOSE])
+  GNULIB_FFLUSH=0;               AC_SUBST([GNULIB_FFLUSH])
+  GNULIB_FOPEN=0;                AC_SUBST([GNULIB_FOPEN])
+  GNULIB_FPRINTF=0;              AC_SUBST([GNULIB_FPRINTF])
+  GNULIB_FPRINTF_POSIX=0;        AC_SUBST([GNULIB_FPRINTF_POSIX])
+  GNULIB_FPURGE=0;               AC_SUBST([GNULIB_FPURGE])
+  GNULIB_FPUTC=0;                AC_SUBST([GNULIB_FPUTC])
+  GNULIB_FPUTS=0;                AC_SUBST([GNULIB_FPUTS])
+  GNULIB_FREOPEN=0;              AC_SUBST([GNULIB_FREOPEN])
+  GNULIB_FSEEK=0;                AC_SUBST([GNULIB_FSEEK])
+  GNULIB_FSEEKO=0;               AC_SUBST([GNULIB_FSEEKO])
+  GNULIB_FTELL=0;                AC_SUBST([GNULIB_FTELL])
+  GNULIB_FTELLO=0;               AC_SUBST([GNULIB_FTELLO])
+  GNULIB_FWRITE=0;               AC_SUBST([GNULIB_FWRITE])
+  GNULIB_GETDELIM=0;             AC_SUBST([GNULIB_GETDELIM])
+  GNULIB_GETLINE=0;              AC_SUBST([GNULIB_GETLINE])
+  GNULIB_OBSTACK_PRINTF=0;       AC_SUBST([GNULIB_OBSTACK_PRINTF])
+  GNULIB_OBSTACK_PRINTF_POSIX=0; AC_SUBST([GNULIB_OBSTACK_PRINTF_POSIX])
+  GNULIB_PERROR=0;               AC_SUBST([GNULIB_PERROR])
+  GNULIB_POPEN=0;                AC_SUBST([GNULIB_POPEN])
+  GNULIB_PRINTF=0;               AC_SUBST([GNULIB_PRINTF])
+  GNULIB_PRINTF_POSIX=0;         AC_SUBST([GNULIB_PRINTF_POSIX])
+  GNULIB_PUTC=0;                 AC_SUBST([GNULIB_PUTC])
+  GNULIB_PUTCHAR=0;              AC_SUBST([GNULIB_PUTCHAR])
+  GNULIB_PUTS=0;                 AC_SUBST([GNULIB_PUTS])
+  GNULIB_REMOVE=0;               AC_SUBST([GNULIB_REMOVE])
+  GNULIB_RENAME=0;               AC_SUBST([GNULIB_RENAME])
+  GNULIB_RENAMEAT=0;             AC_SUBST([GNULIB_RENAMEAT])
+  GNULIB_SNPRINTF=0;             AC_SUBST([GNULIB_SNPRINTF])
+  GNULIB_SPRINTF_POSIX=0;        AC_SUBST([GNULIB_SPRINTF_POSIX])
+  GNULIB_STDIO_H_SIGPIPE=0;      AC_SUBST([GNULIB_STDIO_H_SIGPIPE])
+  GNULIB_TMPFILE=0;              AC_SUBST([GNULIB_TMPFILE])
+  GNULIB_VASPRINTF=0;            AC_SUBST([GNULIB_VASPRINTF])
+  GNULIB_VDPRINTF=0;             AC_SUBST([GNULIB_VDPRINTF])
+  GNULIB_VFPRINTF=0;             AC_SUBST([GNULIB_VFPRINTF])
+  GNULIB_VFPRINTF_POSIX=0;       AC_SUBST([GNULIB_VFPRINTF_POSIX])
+  GNULIB_VPRINTF=0;              AC_SUBST([GNULIB_VPRINTF])
+  GNULIB_VPRINTF_POSIX=0;        AC_SUBST([GNULIB_VPRINTF_POSIX])
+  GNULIB_VSNPRINTF=0;            AC_SUBST([GNULIB_VSNPRINTF])
+  GNULIB_VSPRINTF_POSIX=0;       AC_SUBST([GNULIB_VSPRINTF_POSIX])
+  dnl Assume proper GNU behavior unless another module says otherwise.
+  HAVE_DECL_FPURGE=1;            AC_SUBST([HAVE_DECL_FPURGE])
+  HAVE_DECL_FSEEKO=1;            AC_SUBST([HAVE_DECL_FSEEKO])
+  HAVE_DECL_FTELLO=1;            AC_SUBST([HAVE_DECL_FTELLO])
+  HAVE_DECL_GETDELIM=1;          AC_SUBST([HAVE_DECL_GETDELIM])
+  HAVE_DECL_GETLINE=1;           AC_SUBST([HAVE_DECL_GETLINE])
+  HAVE_DECL_OBSTACK_PRINTF=1;    AC_SUBST([HAVE_DECL_OBSTACK_PRINTF])
+  HAVE_DECL_SNPRINTF=1;          AC_SUBST([HAVE_DECL_SNPRINTF])
+  HAVE_DECL_VSNPRINTF=1;         AC_SUBST([HAVE_DECL_VSNPRINTF])
+  HAVE_DPRINTF=1;                AC_SUBST([HAVE_DPRINTF])
+  HAVE_FSEEKO=1;                 AC_SUBST([HAVE_FSEEKO])
+  HAVE_FTELLO=1;                 AC_SUBST([HAVE_FTELLO])
+  HAVE_RENAMEAT=1;               AC_SUBST([HAVE_RENAMEAT])
+  HAVE_VASPRINTF=1;              AC_SUBST([HAVE_VASPRINTF])
+  HAVE_VDPRINTF=1;               AC_SUBST([HAVE_VDPRINTF])
+  REPLACE_DPRINTF=0;             AC_SUBST([REPLACE_DPRINTF])
+  REPLACE_FCLOSE=0;              AC_SUBST([REPLACE_FCLOSE])
+  REPLACE_FFLUSH=0;              AC_SUBST([REPLACE_FFLUSH])
+  REPLACE_FOPEN=0;               AC_SUBST([REPLACE_FOPEN])
+  REPLACE_FPRINTF=0;             AC_SUBST([REPLACE_FPRINTF])
+  REPLACE_FPURGE=0;              AC_SUBST([REPLACE_FPURGE])
+  REPLACE_FREOPEN=0;             AC_SUBST([REPLACE_FREOPEN])
+  REPLACE_FSEEK=0;               AC_SUBST([REPLACE_FSEEK])
+  REPLACE_FSEEKO=0;              AC_SUBST([REPLACE_FSEEKO])
+  REPLACE_FTELL=0;               AC_SUBST([REPLACE_FTELL])
+  REPLACE_FTELLO=0;              AC_SUBST([REPLACE_FTELLO])
+  REPLACE_GETDELIM=0;            AC_SUBST([REPLACE_GETDELIM])
+  REPLACE_GETLINE=0;             AC_SUBST([REPLACE_GETLINE])
+  REPLACE_OBSTACK_PRINTF=0;      AC_SUBST([REPLACE_OBSTACK_PRINTF])
+  REPLACE_PERROR=0;              AC_SUBST([REPLACE_PERROR])
+  REPLACE_POPEN=0;               AC_SUBST([REPLACE_POPEN])
+  REPLACE_PRINTF=0;              AC_SUBST([REPLACE_PRINTF])
+  REPLACE_REMOVE=0;              AC_SUBST([REPLACE_REMOVE])
+  REPLACE_RENAME=0;              AC_SUBST([REPLACE_RENAME])
+  REPLACE_RENAMEAT=0;            AC_SUBST([REPLACE_RENAMEAT])
+  REPLACE_SNPRINTF=0;            AC_SUBST([REPLACE_SNPRINTF])
+  REPLACE_SPRINTF=0;             AC_SUBST([REPLACE_SPRINTF])
+  REPLACE_STDIO_WRITE_FUNCS=0;   AC_SUBST([REPLACE_STDIO_WRITE_FUNCS])
+  REPLACE_TMPFILE=0;             AC_SUBST([REPLACE_TMPFILE])
+  REPLACE_VASPRINTF=0;           AC_SUBST([REPLACE_VASPRINTF])
+  REPLACE_VDPRINTF=0;            AC_SUBST([REPLACE_VDPRINTF])
+  REPLACE_VFPRINTF=0;            AC_SUBST([REPLACE_VFPRINTF])
+  REPLACE_VPRINTF=0;             AC_SUBST([REPLACE_VPRINTF])
+  REPLACE_VSNPRINTF=0;           AC_SUBST([REPLACE_VSNPRINTF])
+  REPLACE_VSPRINTF=0;            AC_SUBST([REPLACE_VSPRINTF])
+])
diff --git a/make-dist b/make-dist
index ee0efb04c3a..1a92d48a6ba 100755
--- a/make-dist
+++ b/make-dist
@@ -286,7 +286,7 @@ echo "Making links to top-level files"
 ln INSTALL README BUGS move-if-change ${tempdir}
 ln ChangeLog Makefile.in configure configure.in ${tempdir}
 ln config.bat make-dist update-subdirs vpath.sed .dir-locals.el ${tempdir}
-ln mkinstalldirs config.sub config.guess install-sh ${tempdir}
+ln config.sub config.guess install-sh ${tempdir}
 ln aclocal.m4 ${tempdir}
 ln compile depcomp missing ${tempdir}
 ln arg-nonnull.h c++defs.h warn-on-use.h ${tempdir}
diff --git a/mkinstalldirs b/mkinstalldirs
deleted file mode 100755
index 4191a45dbd7..00000000000
--- a/mkinstalldirs
+++ /dev/null
@@ -1,162 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-scriptversion=2009-04-28.21; # UTC
-# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
-# Created: 1993-05-16
-# Public domain.
-#
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-nl='
-'
-IFS=" ""        $nl"
-errstatus=0
-dirmode=
-usage="\
-Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
-Create each directory DIR (with mode MODE, if specified), including all
-leading file name components.
-Report bugs to <bug-automake@gnu.org>."
-# process command line arguments
-while test $# -gt 0 ; do
-  case $1 in
-    -h | --help | --h*)         # -h for help
-      echo "$usage"
-      exit $?
-      ;;
-    -m)                         # -m PERM arg
-      shift
-      test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
-      dirmode=$1
-      shift
-      ;;
-    --version)
-      echo "$0 $scriptversion"
-      exit $?
-      ;;
-    --)                         # stop option processing
-      shift
-      break
-      ;;
-    -*)                         # unknown option
-      echo "$usage" 1>&2
-      exit 1
-      ;;
-    *)                          # first non-opt arg
-      break
-      ;;
-  esac
-done
-for file
-do
-  if test -d "$file"; then
-    shift
-  else
-    break
-  fi
-done
-case $# in
-  0) exit 0 ;;
-esac
-# Solaris 8's mkdir -p isn't thread-safe.  If you mkdir -p a/b and
-# mkdir -p a/c at the same time, both will detect that a is missing,
-# one will create a, then the other will try to create a and die with
-# a "File exists" error.  This is a problem when calling mkinstalldirs
-# from a parallel make.  We use --version in the probe to restrict
-# ourselves to GNU mkdir, which is thread-safe.
-case $dirmode in
-  '')
-    if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-      echo "mkdir -p -- $*"
-      exec mkdir -p -- "$@"
-    else
-      # On NextStep and OpenStep, the `mkdir' command does not
-      # recognize any option.  It will interpret all options as
-      # directories to create, and then abort because `.' already
-      # exists.
-      test -d ./-p && rmdir ./-p
-      test -d ./--version && rmdir ./--version
-    fi
-    ;;
-  *)
-    if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
-       test ! -d ./--version; then
-      echo "mkdir -m $dirmode -p -- $*"
-      exec mkdir -m "$dirmode" -p -- "$@"
-    else
-      # Clean up after NextStep and OpenStep mkdir.
-      for d in ./-m ./-p ./--version "./$dirmode";
-      do
-        test -d $d && rmdir $d
-      done
-    fi
-    ;;
-esac
-for file
-do
-  case $file in
-    /*) pathcomp=/ ;;
-    *)  pathcomp= ;;
-  esac
-  oIFS=$IFS
-  IFS=/
-  set fnord $file
-  shift
-  IFS=$oIFS
-  for d
-  do
-    test "x$d" = x && continue
-    pathcomp=$pathcomp$d
-    case $pathcomp in
-      -*) pathcomp=./$pathcomp ;;
-    esac
-    if test ! -d "$pathcomp"; then
-      echo "mkdir $pathcomp"
-      mkdir "$pathcomp" || lasterr=$?
-      if test ! -d "$pathcomp"; then
-        errstatus=$lasterr
-      else
-        if test ! -z "$dirmode"; then
-          echo "chmod $dirmode $pathcomp"
-          lasterr=
-          chmod "$dirmode" "$pathcomp" || lasterr=$?
-          if test ! -z "$lasterr"; then
-            errstatus=$lasterr
-          fi
-        fi
-      fi
-    fi
-    pathcomp=$pathcomp/
-  done
-done
-exit $errstatus
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:
diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index 1891d79da43..4a2534ebf84 100644
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,3 +1,10 @@
+2011-03-25  Eli Zaretskii  <eliz@gnu.org>
+        * sedlibmk.inp: Adapt to addition of the gnulib stdio module.
+        Add a description of what needs to be done when a new gnulib
+        module is added.
+        (MKDIR_P): Fix replacement command.
 2011-02-26  Eli Zaretskii  <eliz@gnu.org>
        * sedlibmk.inp (BITSIZEOF_PTRDIFF_T, BITSIZEOF_SIG_ATOMIC_T)
diff --git a/msdos/sedlibmk.inp b/msdos/sedlibmk.inp
index b71aef985a9..d7af3681ef9 100644
--- a/msdos/sedlibmk.inp
+++ b/msdos/sedlibmk.inp
@@ -16,6 +16,81 @@
 #
 # ----------------------------------------------------------------------
 #
+# Checklist to add a new gnulib module:
+#
+#  . If the module includes source files that need to be compiled, add
+#    the corresponding .o file names to the list that gets assigned to
+#    the gl_LIBOBJS variable.
+#
+#  . If the module defines functions that need to replace DJGPP
+#    functions, edit the appropriate REPLACE_foo variables to 1;
+#    otherwise edit them to zero:
+#
+#     /^REPLACE_CALLOC *=/s/@REPLACE_CALLOC@/0/
+# 
+#  . If the module is a header or adds headers, edit the corresponding
+#    variable to either an empty value or to the name of the header.
+#    Examples:
+#
+#       /^STDINT_H *=/s/@[^@\n]*@/stdint.h/  -- stdint.h is needed
+#       /^STDDEF_H *=/s/@[^@\n]*@//          -- stddef.h is not needed
+#
+#  . Also edit the NEXT_foo and NEXT_AS_FIRST_DIRECTIVE_foo_H variable
+#    as appropriately: to an empty value if the gnulib header is not
+#    used, and to the corresponding DJGPP header name otherwise.
+#    Examples:
+#
+#     /^NEXT_STDDEF_H *=/s/@[^@\n]*@//
+#     /^NEXT_STDINT_H *=/s/@[^@\n]*@/<stdint.h>/
+#     /^NEXT_AS_FIRST_DIRECTIVE_GETOPT_H *=/s/@[^@\n]*@/<getopt.h>/
+#     /^NEXT_AS_FIRST_DIRECTIVE_STDDEF_H *=/s/@[^@\n]*@//
+#
+#  . Note that some gnulib headers cannot be left unused: those for
+#    which there's no corresponding foo_H variable in
+#    autogen/Makefile.in (example: stdio.h).  For these the "not
+#    needed" path is not applicable.
+#
+#  . If the header is needed, edit all the variables it uses as
+#    appropriate.  In general, if DJGPP has the corresponding feature,
+#    the value of the corresponding HAVE_foo should be set to what
+#    DJGPP has, and the corresponding GNULIB_foo variable should be
+#    edited to zero.  If the feature is not available, the HAVE_foo
+#    variable should be edited to zero and the corresponding
+#    GNULIB_foo variable should be edited to 1 if the gnulib
+#    replacement can work for DJGPP (a rare phenomenon), zero
+#    otherwise.
+#
+#  . Some gnulib header files have more complex recipes in
+#    autogen/Makefile.in than others.  The tell-tale sign of such a
+#    recipe is that the input redirection from the .in.h file is not
+#    present at the end of the command, like this:
+#
+#             -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \
+#       } > $@-t && \
+#       mv $@-t $@
+#
+#    as opposed to this:
+#
+#             -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+#             < $(srcdir)/sys_stat.in.h; \
+#       } > $@-t && \
+#       mv $@-t $@
+#
+#    For those recipes that do _not_ have redirection at the end of
+#    the command, add a block of Sed commands like this:
+#
+#     /^stdio\.h:/,/^   [       ]*mv /{
+#       s/'\; \\ *$/' >> $@-t/
+#     }
+#
+# The following Awk script is useful for editing portions of
+# autogen/Makefile.in into Sed commands that define the corresponding
+# variables to zero (which is what is required in the absolute
+# majority of cases):
+#
+#   { printf "/^%s *=/s/%s/0/\n",$1,$3}
+#
+# ----------------------------------------------------------------------
 # Replace @..@ constants.
 /^\# @configure_input@/s!@configure_input@!lib/Makefile.  Generated from Makefile.in by config.bat!
 /^@SET_MAKE@$/s/@SET_MAKE@//
@@ -64,6 +139,7 @@ am__cd = cd
 /^GNULIB_CANONICALIZE_FILE_NAME *=/s/@GNULIB_CANONICALIZE_FILE_NAME@/0/
 /^GNULIB_CHOWN *=/s/@GNULIB_CHOWN@/0/
 /^GNULIB_CLOSE *=/s/@GNULIB_CLOSE@/0/
+/^GNULIB_DPRINTF *=/s/@GNULIB_DPRINTF@/0/
 /^GNULIB_DUP2 *=/s/@GNULIB_DUP2@/0/
 /^GNULIB_DUP3 *=/s/@GNULIB_DUP3@/1/
 /^GNULIB_ENVIRON *=/s/@GNULIB_ENVIRON@/0/
@@ -72,15 +148,31 @@ am__cd = cd
 /^GNULIB_FCHDIR *=/s/@GNULIB_FCHDIR@/0/
 /^GNULIB_FCHOWNAT *=/s/@GNULIB_FCHOWNAT@/0/
 /^GNULIB_FCHMODAT *=/s/@GNULIB_FCHMODAT@/0/
+/^GNULIB_FCLOSE *=/s/@GNULIB_FCLOSE@/0/
+/^GNULIB_FFLUSH *=/s/@GNULIB_FFLUSH@/0/
+/^GNULIB_FOPEN *=/s/@GNULIB_FOPEN@/0/
+/^GNULIB_FPRINTF *=/s/@GNULIB_FPRINTF@/0/
+/^GNULIB_FPRINTF_POSIX *=/s/@GNULIB_FPRINTF_POSIX@/0/
+/^GNULIB_FPURGE *=/s/@GNULIB_FPURGE@/0/
+/^GNULIB_FPUTC *=/s/@GNULIB_FPUTC@/0/
+/^GNULIB_FPUTS *=/s/@GNULIB_FPUTS@/0/
+/^GNULIB_FREOPEN *=/s/@GNULIB_FREOPEN@/0/
+/^GNULIB_FSEEK *=/s/@GNULIB_FSEEK@/0/
+/^GNULIB_FSEEKO *=/s/@GNULIB_FSEEKO@/0/
 /^GNULIB_FSTATAT *=/s/@GNULIB_FSTATAT@/0/
 /^GNULIB_FSYNC *=/s/@GNULIB_FSYNC@/0/
+/^GNULIB_FTELL *=/s/@GNULIB_FTELL@/0/
+/^GNULIB_FTELLO *=/s/@GNULIB_FTELLO@/0/
 /^GNULIB_FTRUNCATE *=/s/@GNULIB_FTRUNCATE@/0/
 /^GNULIB_FUTIMENS *=/s/@GNULIB_FUTIMENS@/0/
+/^GNULIB_FWRITE *=/s/@GNULIB_FWRITE@/0/
 /^GNULIB_GETCWD *=/s/@GNULIB_GETCWD@/0/
+/^GNULIB_GETDELIM *=/s/@GNULIB_GETDELIM@/0/
 /^GNULIB_GETDOMAINNAME *=/s/@GNULIB_GETDOMAINNAME@/0/
 /^GNULIB_GETDTABLESIZE *=/s/@GNULIB_GETDTABLESIZE@/0/
 /^GNULIB_GETGROUPS *=/s/@GNULIB_GETGROUPS@/0/
 /^GNULIB_GETHOSTNAME *=/s/@GNULIB_GETHOSTNAME@/0/
+/^GNULIB_GETLINE *=/s/@GNULIB_GETLINE@/0/
 /^GNULIB_GETLOADAVG *=/s/@GNULIB_GETLOADAVG@/1/
 /^GNULIB_GETLOGIN *=/s/@GNULIB_GETLOGIN@/0/
 /^GNULIB_GETLOGIN_R *=/s/@GNULIB_GETLOGIN_R@/0/
@@ -108,22 +200,37 @@ am__cd = cd
 /^GNULIB_MKSTEMPS *=/s/@GNULIB_MKSTEMPS@/0/
 /^GNULIB_MKTIME *=/s/@GNULIB_MKTIME@/0/
 /^GNULIB_NANOSLEEP *=/s/@GNULIB_NANOSLEEP@/0/
+/^GNULIB_OBSTACK_PRINTF *=/s/@GNULIB_OBSTACK_PRINTF@/0/
+/^GNULIB_OBSTACK_PRINTF_POSIX *=/s/@GNULIB_OBSTACK_PRINTF_POSIX@/0/
+/^GNULIB_PERROR *=/s/@GNULIB_PERROR@/0/
 /^GNULIB_PIPE *=/s/@GNULIB_PIPE@/0/
 /^GNULIB_PIPE2 *=/s/@GNULIB_PIPE2@/0/
+/^GNULIB_POPEN *=/s/@GNULIB_POPEN@/0/
 /^GNULIB_PREAD *=/s/@GNULIB_PREAD@/0/
+/^GNULIB_PRINTF *=/s/@GNULIB_PRINTF@/0/
+/^GNULIB_PRINTF_POSIX *=/s/@GNULIB_PRINTF_POSIX@/0/
 /^GNULIB_PTSNAME *=/s/@GNULIB_PTSNAME@/0/
+/^GNULIB_PUTC *=/s/@GNULIB_PUTC@/0/
+/^GNULIB_PUTCHAR *=/s/@GNULIB_PUTCHAR@/0/
 /^GNULIB_PUTENV *=/s/@GNULIB_PUTENV@/0/
+/^GNULIB_PUTS *=/s/@GNULIB_PUTS@/0/
 /^GNULIB_PWRITE *=/s/@GNULIB_PWRITE@/0/
 /^GNULIB_RANDOM_R *=/s/@GNULIB_RANDOM_R@/0/
 /^GNULIB_READLINK *=/s/@GNULIB_READLINK@/0/
 /^GNULIB_READLINKAT *=/s/@GNULIB_READLINKAT@/0/
 /^GNULIB_REALLOC_POSIX *=/s/@GNULIB_REALLOC_POSIX@/0/
 /^GNULIB_REALPATH *=/s/@GNULIB_REALPATH@/0/
+/^GNULIB_REMOVE *=/s/@GNULIB_REMOVE@/0/
+/^GNULIB_RENAME *=/s/@GNULIB_RENAME@/0/
+/^GNULIB_RENAMEAT *=/s/@GNULIB_RENAMEAT@/0/
 /^GNULIB_RMDIR *=/s/@GNULIB_RMDIR@/0/
 /^GNULIB_RPMATCH *=/s/@GNULIB_RPMATCH@/0/
 /^GNULIB_SETENV *=/s/@GNULIB_SETENV@/0/
 /^GNULIB_SLEEP *=/s/@GNULIB_SLEEP@/0/
+/^GNULIB_SNPRINTF *=/s/@GNULIB_SNPRINTF@/0/
+/^GNULIB_SPRINTF_POSIX *=/s/@GNULIB_SPRINTF_POSIX@/0/
 /^GNULIB_STAT *=/s/@GNULIB_STAT@/0/
+/^GNULIB_STDIO_H_SIGPIPE *=/s/@GNULIB_STDIO_H_SIGPIPE@/0/
 /^GNULIB_STRPTIME *=/s/@GNULIB_STRPTIME@/0/
 /^GNULIB_STRTOD *=/s/@GNULIB_STRTOD@/0/
 /^GNULIB_STRTOLL *=/s/@GNULIB_STRTOLL@/0/
@@ -133,6 +240,7 @@ am__cd = cd
 /^GNULIB_SYSTEM_POSIX *=/s/@GNULIB_SYSTEM_POSIX@/0/
 /^GNULIB_TIMEGM *=/s/@GNULIB_TIMEGM@/0/
 /^GNULIB_TIME_R *=/s/@GNULIB_TIME_R@/1/
+/^GNULIB_TMPFILE *=/s/@GNULIB_TMPFILE@/0/
 /^GNULIB_TTYNAME_R *=/s/@GNULIB_TTYNAME_R@/0/
 /^GNULIB_UNISTD_H_GETOPT *=/s/@GNULIB_UNISTD_H_GETOPT@/1/
 /^GNULIB_UNISTD_H_SIGPIPE *=/s/@GNULIB_UNISTD_H_SIGPIPE@/0/
@@ -142,6 +250,14 @@ am__cd = cd
 /^GNULIB_UNSETENV *=/s/@GNULIB_UNSETENV@/1/
 /^GNULIB_USLEEP *=/s/@GNULIB_USLEEP@/0/
 /^GNULIB_UTIMENSAT *=/s/@GNULIB_UTIMENSAT@/0/
+/^GNULIB_VASPRINTF *=/s/@GNULIB_VASPRINTF@/0/
+/^GNULIB_VDPRINTF *=/s/@GNULIB_VDPRINTF@/0/
+/^GNULIB_VFPRINTF *=/s/@GNULIB_VFPRINTF@/0/
+/^GNULIB_VFPRINTF_POSIX *=/s/@GNULIB_VFPRINTF_POSIX@/0/
+/^GNULIB_VPRINTF *=/s/@GNULIB_VPRINTF@/0/
+/^GNULIB_VPRINTF_POSIX *=/s/@GNULIB_VPRINTF_POSIX@/0/
+/^GNULIB_VSNPRINTF *=/s/@GNULIB_VSNPRINTF@/0/
+/^GNULIB_VSPRINTF_POSIX *=/s/@GNULIB_VSPRINTF_POSIX@/0/
 /^GNULIB_WCTOMB *=/s/@GNULIB_WCTOMB@/0/
 /^GNULIB_WRITE *=/s/@GNULIB_WRITE@/0/
 /^GNULIB__EXIT *=/s/@GNULIB__EXIT@/0/
@@ -150,15 +266,24 @@ am__cd = cd
 /^HAVE_CHOWN *=/s/@HAVE_CHOWN@/1/
 /^HAVE_DECL_ENVIRON *=/s/@HAVE_DECL_ENVIRON@/1/
 /^HAVE_DECL_FCHDIR *=/s/@HAVE_DECL_FCHDIR@/0/
+/^HAVE_DECL_FPURGE *=/s/@HAVE_DECL_FPURGE@//
+/^HAVE_DECL_FSEEKO *=/s/@HAVE_DECL_FSEEKO@/0/
+/^HAVE_DECL_FTELLO *=/s/@HAVE_DECL_FTELLO@/0/
+/^HAVE_DECL_GETDELIM *=/s/@HAVE_DECL_GETDELIM@/0/
 /^HAVE_DECL_GETDOMAINNAME *=/s/@HAVE_DECL_GETDOMAINNAME@/0/
+/^HAVE_DECL_GETLINE *=/s/@HAVE_DECL_GETLINE@/0/
 /^HAVE_DECL_GETLOADAVG *=/s/@HAVE_DECL_GETLOADAVG@/0/
 /^HAVE_DECL_GETLOGIN_R *=/s/@HAVE_DECL_GETLOGIN_R@/0/
 /^HAVE_DECL_GETPAGESIZE *=/s/@HAVE_DECL_GETPAGESIZE@/1/
 /^HAVE_DECL_GETUSERSHELL *=/s/@HAVE_DECL_GETUSERSHELL@/0/
 /^HAVE_DECL_LOCALTIME_R *=/s/@HAVE_DECL_LOCALTIME_R@/0/
+/^HAVE_DECL_OBSTACK_PRINTF *=/s/@HAVE_DECL_OBSTACK_PRINTF@/0/
 /^HAVE_DECL_SETENV *=/s/@HAVE_DECL_SETENV@/1/
+/^HAVE_DECL_SNPRINTF *=/s/@HAVE_DECL_SNPRINTF@/0/
 /^HAVE_DECL_TTYNAME_R *=/s/@HAVE_DECL_TTYNAME_R@/0/
 /^HAVE_DECL_UNSETENV *=/s/@HAVE_DECL_UNSETENV@/0/
+/^HAVE_DECL_VSNPRINTF *=/s/@HAVE_DECL_VSNPRINTF@/0/
+/^HAVE_DPRINTF *=/s/@HAVE_DPRINTF@/0/
 /^HAVE_DUP2 *=/s/@HAVE_DUP2@/1/
 /^HAVE_DUP3 *=/s/@HAVE_DUP3@/0/
 /^HAVE_EUIDACCESS *=/s/@HAVE_EUIDACCESS@/0/
@@ -166,8 +291,10 @@ am__cd = cd
 /^HAVE_FCHDIR *=/s/@HAVE_FCHDIR@/0/
 /^HAVE_FCHMODAT *=/s/@HAVE_FCHMODAT@/0/
 /^HAVE_FCHOWNAT *=/s/@HAVE_FCHOWNAT@/0/
+/^HAVE_FSEEKO *=/s/@HAVE_FSEEKO@/0/
 /^HAVE_FSTATAT *=/s/@HAVE_FSTATAT@/0/
 /^HAVE_FSYNC *=/s/@HAVE_FSYNC@/1/
+/^HAVE_FTELLO *=/s/@HAVE_FTELLO@/0/
 /^HAVE_FTRUNCATE *=/s/@HAVE_FTRUNCATE@/1/
 /^HAVE_FUTIMENS *=/s/@HAVE_FUTIMENS@/0/
 /^HAVE_GETDTABLESIZE *=/s/@HAVE_GETDTABLESIZE@/0/
@@ -208,6 +335,7 @@ am__cd = cd
 /^HAVE_READLINK *=/s/@HAVE_READLINK@/0/
 /^HAVE_READLINKAT *=/s/@HAVE_READLINKAT@/0/
 /^HAVE_REALPATH *=/s/@HAVE_REALPATH@/0/
+/^HAVE_RENAMEAT *=/s/@HAVE_RENAMEAT@/0/
 /^HAVE_RPMATCH *=/s/@HAVE_RPMATCH@/0/
 /^HAVE_SETENV *=/s/@HAVE_SETENV@/1/
 /^HAVE_SIGNED_SIG_ATOMIC_T *=/s/@HAVE_SIGNED_SIG_ATOMIC_T@/1/
@@ -234,6 +362,8 @@ am__cd = cd
 /^HAVE_UNSIGNED_LONG_LONG_INT *=/s/@HAVE_UNSIGNED_LONG_LONG_INT@/1/
 /^HAVE_USLEEP *=/s/@HAVE_USLEEP@/1/
 /^HAVE_UTIMENSAT *=/s/@HAVE_UTIMENSAT@/0/
+/^HAVE_VASPRINTF *=/s/@HAVE_VASPRINTF@/0/
+/^HAVE_VDPRINTF *=/s/@HAVE_VDPRINTF@/0/
 /^HAVE_WCHAR_H *=/s/@HAVE_WCHAR_H@/1/
 /^HAVE_WCHAR_T *=/s/@HAVE_WCHAR_T@/1/
 /^HAVE_XSERVER *=/s/@HAVE_XSERVER@/0/
@@ -250,12 +380,14 @@ am__cd = cd
 /^NEXT_AS_FIRST_DIRECTIVE_GETOPT_H *=/s/@[^@\n]*@/<getopt.h>/
 /^NEXT_AS_FIRST_DIRECTIVE_STDDEF_H *=/s/@[^@\n]*@//
 /^NEXT_AS_FIRST_DIRECTIVE_STDINT_H *=/s/@[^@\n]*@/<stdint.h>/
+/^NEXT_AS_FIRST_DIRECTIVE_STDIO_H *=/s/@[^@\n]*@/<stdio.h>/
 /^NEXT_AS_FIRST_DIRECTIVE_STDLIB_H *=/s/@[^@\n]*@/<stdlib.h>/
 /^NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H *=/s!@[^@\n]*@!<sys/stat.h>!
 /^NEXT_AS_FIRST_DIRECTIVE_TIME_H *=/s/@[^@\n]*@/<time.h>/
 /^NEXT_AS_FIRST_DIRECTIVE_UNISTD_H *=/s/@[^@\n]*@/<unistd.h>/
 /^NEXT_GETOPT_H *=/s/@[^@\n]*@/<getopt.h>/
 /^NEXT_STDDEF_H *=/s/@[^@\n]*@//
+/^NEXT_STDIO_H *=/s/@[^@\n]*@/<stdio.h>/
 /^NEXT_STDINT_H *=/s/@[^@\n]*@/<stdint.h>/
 /^NEXT_STDLIB_H *=/s/@[^@\n]*@/<stdlib.h>/
 /^NEXT_SYS_STAT_H *=/s!@[^@\n]*@!<sys/stat.h>!
@@ -270,13 +402,27 @@ am__cd = cd
 /^REPLACE_CANONICALIZE_FILE_NAME *=/s/@REPLACE_CANONICALIZE_FILE_NAME@/0/
 /^REPLACE_CHOWN *=/s/@REPLACE_CHOWN@/0/
 /^REPLACE_CLOSE *=/s/@REPLACE_CLOSE@/0/
+/^REPLACE_DPRINTF *=/s/@REPLACE_DPRINTF@/0/
 /^REPLACE_DUP *=/s/@REPLACE_DUP@/0/
 /^REPLACE_DUP2 *=/s/@REPLACE_DUP2@/0/
 /^REPLACE_FCHOWNAT *=/s/@REPLACE_FCHOWNAT@/0/
+/^REPLACE_FCLOSE *=/s/@REPLACE_FCLOSE@/0/
+/^REPLACE_FFLUSH *=/s/@REPLACE_FFLUSH@/0/
+/^REPLACE_FOPEN *=/s/@REPLACE_FOPEN@/0/
+/^REPLACE_FPRINTF *=/s/@REPLACE_FPRINTF@/0/
+/^REPLACE_FPURGE *=/s/@REPLACE_FPURGE@/0/
+/^REPLACE_FREOPEN *=/s/@REPLACE_FREOPEN@/0/
+/^REPLACE_FSEEK *=/s/@REPLACE_FSEEK@/0/
+/^REPLACE_FSEEKO *=/s/@REPLACE_FSEEKO@/0/
 /^REPLACE_FSTAT *=/s/@REPLACE_FSTAT@/0/
+/^REPLACE_FSTATAT *=/s/@REPLACE_FSTATAT@/0/
+/^REPLACE_FTELL *=/s/@REPLACE_FTELL@/0/
+/^REPLACE_FTELLO *=/s/@REPLACE_FTELLO@/0/
 /^REPLACE_GETCWD *=/s/@REPLACE_GETCWD@/0/
+/^REPLACE_GETDELIM *=/s/@REPLACE_GETDELIM@/0/
 /^REPLACE_GETDOMAINNAME *=/s/@REPLACE_GETDOMAINNAME@/0/
 /^REPLACE_GETGROUPS *=/s/@REPLACE_GETGROUPS@/0/
+/^REPLACE_GETLINE *=/s/@REPLACE_GETLINE@/0/
 /^REPLACE_GETLOGIN_R *=/s/@REPLACE_GETLOGIN_R@/0/
 /^REPLACE_GETPAGESIZE *=/s/@REPLACE_GETPAGESIZE@/0/
 /^REPLACE_LCHOWN *=/s/@REPLACE_LCHOWN@/0/
@@ -294,25 +440,42 @@ am__cd = cd
 /^REPLACE_MKTIME *=/s/@REPLACE_MKTIME@/0/
 /^REPLACE_NANOSLEEP *=/s/@REPLACE_NANOSLEEP@/0/
 /^REPLACE_NULL *=/s/@REPLACE_NULL@/0/
+/^REPLACE_OBSTACK_PRINTF *=/s/@REPLACE_OBSTACK_PRINTF@/0/
+/^REPLACE_PERROR *=/s/@REPLACE_PERROR@/0/
+/^REPLACE_POPEN *=/s/@REPLACE_POPEN@/0/
 /^REPLACE_PREAD *=/s/@REPLACE_PREAD@/0/
+/^REPLACE_PRINTF *=/s/@REPLACE_PRINTF@/0/
 /^REPLACE_PUTENV *=/s/@REPLACE_PUTENV@/0/
 /^REPLACE_PWRITE *=/s/@REPLACE_PWRITE@/0/
 /^REPLACE_READLINK *=/s/@REPLACE_READLINK@/0/
 /^REPLACE_REALLOC *=/s/@REPLACE_REALLOC@/0/
 /^REPLACE_REALPATH *=/s/@REPLACE_REALPATH@/0/
+/^REPLACE_REMOVE *=/s/@REPLACE_REMOVE@/0/
+/^REPLACE_RENAME *=/s/@REPLACE_RENAME@/0/
+/^REPLACE_RENAMEAT *=/s/@REPLACE_RENAMEAT@/0/
 /^REPLACE_RMDIR *=/s/@REPLACE_RMDIR@/0/
 /^REPLACE_SETENV *=/s/@REPLACE_SETENV@/0/
 /^REPLACE_SLEEP *=/s/@REPLACE_SLEEP@/0/
+/^REPLACE_SNPRINTF *=/s/@REPLACE_SNPRINTF@/0/
+/^REPLACE_SPRINTF *=/s/@REPLACE_SPRINTF@/0/
 /^REPLACE_STAT *=/s/@REPLACE_STAT@/0/
+/^REPLACE_STDIO_WRITE_FUNCS *=/s/@REPLACE_STDIO_WRITE_FUNCS@/0/
 /^REPLACE_STRTOD *=/s/@REPLACE_STRTOD@/0/
 /^REPLACE_SYMLINK *=/s/@REPLACE_SYMLINK@/0/
 /^REPLACE_TIMEGM *=/s/@REPLACE_TIMEGM@/0/
+/^REPLACE_TMPFILE *=/s/@REPLACE_TMPFILE@/0/
 /^REPLACE_TTYNAME_R *=/s/@REPLACE_TTYNAME_R@/0/
 /^REPLACE_UNLINK *=/s/@REPLACE_UNLINK@/0/
 /^REPLACE_UNLINKAT *=/s/@REPLACE_UNLINKAT@/0/
 /^REPLACE_UNSETENV *=/s/@REPLACE_UNSETENV@/0/
 /^REPLACE_USLEEP *=/s/@REPLACE_USLEEP@/0/
 /^REPLACE_UTIMENSAT *=/s/@REPLACE_UTIMENSAT@/0/
+/^REPLACE_VASPRINTF *=/s/@REPLACE_VASPRINTF@/0/
+/^REPLACE_VDPRINTF *=/s/@REPLACE_VDPRINTF@/0/
+/^REPLACE_VFPRINTF *=/s/@REPLACE_VFPRINTF@/0/
+/^REPLACE_VPRINTF *=/s/@REPLACE_VPRINTF@/0/
+/^REPLACE_VSNPRINTF *=/s/@REPLACE_VSNPRINTF@/0/
+/^REPLACE_VSPRINTF *=/s/@REPLACE_VSPRINTF@/0/
 /^REPLACE_WCTOMB *=/s/@REPLACE_WCTOMB@/0/
 /^REPLACE_WRITE *=/s/@REPLACE_WRITE@/0/
 /^SIG_ATOMIC_T_SUFFIX *=/s/@SIG_ATOMIC_T_SUFFIX@//
@@ -368,10 +531,13 @@ s/^	[ 	]*{ echo \(.*\) && \\/	 djecho \1 > $@-t/
 s/ \&\& \\ *$//
 s/\.in-h\;  *\\$/.in-h >> $@-t/
 /^      [       ]*} /d
+/^stdio\.h:/,/^ [       ]*mv /{
+  s/'\; \\ *$/' >> $@-t/
+}
 /^stdlib\.h:/,/^        [       ]*mv /{
  s/'\; \\ *$/' >> $@-t/
 }
 /^unistd\.h:/,/^        [       ]*mv /{
  s/'\; \\ *$/' >> $@-t/
 }
-s!\$(MKDIR_P)[  ][      ]*sys!command.com /c "if not exist sys\stat.h md sys"!
+s!\$(MKDIR_P)[  ][      ]*sys!command.com /c "if not exist sys\\stat.h md sys"!
diff --git a/nt/ChangeLog b/nt/ChangeLog
index e55fc52a487..a0603fd7c26 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,18 @@
+2011-03-27  Glenn Morris  <rgm@gnu.org>
+        * config.nt: Remove RETSIGTYPE, SIGTYPE (identical to void).
+2011-03-25  Juanma Barranquero  <lekktu@gmail.com>
+        * addpm.c (main): Remove unused variable `retval'.
+        * preprep.c (main): Remove unused variable `ptr'.
+2011-03-23  Juanma Barranquero  <lekktu@gmail.com>
+        * cmdproxy.c: Include <ctype.h>.
+        (make_absolute): Remove unused variable `i'.
 2011-02-27  Eli Zaretskii  <eliz@gnu.org>
        * inc/unistd.h (readlink, symlink): Declare prototypes.
diff --git a/nt/addpm.c b/nt/addpm.c
index c2cd1a07abc..d7919d36f80 100644
--- a/nt/addpm.c
+++ b/nt/addpm.c
@@ -274,8 +274,6 @@ main (int argc, char *argv[])
    {
      if (strlen (start_folder) < (MAX_PATH - 20))
        {
-          BOOL retval;
          strcat (start_folder, "\\Gnu Emacs");
          if (CreateDirectory (start_folder, NULL)
              || GetLastError () == ERROR_ALREADY_EXISTS)
@@ -307,8 +305,6 @@ main (int argc, char *argv[])
      /* Ensure there is enough room for "...\GNU Emacs\Emacs.lnk".  */
      if (strlen (start_folder) < (MAX_PATH - 20))
        {
-          BOOL retval;
          strcat (start_folder, "\\Gnu Emacs");
          if (CreateDirectory (start_folder, NULL)
              || GetLastError () == ERROR_ALREADY_EXISTS)
diff --git a/nt/cmdproxy.c b/nt/cmdproxy.c
index 9a98e1e5034..b9572570c5f 100644
--- a/nt/cmdproxy.c
+++ b/nt/cmdproxy.c
@@ -33,6 +33,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <malloc.h>  /* alloca */
 #include <stdlib.h>  /* getenv */
 #include <string.h>  /* strlen */
+#include <ctype.h>   /* isspace, isalpha */
 /* We don't want to include stdio.h because we are already duplicating
   lots of it here */
@@ -251,7 +252,6 @@ make_absolute (const char *prog)
  char curdir[MAX_PATH];
  char *p, *path;
  const char *fname;
-  int i;
  /* At least partial absolute path specified; search there.  */
  if ((isalpha (prog[0]) && prog[1] == ':') ||
diff --git a/nt/config.nt b/nt/config.nt
index 26fbc1c67c5..1d9a5faaf2c 100644
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -393,15 +393,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #undef STACK_DIRECTION
 #endif
-/* Define the return type of signal handlers if the s-xxx file
-   did not already do so.  */
-#define RETSIGTYPE void
-/* SIGTYPE is the macro we actually use.  */
-#ifndef SIGTYPE
-#define SIGTYPE RETSIGTYPE
-#endif
 #ifdef emacs /* Don't do this for lib-src.  */
 /* Tell regex.c to use a type compatible with Emacs.  */
 #define RE_TRANSLATE_TYPE Lisp_Object
diff --git a/nt/preprep.c b/nt/preprep.c
index 513ad14e966..6b764afdeab 100644
--- a/nt/preprep.c
+++ b/nt/preprep.c
@@ -765,7 +765,6 @@ main (int argc, char **argv)
  PIMAGE_NT_HEADERS nt_header;
  file_data in_file, out_file;
  char out_filename[MAX_PATH], in_filename[MAX_PATH];
-  const char *ptr;
  strcpy (in_filename, argv[1]);
  strcpy (out_filename, argv[2]);
diff --git a/src/ChangeLog.trunk b/src/ChangeLog.trunk
index 6fa2d821565..a6623803a6e 100644
--- a/src/ChangeLog.trunk
+++ b/src/ChangeLog.trunk
@@ -1,3 +1,431 @@
+2011-03-30  Stefan Monnier  <monnier@iro.umontreal.ca>
+        * eval.c (struct backtrace): Don't cheat with negative numbers, but do
+        steal a few bits to be more compact.
+        (interactive_p, Fbacktrace, Fbacktrace_frame, mark_backtrace):
+        Remove unneeded casts.
+        * bytecode.c (Fbyte_code): CAR and CDR can GC.
+2011-03-30  Zachary Kanfer  <zkanfer@gmail.com>  (tiny change)
+        * keyboard.c (Fexecute_extended_command): Do log the "suggest key
+        binding" message (bug#7967).
+2011-03-30  Paul Eggert  <eggert@cs.ucla.edu>
+        Fix more problems found by GCC 4.6.0's static checks.
+        * unexelf.c (unexec) [! (defined _SYSTYPE_SYSV || defined __sgi)]:
+        Remove unused local var.
+        * editfns.c (Fmessage_box): Remove unused local var.
+        * xdisp.c (try_window_reusing_current_matrix, x_produce_glyphs):
+        (note_mode_line_or_margin_highlight, note_mouse_highlight):
+        Omit unused local vars.
+        * window.c (shrink_windows): Omit unused local var.
+        * menu.c (digest_single_submenu): Omit unused local var.
+        * dispnew.c (update_window) [PERIODIC_PREEMPTION_CHECKING]:
+        Omit unused local var.
+        * keyboard.c (parse_modifiers_uncached, parse_modifiers):
+        Don't assume string length fits in int.
+        (keyremap_step, read_key_sequence): Use size_t for sizes.
+        (read_key_sequence): Don't check last_real_key_start redundantly.
+        * callproc.c (Fcall_process, Fcall_process_region): Use SAFE_ALLOCA
+        instead of alloca (Bug#8344).
+        * eval.c (Fbacktrace): Don't assume nargs fits in int.
+        (Fbacktrace_frame): Don't assume nframes fits in int.
+        * syntax.c (scan_sexps_forward): Avoid pointer wraparound.
+        * xterm.c (x_make_frame_visible, same_x_server): Redo to avoid overflow
+        concerns.
+        * term.c (produce_glyphless_glyph): Remove unnecessary test.
+        * cm.c (calccost): Turn while-do into do-while, for clarity.
+        * keyboard.c (syms_of_keyboard): Use the same style as later
+        in this function when indexing through an array.  This also
+        works around GCC bug 48267.
+        * image.c (tiff_load): Fix off-by-one image count (Bug#8336).
+        * xselect.c (x_check_property_data): Return correct size (Bug#8335).
+        * chartab.c (sub_char_table_ref_and_range): Redo for slight
+        efficiency gain, and to bypass a gcc -Wstrict-overflow warning.
+        * keyboard.c, keyboard.h (num_input_events): Now size_t.
+        This avoids undefined behavior on integer overflow, and is a bit
+        more convenient anyway since it is compared to a size_t variable.
+        Variadic C functions now count arguments with size_t, not int.
+        This avoids an unnecessary limitation on 64-bit machines, which
+        caused (substring ...) to crash on large vectors (Bug#8344).
+        * lisp.h (struct Lisp_Subr.function.aMANY): Now takes size_t, not int.
+        (DEFUN_ARGS_MANY, internal_condition_case_n, safe_call): Likewise.
+        All variadic functions and their callers changed accordingly.
+        (struct gcpro.nvars): Now size_t, not int.  All uses changed.
+        * data.c (arith_driver, float_arith_driver): Likewise.
+        * editfns.c (general_insert_function): Likewise.
+        * eval.c (struct backtrace.nargs, interactive_p)
+        (internal_condition_case_n, run_hook_with_args, apply_lambda)
+        (funcall_lambda, mark_backtrace): Likewise.
+        * fns.c (concat): Likewise.
+        * frame.c (x_set_frame_parameters): Likewise.
+        * fns.c (get_key_arg): Now accepts and returns size_t, and returns
+        0 if not found, not -1.  All callers changed.
+        * alloc.c (garbage_collect): Don't assume stack size fits in int.
+        (stack_copy_size): Now size_t, not int.
+        (stack_copy, stack_copy_size): Define only if MAX_SAVE_STACK > 0.
+2011-03-28  Juanma Barranquero  <lekktu@gmail.com>
+        * coding.c (encode_designation_at_bol): Remove parameter `charbuf_end',
+        unused since 2002-03-01T01:17:24Z!handa@m17n.org and 2008-02-01T16:01:31Z!miles@gnu.org.
+        All callers changed.
+        * lisp.h (multibyte_char_to_unibyte):
+        * character.c (multibyte_char_to_unibyte): Remove parameter `rev_tbl',
+        unused since 2002-03-01T01:16:34Z!handa@m17n.org and 2008-02-01T16:01:31Z!miles@gnu.org.
+        * character.h (CHAR_TO_BYTE8):
+        * cmds.c (internal_self_insert):
+        * editfns.c (general_insert_function):
+        * keymap.c (push_key_description):
+        * search.c (Freplace_match):
+        * xdisp.c (message_dolog, set_message_1): All callers changed.
+2011-03-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+        * keyboard.c (safe_run_hook_funcall): New function.
+        (safe_run_hooks_1, safe_run_hooks_error, safe_run_hooks): On error,
+        don't set the hook to nil, but remove the offending function instead.
+        (Qcommand_hook_internal): Remove, unused.
+        (syms_of_keyboard): Don't initialize Qcommand_hook_internal nor define
+        Vcommand_hook_internal.
+        * eval.c (enum run_hooks_condition): Remove.
+        (funcall_nil, funcall_not): New functions.
+        (run_hook_with_args): Call each function through a `funcall' argument.
+        Remove `cond' argument, now redundant.
+        (Frun_hooks, Frun_hook_with_args, Frun_hook_with_args_until_success)
+        (Frun_hook_with_args_until_failure): Adjust accordingly.
+        (run_hook_wrapped_funcall, Frun_hook_wrapped): New functions.
+2011-03-28  Juanma Barranquero  <lekktu@gmail.com>
+        * dispextern.h (string_buffer_position): Remove declaration.
+        * print.c (strout): Remove parameter `multibyte', unused since
+        1999-08-21T19:30:21Z!gerd@gnu.org.  All callers changed.
+        * search.c (boyer_moore): Remove parameters `len', `pos' and `lim',
+        never used since function introduction in 1998-02-08T21:33:56Z!rms@gnu.org.
+        All callers changed.
+        * w32.c (_wsa_errlist): Use braces for struct initializers.
+        * xdisp.c (string_buffer_position_lim): Remove parameter `w',
+        never used since function introduction in 2001-03-09T18:41:50Z!gerd@gnu.org.
+        All callers changed.
+        (string_buffer_position): Likewise.  Also, make static (it's never
+        used outside xdisp.c).
+        (cursor_row_p): Remove parameter `w', unused since
+        2000-10-17T16:08:57Z!gerd@gnu.org.  All callers changed.
+        (decode_mode_spec): Remove parameter `precision', introduced during
+        Gerd Moellmann's rewrite at 1999-07-21T21:43:52Z!gerd@gnu.org, but never used.
+        All callers changed.
+2011-03-27  Jan Djärv  <jan.h.d@swipnet.se>
+        * nsterm.m (syms_of_nsterm): Use doc: for ns-auto-hide-menu-bar.
+2011-03-27  Anders Lindgren  <andlind@gmail.com>
+        * nsterm.m (ns_menu_bar_is_hidden): New variable.
+        (ns_constrain_all_frames, ns_menu_bar_should_be_hidden)
+        (ns_update_auto_hide_menu_bar): New functions.
+        (ns_update_begin): Call ns_update_auto_hide_menu_bar.
+        (applicationDidBecomeActive): Call ns_update_auto_hide_menu_bar and
+        ns_constrain_all_frames.
+        (constrainFrameRect): Return at once if ns_menu_bar_should_be_hidden.
+        (syms_of_nsterm): DEFVAR ns-auto-hide-menu-bar, init to Qnil.
+2011-03-27  Jan Djärv  <jan.h.d@swipnet.se>
+        * nsmenu.m (runDialogAt): Remove argument to timer_check.
+2011-03-27  Glenn Morris  <rgm@gnu.org>
+        * syssignal.h: Replace RETSIGTYPE with void.
+        * atimer.c, data.c, dispnew.c, emacs.c, floatfns.c, keyboard.c:
+        * keyboard.h, lisp.h, process.c, sysdep.c, xterm.c:
+        Replace SIGTYPE with void everywhere.
+        * s/usg5-4-common.h (SIGTYPE): Remove definition.
+        * s/template.h (SIGTYPE): Remove commented out definition.
+2011-03-26  Eli Zaretskii  <eliz@gnu.org>
+        * xdisp.c (redisplay_window): Don't check buffer's clip_changed
+        flag as a prerequisite for invoking try_scrolling.  (Bug#6671)
+2011-03-26  Juanma Barranquero  <lekktu@gmail.com>
+        * w32.c (read_unc_volume): Use parameter `henum', instead of
+        global variable `wget_enum_handle'.
+        * keymap.c (describe_vector): Remove parameters `indices' and
+        `char_table_depth', unused since 2002-03-01T01:43:26Z!handa@m17n.org.
+        (describe_map, Fdescribe_vector): Adjust calls to `describe_vector'.
+        * keyboard.h (timer_check, show_help_echo): Remove unused parameters.
+        * keyboard.c (timer_check): Remove parameter `do_it_now',
+        unused since 1996-04-12T06:01:29Z!rms@gnu.org.
+        (show_help_echo): Remove parameter `ok_to_overwrite_keystroke_echo',
+        unused since 2008-04-19T19:30:53Z!monnier@iro.umontreal.ca.
+        * keyboard.c (read_char):
+        * w32menu.c (w32_menu_display_help):
+        * xmenu.c (show_help_event, menu_help_callback):
+        Adjust calls to `show_help_echo'.
+        * gtkutil.c (xg_maybe_add_timer):
+        * keyboard.c (readable_events):
+        * process.c (wait_reading_process_output):
+        * xmenu.c (x_menu_wait_for_event): Adjust calls to `timer_check'.
+        * insdel.c (adjust_markers_gap_motion):
+        Remove; no-op since 1998-01-02T21:29:48Z!rms@gnu.org.
+        (gap_left, gap_right): Don't call it.
+2011-03-25  Chong Yidong  <cyd@stupidchicken.com>
+        * xdisp.c (handle_fontified_prop): Discard changes to clip_changed
+        incurred during fontification.
+2011-03-25  Juanma Barranquero  <lekktu@gmail.com>
+        * buffer.c (defvar_per_buffer): Remove unused parameter `doc'.
+        (DEFVAR_PER_BUFFER): Don't pass it.
+        * dispnew.c (row_equal_p, add_row_entry): Remove unused parameter `w'.
+        (scrolling_window): Don't pass it.
+2011-03-25  Juanma Barranquero  <lekktu@gmail.com>
+        * dispextern.h (glyph_matric): Use #if GLYPH_DEBUG, not #ifdef.
+        * fileio.c (check_executable) [DOS_NT]: Remove unused variables `len'
+        and `suffix'.
+        (Fset_file_selinux_context) [HAVE_LIBSELINUX]: Move here declaration
+        of variables specific to SELinux and computation of `encoded_absname'.
+        * image.c (XPutPixel): Remove unused variable `height'.
+        * keyboard.c (make_lispy_event): Remove unused variable `hpos'.
+        * unexw32.c (get_section_info): Remove unused variable `section'.
+        * w32.c (stat): Remove unused variables `drive_root' and `devtype'.
+        (system_process_attributes): Remove unused variable `sess'.
+        (sys_read): Remove unused variable `err'.
+        * w32fns.c (top): Wrap variables with #if GLYPH_DEBUG, not #ifdef.
+        (w32_wnd_proc): Remove unused variable `isdead'.
+        (unwind_create_frame): Use #if GLYPH_DEBUG, not #ifdef.
+        (Fx_server_max_request_size): Remove unused variable `dpyinfo'.
+        (x_create_tip_frame): Remove unused variable `tem'.
+        * w32inevt.c (w32_console_read_socket):
+        Remove unused variable `no_events'.
+        * w32term.c (x_draw_composite_glyph_string_foreground):
+        Remove unused variable `width'.
+2011-03-24  Juanma Barranquero  <lekktu@gmail.com>
+        * w32term.c (x_set_glyph_string_clipping):
+        Don't pass uninitialized region to CombineRgn.
+2011-03-23  Juanma Barranquero  <lekktu@gmail.com>
+        * w32fns.c (x_set_menu_bar_lines): Remove unused variable `olines'.
+        (w32_wnd_proc): Pass NULL to Windows API, not uninitialized buffer.
+        (Fx_close_connection): Remove unused variable `i'.
+        * w32font.c (w32font_draw): Return number of glyphs.
+        (w32font_open_internal): Remove unused variable `i'.
+        (w32font_driver): Add missing initializer.
+        * w32menu.c (utf8to16): Remove unused variable `utf16'.
+        (fill_in_menu): Remove unused variable `items_added'.
+        * w32term.c (last_mouse_press_frame): Remove static global variable.
+        (w32_clip_to_row): Remove unused variable `f'.
+        (x_delete_terminal): Remove unused variable `i'.
+        * w32uniscribe.c (uniscribe_shape): Remove unused variable `nclusters'.
+        (NOTHING): Remove unused static global variable.
+        (uniscribe_check_otf): Remove unused variable `table'.
+        (uniscribe_font_driver): Add missing initializers.
+2011-03-23  Julien Danjou  <julien@danjou.info>
+        * term.c (Fsuspend_tty, Fresume_tty):
+        * minibuf.c (read_minibuf, run_exit_minibuf_hook):
+        * window.c (temp_output_buffer_show):
+        * insdel.c (signal_before_change):
+        * frame.c (Fhandle_switch_frame):
+        * fileio.c (Fdo_auto_save):
+        * emacs.c (Fkill_emacs):
+        * editfns.c (save_excursion_restore):
+        * cmds.c (internal_self_insert):
+        * callint.c (Fcall_interactively):
+        * buffer.c (Fkill_all_local_variables):
+        * keyboard.c (Fcommand_execute, Fsuspend_emacs, safe_run_hooks_1):
+        Use Frun_hooks.
+        (command_loop_1): Use Frun_hooks.  Call safe_run_hooks
+        unconditionnaly since it does the check itself.
+2011-03-23  Paul Eggert  <eggert@cs.ucla.edu>
+        Fix more problems found by GCC 4.5.2's static checks.
+        * coding.c (encode_coding_raw_text): Avoid unnecessary test
+        the first time through the loop, since we know p0 < p1 then.
+        This also avoids a gcc -Wstrict-overflow warning.
+        * lisp.h (SAFE_ALLOCA, SAFE_ALLOCA_LISP): Avoid 'int' overflow
+        leading to a memory leak, possible in functions like
+        load_charset_map_from_file that can allocate an unbounded number
+        of objects (Bug#8318).
+        * xmenu.c (set_frame_menubar): Use EMACS_UINT, not int, for indexes
+        that could (at least in theory) be that large.
+        * xdisp.c (message_log_check_duplicate): Return unsigned long, not int.
+        This is less likely to overflow, and avoids undefined behavior if
+        overflow does occur.  All callers changed.  Use strtoul to scan
+        for the unsigned long integer.
+        (pint2hrstr): Simplify and tune code slightly.
+        This also avoids a (bogus) GCC warning with gcc -Wstrict-overflow.
+        * scroll.c (do_scrolling): Work around GCC bug 48228.
+        See <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48228>.
+        * frame.c (Fmodify_frame_parameters): Simplify loop counter.
+        This also avoids a warning with gcc -Wstrict-overflow.
+        (validate_x_resource_name): Simplify count usage.
+        This also avoids a warning with gcc -Wstrict-overflow.
+        * fileio.c (Fcopy_file): Report error if fchown or fchmod
+        fail (Bug#8306).
+        * emacs.c (Fdaemon_initialized): Do not ignore I/O errors (Bug#8303).
+        * process.c (Fmake_network_process): Use socklen_t, not int,
+        where POSIX says socklen_t is required in portable programs.
+        This fixes a porting bug on hosts like 64-bit HP-UX, where
+        socklen_t is wider than int (Bug#8277).
+        (Fmake_network_process, server_accept_connection):
+        (wait_reading_process_output, read_process_output):
+        Likewise.
+        * process.c: Rename or move locals to avoid shadowing.
+        (list_processes_1, Fmake_network_process):
+        (read_process_output_error_handler, exec_sentinel_error_handler):
+        Rename or move locals.
+        (Fmake_network_process): Define label "retry_connect" only if needed.
+        (Fnetwork_interface_info): Fix pointer signedness.
+        (process_send_signal): Add cast to avoid pointer signedness problem.
+        (FIRST_PROC_DESC, IF_NON_BLOCKING_CONNECT): Remove unused macros.
+        (create_process): Use 'volatile' to avoid vfork clobbering (Bug#8298).
+        Make tparam.h and terminfo.c consistent.
+        * cm.c (tputs, tgoto, BC, UP): Remove extern decls.
+        Include tparam.h instead, since it declares them.
+        * cm.h (PC): Remove extern decl; tparam.h now does this.
+        * deps.mk (cm.o, terminfo.o): Depend on tparam.h.
+        * terminfo.c: Include tparam.h, to check interfaces.
+        (tparm): Make 1st arg a const pointer in decl.  Put it at top level.
+        (tparam): Adjust signature to match interface in tparam.h;
+        this removes some undefined behavior.  Check that outstring and len
+        are zero, which they always are with Emacs.
+        * tparam.h (PC, BC, UP): New extern decls.
+        * xftfont.c (xftfont_shape): Now static, and defined only if needed.
+        (xftfont_open): Rename locals to avoid shadowing.
+        * ftfont.c (ftfont_resolve_generic_family): Fix pointer signedness.
+        (ftfont_otf_capability, ftfont_shape): Omit decls if not needed.
+        (OTF_TAG_SYM): Omit macro if not needed.
+        (ftfont_list): Remove unused local.
+        (get_adstyle_property, ftfont_pattern_entity):
+        (ftfont_lookup_cache, ftfont_open, ftfont_anchor_point):
+        Rename locals to avoid shadowing.
+        * xfont.c (xfont_list_family): Mark var as initialized.
+        * xml.c (make_dom): Now static.
+        * composite.c (composition_compute_stop_pos): Rename local to
+        avoid shadowing.
+        (composition_reseat_it): Remove unused locals.
+        (find_automatic_composition, composition_adjust_point): Likewise.
+        (composition_update_it): Mark var as initialized.
+        (find_automatic_composition): Mark vars as initialized,
+        with a FIXME (Bug#8290).
+        character.h: Rename locals to avoid shadowing.
+        * character.h (PREV_CHAR_BOUNDARY, FETCH_STRING_CHAR_ADVANCE):
+        (FETCH_STRING_CHAR_AS_MULTIBYTE_ADVANCE, FETCH_CHAR_ADVANCE):
+        (FETCH_CHAR_ADVANCE_NO_CHECK, INC_POS, DEC_POS, BUF_INC_POS):
+        (BUF_DEC_POS): Be more systematic about renaming local temporaries
+        to avoid shadowing.
+        * textprop.c (property_change_between_p): Remove; unused.
+        * intervals.c (interval_start_pos): Now static.
+        * intervals.h (CHECK_TOTAL_LENGTH): Avoid empty "else".
+        * atimer.c (start_atimer, append_atimer_lists, set_alarm):
+        Rename locals to avoid shadowing.
+        * sound.c (wav_play, au_play, Fplay_sound_internal):
+        Fix pointer signedness.
+        (alsa_choose_format): Remove unused local var.
+        (wav_play): Initialize a variable to 0, to prevent undefined
+        behavior (Bug#8278).
+        * region-cache.c (insert_cache_boundary): Redo var to avoid shadowing.
+        * region-cache.h (pp_cache): New decl, for gcc -Wmissing-prototypes.
+        * callproc.c (Fcall_process): Use 'volatile' to avoid vfork
+        clobbering (Bug#8298).
+        * sysdep.c (sys_subshell): Likewise.
+        Previously, the sys_subshell 'volatile' was incorrectly IF_LINTted out.
+        * lisp.h (child_setup): Now NO_RETURN unless DOS_NT.
+        This should get cleaned up, so that child_setup has the
+        same signature on all platforms.
+        * callproc.c (call_process_cleanup): Now static.
+        (relocate_fd): Rename locals to avoid shadowing.
+2011-03-22  Chong Yidong  <cyd@stupidchicken.com>
+        * xterm.c (x_clear_frame): Remove XClearWindow call.  This appears
+        not to be necessary, and produces flickering.
 2011-03-20  Glenn Morris  <rgm@gnu.org>
        * config.in: Remove file.
@@ -138,8 +566,8 @@
        gcc -Wbad-function-cast warning.
        (default_value, arithcompare, arith_driver, arith_error): Now static.
        (store_symval_forwarding): Rename local to avoid shadowing.
-        (Fmake_variable_buffer_local, Fmake_local_variable): Mark
+        (Fmake_variable_buffer_local, Fmake_local_variable):
-        variables as initialized.
+        Mark variables as initialized.
        (do_blv_forwarding, do_symval_forwarding): Remove; unused.
        * alloc.c (check_cons_list): Do not define unless GC_CHECK_CONS_LIST.
@@ -393,8 +821,8 @@
        (BUF_PT_BYTE): Rewrite to handle indirect buffers (Bug#8219).
        These macros can no longer be used for assignment.
-        * buffer.c (Fget_buffer_create, Fmake_indirect_buffer): Assign
+        * buffer.c (Fget_buffer_create, Fmake_indirect_buffer):
-        struct members directly, instead of using BUF_BEGV etc.
+        Assign struct members directly, instead of using BUF_BEGV etc.
        (record_buffer_markers, fetch_buffer_markers): New functions for
        recording and fetching special buffer markers.
        (set_buffer_internal_1, set_buffer_temp): Use them.
@@ -515,8 +943,8 @@
        * term.c (encode_terminal_code): Now external again, used by
        w32console.c and msdos.c.
-        * makefile.w32-in ($(BLD)/term.$(O), ($(BLD)/tparam.$(O)): Depend
+        * makefile.w32-in ($(BLD)/term.$(O), ($(BLD)/tparam.$(O)):
-        on $(SRC)/tparam.h, see 2011-03-11T07:24:21Z!eggert@cs.ucla.edu.
+        Depend on $(SRC)/tparam.h, see 2011-03-11T07:24:21Z!eggert@cs.ucla.edu.
 2011-03-11  Paul Eggert  <eggert@cs.ucla.edu>
@@ -580,8 +1008,8 @@
        (x_delete_glyphs, x_ins_del_lines): Mark with NO_RETURN.
        (x_connection_closed): Tell GCC not to suggest NO_RETURN.
-        * xfaces.c (clear_face_cache, Fx_list_fonts, Fface_font): Rename
+        * xfaces.c (clear_face_cache, Fx_list_fonts, Fface_font):
-        or move locals to avoid shadowing.
+        Rename or move locals to avoid shadowing.
        (tty_defined_color, merge_face_heights): Now static.
        (free_realized_faces_for_fontset): Remove; not used.
        (Fx_list_fonts): Mark variable that gcc -Wuninitialized
@@ -739,12 +1167,12 @@
        (xg_prepare_tooltip, xg_hide_tooltip): Call gdk_window_get_screen.
        (xg_prepare_tooltip, create_dialog, menubar_map_cb)
        (xg_update_frame_menubar, xg_tool_bar_detach_callback)
-        (xg_tool_bar_attach_callback, xg_update_tool_bar_sizes): Call
+        (xg_tool_bar_attach_callback, xg_update_tool_bar_sizes):
-        gtk_widget_get_preferred_size.
+        Call gtk_widget_get_preferred_size.
        (xg_frame_resized): gdk_window_get_geometry only takes 5
        parameters.
-        (xg_win_to_widget, xg_event_is_for_menubar): Call
+        (xg_win_to_widget, xg_event_is_for_menubar):
-        gdk_x11_window_lookup_for_display.
+        Call gdk_x11_window_lookup_for_display.
        (xg_set_widget_bg): New function.
        (delete_cb): New function.
        (xg_create_frame_widgets): connect delete-event to delete_cb.
@@ -840,7 +1268,7 @@
        (produce_glyphless_glyph): Make a pointer "const"
        since it might point to immutable storage.
        (update_window_cursor): Now static, since it's not used elsewhere.
-        (SKIP_GLYPHS): Removed unused macro.
+        (SKIP_GLYPHS): Remove unused macro.
 2011-03-06  Michael Shields  <shields@msrl.com>  (tiny change)
@@ -7337,7 +7765,7 @@
        * xterm.c (x_send_scroll_bar_event, SET_SAVED_MENU_EVENT)
        (handle_one_xevent, x_check_errors, xim_initialize, x_term_init):
        Likewise.
-        * character.h (BCOPY_SHORT): Removed.
+        * character.h (BCOPY_SHORT): Remove.
        * config.in: Regenerate.
        * dispnew.c (safe_bcopy): Only define as dummy if PROFILING.
        * emacs.c (main) [PROFILING]: Don't declare
@@ -10342,8 +10770,8 @@
        (POSIX_SIGNALS): Do not define.
        Remove support for old UNIX System V systems.
-        * s/unixware.h: Add the contents of s/usg-5-4-2.h.
+        * s/unixware.h: Add the contents of s/usg5-4-2.h.
-        * s/usg-5-4-2.h: Remove.
+        * s/usg5-4-2.h: Remove.
        Remove support for Solaris on PPC and for old versions.
        * s/sol2-6.h: Add the contents of s/sol-2.3.h, s/sol-2.4.h, s/sol-2.5.h.
@@ -19126,7 +19554,7 @@
        Set xftfont_info->ft_size.  Don't unlock the face.  Check BDF
        properties if appropriate.
        (xftfont_close): Unlock the face.
-        (xftfont_anchor_point, xftfont_shape): Deleted.
+        (xftfont_anchor_point, xftfont_shape): Delete.
        (syms_of_xftfont): Don't set members anchor_point and shape of
        xftfont_driver.
@@ -21031,7 +21459,7 @@
        Delete externs.
        (fontset_from_font_name): Extern it.
        (FS_LOAD_FONT, FONT_INFO_ID, FONT_INFO_FROM_ID)
-        (FONT_INFO_FROM_FACE): Deleted.
+        (FONT_INFO_FROM_FACE): Delete.
        (face_for_font): Adjust prototype.
        * fontset.c: Throughout the file, delete all USE_FONT_BACKEND
@@ -21048,7 +21476,7 @@
        (fontset_compare_rfontdef): New function.
        (reorder_font_vector): Remove the argument CHARSET-ID.  Sort
        rfont-defs by qsort.  Adjusted for the change of font-group vector.
-        (load_font_get_repertory): Deleted.
+        (load_font_get_repertory): Delete.
        (fontset_find_font): Use new macros to ref/set elements of
        font-def and rfont-def.
        (fontset_font): Fix the timing of remembering that no font for C.
@@ -21064,11 +21492,11 @@
        font-def.
        (Fnew_fontset): Use font_unparse_xlfd to generate
        FONTSET_ASCII (fontset).
-        (new_fontset_from_font_name): Deleted.
+        (new_fontset_from_font_name): Delete.
        (fontset_from_font): Rename from new_fontset_from_font.  Check if
        a fontset is already created for the font.  FIx updating of
        Vfontset_alias_alist.
-        (fontset_ascii_font): Deleted.
+        (fontset_ascii_font): Delete.
        (Ffont_info): Adjust for the format change of font-spec.
        (Finternal_char_font): Likewise.
        (Ffontset_info): Likewise.
@@ -21096,7 +21524,7 @@
        (ftfont_list): Return a list, not vector.
        (ftfont_match): Use ftfont_spec_pattern to get a pattern.
        (ftfont_list_family): Don't downcase names.
-        (ftfont_free_entity): Deleted.
+        (ftfont_free_entity): Delete.
        (ftfont_open): Return a font-object.  Adjusted for the change of
        struct font.  Get underline_thickness and underline_position from
        font property.  Don't update dpyinfo->smallest_font_height and
@@ -21148,13 +21576,13 @@
        (QCfoundry, QCadstyle, QCregistry, QCspacing, QCsize, QCavgwidth)
        (Qp): Extern them.
        (clear_font_table, load_face_font, xlfd_lookup_field_contents):
-        Deleted.
+        Delete.
-        (struct font_name): Deleted.
+        (struct font_name): Delete.
-        (xlfd_numeric_value, xlfd_symbolic_value): Deleted.
+        (xlfd_numeric_value, xlfd_symbolic_value): Delete.
        (compare_fonts_by_sort_order): New function.
        (xlfd_numeric_slant, xlfd_symbolic_slant, xlfd_numeric_weight)
        (xlfd_symbolic_weight, xlfd_numeric_swidth, xlfd_symbolic_swidth):
-        Deleted.
+        Delete.
        (Fx_family_fonts): Use font_list_entities, and sort fonts by
        compare_fonts_by_sort_order.
        (Fx_font_family_list): Call Ffont_family_list.
@@ -21167,9 +21595,9 @@
        (free_font_names, sort_fonts, x_face_list_fonts)
        (face_font_available_p, sorted_font_list, cmp_font_names)
        (font_list_1, concat_font_list, font_list, remove_duplicates):
-        Deleted.
+        Delete.
        (Fx_list_fonts): Use Ffont_list.
-        (LFACE_AVGWIDTH): Deleted.
+        (LFACE_AVGWIDTH): Delete.
        (check_lface_attrs): Don't check LFACE_AVGWIDTH.  Check LFACE_FONT
        by FONTP.
        (lface_fully_specified_p): Don't check LFACE_AVGWIDTH.
@@ -21191,7 +21619,7 @@
        (Fface_font): Get a font name from font->props[FONT_NAME_INDEX].
        (lface_same_font_attributes_p): Don't check LFACE_AVGWIDTH.
        Compare fonts by EQ.
-        (lookup_non_ascii_face): Deleted.
+        (lookup_non_ascii_face): Delete.
        (face_for_font): The 2nd argument changed.
        (x_supports_face_attributes_p): Don't check LFACE_AVGWIDTH.
        Check atomic font properties by case insensitive.
@@ -21214,7 +21642,7 @@
        * xfont.c: Include <stdlib.h> and "ccl.h".
        (struct xfont_info): New structure.
-        (xfont_query_font): Deleted.
+        (xfont_query_font): Delete.
        (xfont_find_ccl_program): Rename from x_find_ccl_program and
        moved from xterm.c.
        (xfont_driver): Adjust for the change of struct font_driver.
@@ -21230,7 +21658,7 @@
        dpyinfo->smallest_char_width.
        (xfont_close): Don't free struct font.
        (xfont_prepare_face): Adjust for the change of struct font.
-        (xfont_done_face): Deleted.
+        (xfont_done_face): Delete.
        (xfont_has_char): Adjust for the change of struct font.
        (xfont_encode_char, xfont_draw): Likewise.
        (xfont_check): New function.
@@ -21260,7 +21688,7 @@
        * xterm.c: Throughout the file, delete all USE_FONT_BACKEND
        conditionals.  Don't check enable_font_backend.  Delete all codes
        used only when USE_FONT_BACKEND is not defined.  Don't include ccl.h.
-        (x_per_char_metric, x_encode_char): Deleted.
+        (x_per_char_metric, x_encode_char): Delete.
        (x_set_cursor_gc, x_set_mouse_face_gc): Don't set GCFont.
        (x_compute_glyph_string_overhangs): Adjust for the change of
        `struct face'.
@@ -21269,10 +21697,10 @@
        (x_draw_glyph_string): Likewise.  Use font->underline_position and
        font->underline_thickness.
        (x_new_font): Rename from x_new_fontset2.
-        (x_new_fontset, x_get_font_info, x_list_fonts): Deleted.
+        (x_new_fontset, x_get_font_info, x_list_fonts): Delete.
        (x_check_font): Call `check' method of a font driver.
        (x_font_min_bounds, x_compute_min_glyph_bounds, x_load_font)
-        (x_query_font, x_get_font_repertory): Deleted.
+        (x_query_font, x_get_font_repertory): Delete.
        (x_find_ccl_program): Rename and moved to xfont.c.
        (x_redisplay_interface): Adjust for the change of `struct
        redisplay_interface'.
diff --git a/src/alloc.c b/src/alloc.c
index 0ca702fe0cd..07f1caae46b 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -254,8 +254,10 @@ const char *pending_malloc_warning;
 /* Buffer in which we save a copy of the C stack at each GC.  */
+#if MAX_SAVE_STACK > 0
 static char *stack_copy;
-static int stack_copy_size;
+static size_t stack_copy_size;
+#endif
 /* Non-zero means ignore malloc warnings.  Set during initialization.
   Currently not used.  */
@@ -2705,7 +2707,7 @@ DEFUN ("list", Flist, Slist, 0, MANY, 0,
       doc: /* Return a newly created list with specified arguments as elements.
 Any number of arguments, even zero arguments, are allowed.
 usage: (list &rest OBJECTS)  */)
-  (int nargs, register Lisp_Object *args)
+  (size_t nargs, register Lisp_Object *args)
 {
  register Lisp_Object val;
  val = Qnil;
@@ -2921,10 +2923,10 @@ DEFUN ("vector", Fvector, Svector, 0, MANY, 0,
       doc: /* Return a newly created vector with specified arguments as elements.
 Any number of arguments, even zero arguments, are allowed.
 usage: (vector &rest OBJECTS)  */)
-  (register int nargs, Lisp_Object *args)
+  (register size_t nargs, Lisp_Object *args)
 {
  register Lisp_Object len, val;
-  register int i;
+  register size_t i;
  register struct Lisp_Vector *p;
  XSETFASTINT (len, nargs);
@@ -2952,10 +2954,10 @@ argument to catch the left-over arguments.  If such an integer is used, the
 arguments will not be dynamically bound but will be instead pushed on the
 stack before executing the byte-code.
 usage: (make-byte-code ARGLIST BYTE-CODE CONSTANTS DEPTH &optional DOCSTRING INTERACTIVE-SPEC &rest ELEMENTS)  */)
-  (register int nargs, Lisp_Object *args)
+  (register size_t nargs, Lisp_Object *args)
 {
  register Lisp_Object len, val;
-  register int i;
+  register size_t i;
  register struct Lisp_Vector *p;
  XSETFASTINT (len, nargs);
@@ -4238,7 +4240,7 @@ static void
 check_gcpros (void)
 {
  struct gcpro *p;
-  int i;
+  size_t i;
  for (p = gcprolist; p; p = p->next)
    for (i = 0; i < p->nvars; ++i)
@@ -4847,7 +4849,7 @@ returns nil, because real GC can't be done.  */)
 {
  register struct specbinding *bind;
  char stack_top_variable;
-  register int i;
+  register size_t i;
  int message_p;
  Lisp_Object total[8];
  int count = SPECPDL_INDEX ();
@@ -4913,21 +4915,26 @@ returns nil, because real GC can't be done.  */)
 #if MAX_SAVE_STACK > 0
  if (NILP (Vpurify_flag))
    {
-      i = &stack_top_variable - stack_bottom;
+      char *stack;
-      if (i < 0) i = -i;
+      size_t stack_size;
-      if (i < MAX_SAVE_STACK)
+      if (&stack_top_variable < stack_bottom)
        {
-          if (stack_copy == 0)
+          stack = &stack_top_variable;
-            stack_copy = (char *) xmalloc (stack_copy_size = i);
+          stack_size = stack_bottom - &stack_top_variable;
-          else if (stack_copy_size < i)
+        }
-            stack_copy = (char *) xrealloc (stack_copy, (stack_copy_size = i));
+      else
-          if (stack_copy)
+        {
+          stack = stack_bottom;
+          stack_size = &stack_top_variable - stack_bottom;
+        }
+      if (stack_size <= MAX_SAVE_STACK)
+        {
+          if (stack_copy_size < stack_size)
            {
-              if ((EMACS_INT) (&stack_top_variable - stack_bottom) > 0)
+              stack_copy = (char *) xrealloc (stack_copy, stack_size);
-                memcpy (stack_copy, stack_bottom, i);
+              stack_copy_size = stack_size;
-              else
-                memcpy (stack_copy, &stack_top_variable, i);
            }
+          memcpy (stack_copy, stack, stack_size);
        }
    }
 #endif /* MAX_SAVE_STACK > 0 */
diff --git a/src/atimer.c b/src/atimer.c
index 309a4eaee4f..b947ea59ccd 100644
--- a/src/atimer.c
+++ b/src/atimer.c
@@ -64,7 +64,7 @@ static void set_alarm (void);
 static void schedule_atimer (struct atimer *);
 static struct atimer *append_atimer_lists (struct atimer *,
                                           struct atimer *);
-SIGTYPE alarm_signal_handler (int signo);
+void alarm_signal_handler (int signo);
 /* Start a new atimer of type TYPE.  TIME specifies when the timer is
@@ -86,7 +86,7 @@ SIGTYPE alarm_signal_handler (int signo);
   to cancel_atimer; don't free it yourself.  */
 struct atimer *
-start_atimer (enum atimer_type type, EMACS_TIME time, atimer_callback fn,
+start_atimer (enum atimer_type type, EMACS_TIME timestamp, atimer_callback fn,
              void *client_data)
 {
  struct atimer *t;
@@ -94,10 +94,10 @@ start_atimer (enum atimer_type type, EMACS_TIME time, atimer_callback fn,
  /* Round TIME up to the next full second if we don't have
     itimers.  */
 #ifndef HAVE_SETITIMER
-  if (EMACS_USECS (time) != 0)
+  if (EMACS_USECS (timestamp) != 0)
    {
-      EMACS_SET_USECS (time, 0);
+      EMACS_SET_USECS (timestamp, 0);
-      EMACS_SET_SECS (time, EMACS_SECS (time) + 1);
+      EMACS_SET_SECS (timestamp, EMACS_SECS (timestamp) + 1);
    }
 #endif /* not HAVE_SETITIMER */
@@ -123,18 +123,18 @@ start_atimer (enum atimer_type type, EMACS_TIME time, atimer_callback fn,
  switch (type)
    {
    case ATIMER_ABSOLUTE:
-      t->expiration = time;
+      t->expiration = timestamp;
      break;
    case ATIMER_RELATIVE:
      EMACS_GET_TIME (t->expiration);
-      EMACS_ADD_TIME (t->expiration, t->expiration, time);
+      EMACS_ADD_TIME (t->expiration, t->expiration, timestamp);
      break;
    case ATIMER_CONTINUOUS:
      EMACS_GET_TIME (t->expiration);
-      EMACS_ADD_TIME (t->expiration, t->expiration, time);
+      EMACS_ADD_TIME (t->expiration, t->expiration, timestamp);
-      t->interval = time;
+      t->interval = timestamp;
      break;
    }
@@ -187,24 +187,24 @@ cancel_atimer (struct atimer *timer)
 }
-/* Append two lists of atimers LIST1 and LIST2 and return the
+/* Append two lists of atimers LIST_1 and LIST_2 and return the
   result list.  */
 static struct atimer *
-append_atimer_lists (struct atimer *list1, struct atimer *list2)
+append_atimer_lists (struct atimer *list_1, struct atimer *list_2)
 {
-  if (list1 == NULL)
+  if (list_1 == NULL)
-    return list2;
+    return list_2;
-  else if (list2 == NULL)
+  else if (list_2 == NULL)
-    return list1;
+    return list_1;
  else
    {
      struct atimer *p;
-      for (p = list1; p->next; p = p->next)
+      for (p = list_1; p->next; p = p->next)
        ;
-      p->next = list2;
+      p->next = list_2;
-      return list1;
+      return list_1;
    }
 }
@@ -287,28 +287,28 @@ set_alarm (void)
 {
  if (atimers)
    {
-      EMACS_TIME now, time;
+      EMACS_TIME now, timestamp;
 #ifdef HAVE_SETITIMER
      struct itimerval it;
 #endif
      /* Determine s/us till the next timer is ripe.  */
      EMACS_GET_TIME (now);
-      EMACS_SUB_TIME (time, atimers->expiration, now);
+      EMACS_SUB_TIME (timestamp, atimers->expiration, now);
 #ifdef HAVE_SETITIMER
      /* Don't set the interval to 0; this disables the timer.  */
      if (EMACS_TIME_LE (atimers->expiration, now))
        {
-          EMACS_SET_SECS (time, 0);
+          EMACS_SET_SECS (timestamp, 0);
-          EMACS_SET_USECS (time, 1000);
+          EMACS_SET_USECS (timestamp, 1000);
        }
      memset (&it, 0, sizeof it);
-      it.it_value = time;
+      it.it_value = timestamp;
      setitimer (ITIMER_REAL, &it, 0);
 #else /* not HAVE_SETITIMER */
-      alarm (max (EMACS_SECS (time), 1));
+      alarm (max (EMACS_SECS (timestamp), 1));
 #endif /* not HAVE_SETITIMER */
    }
 }
@@ -388,7 +388,7 @@ run_timers (void)
 /* Signal handler for SIGALRM.  SIGNO is the signal number, i.e.
   SIGALRM.  */
-SIGTYPE
+void
 alarm_signal_handler (int signo)
 {
 #ifndef SYNC_INPUT
@@ -442,4 +442,3 @@ init_atimer (void)
  /* pending_signals is initialized in init_keyboard.*/
  signal (SIGALRM, alarm_signal_handler);
 }
diff --git a/src/buffer.c b/src/buffer.c
index d301e7f14f9..cdcd2ccecff 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -2520,8 +2520,7 @@ The first thing this function does is run
 the normal hook `change-major-mode-hook'.  */)
  (void)
 {
-  if (!NILP (Vrun_hooks))
+  Frun_hooks (1, &Qchange_major_mode_hook);
-    call1 (Vrun_hooks, Qchange_major_mode_hook);
  /* Make sure none of the bindings in local_var_alist
     remain swapped in, in their symbols.  */
@@ -5225,12 +5224,12 @@ init_buffer (void)
 #define DEFVAR_PER_BUFFER(lname, vname, type, doc)                      \
  do {                                                                  \
    static struct Lisp_Buffer_Objfwd bo_fwd;                            \
-    defvar_per_buffer (&bo_fwd, lname, vname, type, 0);                 \
+    defvar_per_buffer (&bo_fwd, lname, vname, type);                    \
  } while (0)
 static void
 defvar_per_buffer (struct Lisp_Buffer_Objfwd *bo_fwd, const char *namestring,
-                   Lisp_Object *address, Lisp_Object type, char *doc)
+                   Lisp_Object *address, Lisp_Object type)
 {
  struct Lisp_Symbol *sym;
  int offset;
diff --git a/src/bytecode.c b/src/bytecode.c
index d887668dd39..01ae8055ebf 100644
--- a/src/bytecode.c
+++ b/src/bytecode.c
@@ -425,7 +425,7 @@ according to which any remaining arguments are pushed on the stack
 before executing BYTESTR.
 usage: (byte-code BYTESTR VECTOR MAXDEP &optional ARGS-TEMPLATE &rest ARGS) */)
-     (int nargs, Lisp_Object *args)
+     (size_t nargs, Lisp_Object *args)
 {
  Lisp_Object args_tmpl = nargs >= 4 ? args[3] : Qnil;
  int pnargs = nargs >= 4 ? nargs - 4 : 0;
@@ -631,7 +631,16 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
          {
            Lisp_Object v1;
            v1 = TOP;
-            TOP = CAR (v1);
+            if (CONSP (v1))
+              TOP = XCAR (v1);
+            else if (NILP (v1))
+              TOP = Qnil;
+            else
+              {
+                BEFORE_POTENTIAL_GC ();
+                wrong_type_argument (Qlistp, v1);
+                AFTER_POTENTIAL_GC ();
+              }
            break;
          }
@@ -657,7 +666,17 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
          {
            Lisp_Object v1;
            v1 = TOP;
-            TOP = CDR (v1);
+            if (CONSP (v1))
+              TOP = XCDR (v1);
+            else if (NILP (v1))
+              TOP = Qnil;
+            else
+              {
+                BEFORE_POTENTIAL_GC ();
+                wrong_type_argument (Qlistp, v1);
+                AFTER_POTENTIAL_GC ();
+              }
+            break;
            break;
          }
@@ -994,13 +1013,13 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
            v1 = POP;
            v2 = TOP;
            CHECK_NUMBER (v2);
-            AFTER_POTENTIAL_GC ();
            op = XINT (v2);
            immediate_quit = 1;
            while (--op >= 0 && CONSP (v1))
              v1 = XCDR (v1);
            immediate_quit = 0;
            TOP = CAR (v1);
+            AFTER_POTENTIAL_GC ();
            break;
          }
diff --git a/src/callint.c b/src/callint.c
index 3c520742e27..489fa392e46 100644
--- a/src/callint.c
+++ b/src/callint.c
@@ -269,8 +269,9 @@ invoke it.  If KEYS is omitted or nil, the return value of
     recorded as a call to the function named callint_argfuns[varies[i]].  */
  int *varies;
-  register int i, j;
+  register size_t i, j;
-  int count, foo;
+  size_t count;
+  int foo;
  char prompt1[100];
  char *tem1;
  int arg_from_tty = 0;
@@ -430,8 +431,7 @@ invoke it.  If KEYS is omitted or nil, the return value of
                error ("Attempt to select inactive minibuffer window");
              /* If the current buffer wants to clean up, let it.  */
-              if (!NILP (Vmouse_leave_buffer_hook))
+              Frun_hooks (1, &Qmouse_leave_buffer_hook);
-                call1 (Vrun_hooks, Qmouse_leave_buffer_hook);
              Fselect_window (w, Qnil);
            }
diff --git a/src/callproc.c b/src/callproc.c
index c53a92bbaf8..eb2a2268fe1 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -107,7 +107,7 @@ call_process_kill (Lisp_Object fdpid)
  return Qnil;
 }
-Lisp_Object
+static Lisp_Object
 call_process_cleanup (Lisp_Object arg)
 {
  Lisp_Object fdpid = Fcdr (arg);
@@ -177,10 +177,10 @@ and returns a numeric exit status or a signal description string.
 If you quit, the process is killed with SIGINT, or SIGKILL if you quit again.
 usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
-  (int nargs, register Lisp_Object *args)
+  (size_t nargs, register Lisp_Object *args)
 {
  Lisp_Object infile, buffer, current_dir, path;
-  int display_p;
+  volatile int display_p_volatile;
  int fd[2];
  int filefd;
  register int pid;
@@ -189,7 +189,9 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
  char buf[CALLPROC_BUFFER_SIZE_MAX];
  int bufsize = CALLPROC_BUFFER_SIZE_MIN;
  int count = SPECPDL_INDEX ();
+  volatile USE_SAFE_ALLOCA;
+  const unsigned char **volatile new_argv_volatile;
  register const unsigned char **new_argv;
  /* File to use for stderr in the child.
     t means use same as standard output.  */
@@ -220,7 +222,7 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
  /* Decide the coding-system for giving arguments.  */
  {
    Lisp_Object val, *args2;
-    int i;
+    size_t i;
    /* If arguments are supplied, we may have to encode them.  */
    if (nargs >= 5)
@@ -241,7 +243,7 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
          val = Qraw_text;
        else
          {
-            args2 = (Lisp_Object *) alloca ((nargs + 1) * sizeof *args2);
+            SAFE_ALLOCA (args2, Lisp_Object *, (nargs + 1) * sizeof *args2);
            args2[0] = Qcall_process;
            for (i = 0; i < nargs; i++) args2[i + 1] = args[i];
            coding_systems = Ffind_operation_coding_system (nargs + 1, args2);
@@ -343,7 +345,7 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
    UNGCPRO;
  }
-  display_p = INTERACTIVE && nargs >= 4 && !NILP (args[3]);
+  display_p_volatile = INTERACTIVE && nargs >= 4 && !NILP (args[3]);
  filefd = emacs_open (SSDATA (infile), O_RDONLY, 0);
  if (filefd < 0)
@@ -371,11 +373,12 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
      && SREF (path, 1) == ':')
    path = Fsubstring (path, make_number (2), Qnil);
-  new_argv = (const unsigned char **)
+  SAFE_ALLOCA (new_argv, const unsigned char **,
-    alloca (max (2, nargs - 2) * sizeof (char *));
+               (nargs > 4 ? nargs - 2 : 2) * sizeof *new_argv);
+  new_argv_volatile = new_argv;
  if (nargs > 4)
    {
-      register int i;
+      register size_t i;
      struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5;
      GCPRO5 (infile, buffer, current_dir, path, error_file);
@@ -542,6 +545,8 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
    pid = vfork ();
+    new_argv = new_argv_volatile;
    if (pid == 0)
      {
        if (fd[0] >= 0)
@@ -640,9 +645,9 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
        {
          if (EQ (coding_systems, Qt))
            {
-              int i;
+              size_t i;
-              args2 = (Lisp_Object *) alloca ((nargs + 1) * sizeof *args2);
+              SAFE_ALLOCA (args2, Lisp_Object *, (nargs + 1) * sizeof *args2);
              args2[0] = Qcall_process;
              for (i = 0; i < nargs; i++) args2[i + 1] = args[i];
              coding_systems
@@ -673,6 +678,7 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
    int first = 1;
    EMACS_INT total_read = 0;
    int carryover = 0;
+    int display_p = display_p_volatile;
    int display_on_the_fly = display_p;
    struct coding_system saved_coding;
@@ -805,6 +811,7 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
     when exiting.  */
  call_process_exited = 1;
+  SAFE_FREE ();
  unbind_to (count, Qnil);
  if (synch_process_termsig)
@@ -860,7 +867,7 @@ and returns a numeric exit status or a signal description string.
 If you quit, the process is killed with SIGINT, or SIGKILL if you quit again.
 usage: (call-process-region START END PROGRAM &optional DELETE BUFFER DISPLAY &rest ARGS)  */)
-  (int nargs, register Lisp_Object *args)
+  (size_t nargs, register Lisp_Object *args)
 {
  struct gcpro gcpro1;
  Lisp_Object filename_string;
@@ -869,7 +876,7 @@ usage: (call-process-region START END PROGRAM &optional DELETE BUFFER DISPLAY &r
  /* Qt denotes we have not yet called Ffind_operation_coding_system.  */
  Lisp_Object coding_systems;
  Lisp_Object val, *args2;
-  int i;
+  size_t i;
  char *tempfile;
  Lisp_Object tmpdir, pattern;
@@ -893,30 +900,35 @@ usage: (call-process-region START END PROGRAM &optional DELETE BUFFER DISPLAY &r
 #endif
    }
-  pattern = Fexpand_file_name (Vtemp_file_name_pattern, tmpdir);
+  {
-  tempfile = (char *) alloca (SBYTES (pattern) + 1);
+    USE_SAFE_ALLOCA;
-  memcpy (tempfile, SDATA (pattern), SBYTES (pattern) + 1);
+    pattern = Fexpand_file_name (Vtemp_file_name_pattern, tmpdir);
-  coding_systems = Qt;
+    SAFE_ALLOCA (tempfile, char *, SBYTES (pattern) + 1);
+    memcpy (tempfile, SDATA (pattern), SBYTES (pattern) + 1);
+    coding_systems = Qt;
 #ifdef HAVE_MKSTEMP
- {
+    {
-   int fd;
+      int fd;
-   BLOCK_INPUT;
+      BLOCK_INPUT;
-   fd = mkstemp (tempfile);
+      fd = mkstemp (tempfile);
-   UNBLOCK_INPUT;
+      UNBLOCK_INPUT;
-   if (fd == -1)
+      if (fd == -1)
-     report_file_error ("Failed to open temporary file",
+        report_file_error ("Failed to open temporary file",
-                        Fcons (Vtemp_file_name_pattern, Qnil));
+                           Fcons (Vtemp_file_name_pattern, Qnil));
-   else
+      else
-     close (fd);
+        close (fd);
- }
+    }
 #else
-  mktemp (tempfile);
+    mktemp (tempfile);
 #endif
-  filename_string = build_string (tempfile);
+    filename_string = build_string (tempfile);
-  GCPRO1 (filename_string);
+    GCPRO1 (filename_string);
+    SAFE_FREE ();
+  }
  start = args[0];
  end = args[1];
  /* Decide coding-system of the contents of the temporary file.  */
@@ -926,11 +938,13 @@ usage: (call-process-region START END PROGRAM &optional DELETE BUFFER DISPLAY &r
    val = Qraw_text;
  else
    {
-      args2 = (Lisp_Object *) alloca ((nargs + 1) * sizeof *args2);
+      USE_SAFE_ALLOCA;
+      SAFE_ALLOCA (args2, Lisp_Object *, (nargs + 1) * sizeof *args2);
      args2[0] = Qcall_process_region;
      for (i = 0; i < nargs; i++) args2[i + 1] = args[i];
      coding_systems = Ffind_operation_coding_system (nargs + 1, args2);
      val = CONSP (coding_systems) ? XCDR (coding_systems) : Qnil;
+      SAFE_FREE ();
    }
  val = complement_process_encoding_system (val);
@@ -1272,12 +1286,12 @@ relocate_fd (int fd, int minfd)
 #endif
      if (new == -1)
        {
-          const char *message1 = "Error while setting up child: ";
+          const char *message_1 = "Error while setting up child: ";
          const char *errmessage = strerror (errno);
-          const char *message2 = "\n";
+          const char *message_2 = "\n";
-          emacs_write (2, message1, strlen (message1));
+          emacs_write (2, message_1, strlen (message_1));
          emacs_write (2, errmessage, strlen (errmessage));
-          emacs_write (2, message2, strlen (message2));
+          emacs_write (2, message_2, strlen (message_2));
          _exit (1);
        }
      emacs_close (fd);
diff --git a/src/character.c b/src/character.c
index fdaf22f04f8..bac9f6af81e 100644
--- a/src/character.c
+++ b/src/character.c
@@ -232,13 +232,10 @@ translate_char (Lisp_Object table, int c)
 }
 /* Convert ASCII or 8-bit character C to unibyte.  If C is none of
-   them, return (C & 0xFF).
+   them, return (C & 0xFF).  */
-   The argument REV_TBL is now ignored.  It will be removed in the
-   future.  */
 int
-multibyte_char_to_unibyte (int c, Lisp_Object rev_tbl)
+multibyte_char_to_unibyte (int c)
 {
  if (c < 0x80)
    return c;
@@ -893,9 +890,10 @@ DEFUN ("string", Fstring, Sstring, 0, MANY, 0,
       doc: /*
 Concatenate all the argument characters and make the result a string.
 usage: (string &rest CHARACTERS)  */)
-  (int n, Lisp_Object *args)
+  (size_t n, Lisp_Object *args)
 {
-  int i, c;
+  size_t i;
+  int c;
  unsigned char *buf, *p;
  Lisp_Object str;
  USE_SAFE_ALLOCA;
@@ -918,9 +916,10 @@ usage: (string &rest CHARACTERS)  */)
 DEFUN ("unibyte-string", Funibyte_string, Sunibyte_string, 0, MANY, 0,
       doc: /* Concatenate all the argument bytes and make the result a unibyte string.
 usage: (unibyte-string &rest BYTES)  */)
-  (int n, Lisp_Object *args)
+  (size_t n, Lisp_Object *args)
 {
-  int i, c;
+  size_t i;
+  int c;
  unsigned char *buf, *p;
  Lisp_Object str;
  USE_SAFE_ALLOCA;
diff --git a/src/character.h b/src/character.h
index 4c468e14d2c..7a75ac186fa 100644
--- a/src/character.h
+++ b/src/character.h
@@ -69,7 +69,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define CHAR_TO_BYTE8(c)        \
  (CHAR_BYTE8_P (c)             \
   ? (c) - 0x3FFF00             \
-   : multibyte_char_to_unibyte (c, Qnil))
+   : multibyte_char_to_unibyte (c))
 /* Return the raw 8-bit byte for character C,
   or -1 if C doesn't correspond to a byte.  */
@@ -278,11 +278,11 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
  do {                                                                  \
    if ((p) > (limit))                                                  \
      {                                                                 \
-        const unsigned char *pcb = (p);                                 \
+        const unsigned char *chp = (p);                                 \
        do {                                                            \
-          pcb--;                                                        \
+          chp--;                                                        \
-        } while (pcb >= limit && ! CHAR_HEAD_P (*pcb));                 \
+        } while (chp >= limit && ! CHAR_HEAD_P (*chp));                 \
-        (p) = (BYTES_BY_CHAR_HEAD (*pcb) == (p) - pcb) ? pcb : (p) - 1; \
+        (p) = (BYTES_BY_CHAR_HEAD (*chp) == (p) - chp) ? chp : (p) - 1; \
      }                                                                 \
  } while (0)
@@ -353,11 +353,11 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
      CHARIDX++;                                                        \
      if (STRING_MULTIBYTE (STRING))                                    \
        {                                                               \
-          unsigned char *string_ptr = &SDATA (STRING)[BYTEIDX];         \
+          unsigned char *chp = &SDATA (STRING)[BYTEIDX];                \
-          int string_len;                                               \
+          int chlen;                                                    \
                                                                        \
-          OUTPUT = STRING_CHAR_AND_LENGTH (string_ptr, string_len);     \
+          OUTPUT = STRING_CHAR_AND_LENGTH (chp, chlen);                 \
-          BYTEIDX += string_len;                                        \
+          BYTEIDX += chlen;                                             \
        }                                                               \
      else                                                              \
        {                                                               \
@@ -376,11 +376,11 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
      CHARIDX++;                                                              \
      if (STRING_MULTIBYTE (STRING))                                          \
        {                                                                     \
-          unsigned char *ptr = &SDATA (STRING)[BYTEIDX];                      \
+          unsigned char *chp = &SDATA (STRING)[BYTEIDX];                      \
-          int ptrlen;                                                         \
+          int chlen;                                                          \
                                                                              \
-          OUTPUT = STRING_CHAR_AND_LENGTH (ptr, ptrlen);                      \
+          OUTPUT = STRING_CHAR_AND_LENGTH (chp, chlen);                       \
-          BYTEIDX += ptrlen;                                                  \
+          BYTEIDX += chlen;                                                   \
        }                                                                     \
      else                                                                    \
        {                                                                     \
@@ -416,11 +416,11 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
      CHARIDX++;                                                \
      if (!NILP (BVAR (current_buffer, enable_multibyte_characters)))   \
        {                                                       \
-          unsigned char *ptr = BYTE_POS_ADDR (BYTEIDX);         \
+          unsigned char *chp = BYTE_POS_ADDR (BYTEIDX);         \
-          int string_len;                                       \
+          int chlen;                                            \
                                                                \
-          OUTPUT= STRING_CHAR_AND_LENGTH (ptr, string_len);     \
+          OUTPUT= STRING_CHAR_AND_LENGTH (chp, chlen);          \
-          BYTEIDX += string_len;                                \
+          BYTEIDX += chlen;                                     \
        }                                                       \
      else                                                      \
        {                                                       \
@@ -436,11 +436,11 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define FETCH_CHAR_ADVANCE_NO_CHECK(OUTPUT, CHARIDX, BYTEIDX)   \
  do                                                            \
    {                                                           \
-      unsigned char *ptr = BYTE_POS_ADDR (BYTEIDX);             \
+      unsigned char *chp = BYTE_POS_ADDR (BYTEIDX);             \
-      int len;                                                  \
+      int chlen;                                                        \
                                                                \
-      OUTPUT = STRING_CHAR_AND_LENGTH (ptr, len);               \
+      OUTPUT = STRING_CHAR_AND_LENGTH (chp, chlen);             \
-      BYTEIDX += len;                                           \
+      BYTEIDX += chlen;                                         \
      CHARIDX++;                                                \
    }                                                           \
  while (0)
@@ -451,8 +451,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define INC_POS(pos_byte)                               \
  do {                                                  \
-    unsigned char *ptr = BYTE_POS_ADDR (pos_byte);      \
+    unsigned char *chp = BYTE_POS_ADDR (pos_byte);      \
-    pos_byte += BYTES_BY_CHAR_HEAD (*ptr);              \
+    pos_byte += BYTES_BY_CHAR_HEAD (*chp);              \
  } while (0)
@@ -461,16 +461,16 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define DEC_POS(pos_byte)                       \
  do {                                          \
-    unsigned char *ptr;                         \
+    unsigned char *chp;                         \
                                                \
    pos_byte--;                                 \
    if (pos_byte < GPT_BYTE)                    \
-      ptr = BEG_ADDR + pos_byte - BEG_BYTE;     \
+      chp = BEG_ADDR + pos_byte - BEG_BYTE;     \
    else                                        \
-      ptr = BEG_ADDR + GAP_SIZE + pos_byte - BEG_BYTE; \
+      chp = BEG_ADDR + GAP_SIZE + pos_byte - BEG_BYTE; \
-    while (!CHAR_HEAD_P (*ptr))                 \
+    while (!CHAR_HEAD_P (*chp))                 \
      {                                         \
-        ptr--;                                  \
+        chp--;                                  \
        pos_byte--;                             \
      }                                         \
  } while (0)
@@ -510,8 +510,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define BUF_INC_POS(buf, pos_byte)                              \
  do {                                                          \
-    unsigned char *bbp = BUF_BYTE_ADDRESS (buf, pos_byte);      \
+    unsigned char *chp = BUF_BYTE_ADDRESS (buf, pos_byte);      \
-    pos_byte += BYTES_BY_CHAR_HEAD (*bbp);                      \
+    pos_byte += BYTES_BY_CHAR_HEAD (*chp);                      \
  } while (0)
@@ -520,15 +520,15 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define BUF_DEC_POS(buf, pos_byte)                                      \
  do {                                                                  \
-    unsigned char *p;                                                   \
+    unsigned char *chp;                                                 \
    pos_byte--;                                                         \
    if (pos_byte < BUF_GPT_BYTE (buf))                                  \
-      p = BUF_BEG_ADDR (buf) + pos_byte - BEG_BYTE;                     \
+      chp = BUF_BEG_ADDR (buf) + pos_byte - BEG_BYTE;                   \
    else                                                                \
-      p = BUF_BEG_ADDR (buf) + BUF_GAP_SIZE (buf) + pos_byte - BEG_BYTE;\
+      chp = BUF_BEG_ADDR (buf) + BUF_GAP_SIZE (buf) + pos_byte - BEG_BYTE;\
-    while (!CHAR_HEAD_P (*p))                                           \
+    while (!CHAR_HEAD_P (*chp))                                         \
      {                                                                 \
-        p--;                                                            \
+        chp--;                                                          \
        pos_byte--;                                                     \
      }                                                                 \
  } while (0)
diff --git a/src/charset.c b/src/charset.c
index d82b29ae44b..32836d459f3 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -845,7 +845,7 @@ DEFUN ("define-charset-internal", Fdefine_charset_internal,
       Sdefine_charset_internal, charset_arg_max, MANY, 0,
       doc: /* For internal use only.
 usage: (define-charset-internal ...)  */)
-  (int nargs, Lisp_Object *args)
+  (size_t nargs, Lisp_Object *args)
 {
  /* Charset attr vector.  */
  Lisp_Object attrs;
@@ -2171,11 +2171,12 @@ DEFUN ("set-charset-priority", Fset_charset_priority, Sset_charset_priority,
       1, MANY, 0,
       doc: /* Assign higher priority to the charsets given as arguments.
 usage: (set-charset-priority &rest charsets)  */)
-  (int nargs, Lisp_Object *args)
+  (size_t nargs, Lisp_Object *args)
 {
  Lisp_Object new_head, old_list, arglist[2];
  Lisp_Object list_2022, list_emacs_mule;
-  int i, id;
+  size_t i;
+  int id;
  old_list = Fcopy_sequence (Vcharset_ordered_list);
  new_head = Qnil;
diff --git a/src/chartab.c b/src/chartab.c
index 85aa5932ac3..9ad182131e9 100644
--- a/src/chartab.c
+++ b/src/chartab.c
@@ -215,7 +215,6 @@ sub_char_table_ref_and_range (Lisp_Object table, int c, int *from, int *to, Lisp
  struct Lisp_Sub_Char_Table *tbl = XSUB_CHAR_TABLE (table);
  int depth = XINT (tbl->depth);
  int min_char = XINT (tbl->min_char);
-  int max_char = min_char + chartab_chars[depth - 1] - 1;
  int chartab_idx = CHARTAB_IDX (c, depth, min_char), idx;
  Lisp_Object val;
@@ -244,8 +243,9 @@ sub_char_table_ref_and_range (Lisp_Object table, int c, int *from, int *to, Lisp
          break;
        }
    }
-  while ((c = min_char + (chartab_idx + 1) * chartab_chars[depth]) <= max_char
+  while (((c = (chartab_idx + 1) * chartab_chars[depth])
-         && *to >= c)
+          < chartab_chars[depth - 1])
+         && (c += min_char) <= *to)
    {
      Lisp_Object this_val;
diff --git a/src/cm.c b/src/cm.c
index 108ee5720f3..42f855f1694 100644
--- a/src/cm.c
+++ b/src/cm.c
@@ -27,19 +27,11 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "cm.h"
 #include "termhooks.h"
 #include "termchar.h"
+#include "tparam.h"
-/* For now, don't try to include termcap.h.  On some systems,
-   configure finds a non-standard termcap.h that the main build
-   won't find.  */
-extern void tputs (const char *, int, int (*)(int));
-extern char *tgoto (const char *, int, int);
 #define BIG     9999            /* 9999 good on VAXen.  For 16 bit machines
                                   use about 2000.... */
-extern char *BC, *UP;
 int cost;               /* sums up costs */
 /* ARGSUSED */
@@ -222,8 +214,9 @@ calccost (struct tty_display_info *tty,
    }
    totalcost = c * deltay;
    if (doit)
-        while (--deltay >= 0)
+      do
          emacs_tputs (tty, p, 1, cmputc);
+      while (0 < --deltay);
 x:
    if ((deltax = dstx - srcx) == 0)
        goto done;
@@ -304,8 +297,9 @@ fail:
    }
    totalcost += c * deltax;
    if (doit)
-        while (--deltax >= 0)
+      do
          emacs_tputs (tty, p, 1, cmputc);
+      while (0 < --deltax);
 done:
    return totalcost;
 }
diff --git a/src/cm.h b/src/cm.h
index 5d430598f0c..8f23990ce55 100644
--- a/src/cm.h
+++ b/src/cm.h
@@ -96,8 +96,6 @@ struct cm
    int cc_vabs;
  };
-extern char PC;                 /* Pad character */
 /* Shorthand */
 #ifndef NoCMShortHand
 #define curY(tty)               (tty)->Wcm->cm_curY
diff --git a/src/cmds.c b/src/cmds.c
index fa1ac5028ae..1cf7ff24fec 100644
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -352,7 +352,7 @@ internal_self_insert (int c, EMACS_INT n)
    {
      str[0] = (SINGLE_BYTE_CHAR_P (c)
                ? c
-                : multibyte_char_to_unibyte (c, Qnil));
+                : multibyte_char_to_unibyte (c));
      len = 1;
    }
  if (!NILP (overwrite)
@@ -501,7 +501,7 @@ internal_self_insert (int c, EMACS_INT n)
    }
  /* Run hooks for electric keys.  */
-  call1 (Vrun_hooks, Qpost_self_insert_hook);
+  Frun_hooks (1, &Qpost_self_insert_hook);
  return hairy;
 }
diff --git a/src/coding.c b/src/coding.c
index 0c2836c19f6..9e28a1c9f9b 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -853,8 +853,7 @@ static unsigned char *alloc_destination (struct coding_system *,
                                         EMACS_INT, unsigned char *);
 static void setup_iso_safe_charsets (Lisp_Object);
 static unsigned char *encode_designation_at_bol (struct coding_system *,
-                                                 int *, int *,
+                                                 int *, unsigned char *);
-                                                 unsigned char *);
 static int detect_eol (const unsigned char *,
                       EMACS_INT, enum coding_category);
 static Lisp_Object adjust_coding_eol_type (struct coding_system *, int);
@@ -4299,7 +4298,7 @@ encode_invocation_designation (struct charset *charset,
 static unsigned char *
 encode_designation_at_bol (struct coding_system *coding, int *charbuf,
-                           int *charbuf_end, unsigned char *dst)
+                           unsigned char *dst)
 {
  struct charset *charset;
  /* Table of charsets to be designated to each graphic register.  */
@@ -4390,7 +4389,7 @@ encode_coding_iso_2022 (struct coding_system *coding)
          unsigned char *dst_prev = dst;
          /* We have to produce designation sequences if any now.  */
-          dst = encode_designation_at_bol (coding, charbuf, charbuf_end, dst);
+          dst = encode_designation_at_bol (coding, charbuf, dst);
          bol_designation = 0;
          /* We are sure that designation sequences are all ASCII bytes.  */
          produced_chars += dst - dst_prev;
@@ -5266,11 +5265,12 @@ encode_coding_raw_text (struct coding_system *coding)
                unsigned char str[MAX_MULTIBYTE_LENGTH], *p0 = str, *p1 = str;
                CHAR_STRING_ADVANCE (c, p1);
-                while (p0 < p1)
+                do
                  {
                    EMIT_ONE_BYTE (*p0);
                    p0++;
                  }
+                while (p0 < p1);
              }
          }
      else
@@ -9299,7 +9299,7 @@ function to call for FILENAME, that function should examine the
 contents of BUFFER instead of reading the file.
 usage: (find-operation-coding-system OPERATION ARGUMENTS...)  */)
-  (int nargs, Lisp_Object *args)
+  (size_t nargs, Lisp_Object *args)
 {
  Lisp_Object operation, target_idx, target, val;
  register Lisp_Object chain;
@@ -9308,17 +9308,17 @@ usage: (find-operation-coding-system OPERATION ARGUMENTS...)  */)
    error ("Too few arguments");
  operation = args[0];
  if (!SYMBOLP (operation)
-      || !INTEGERP (target_idx = Fget (operation, Qtarget_idx)))
+      || !NATNUMP (target_idx = Fget (operation, Qtarget_idx)))
    error ("Invalid first argument");
-  if (nargs < 1 + XINT (target_idx))
+  if (nargs < 1 + XFASTINT (target_idx))
    error ("Too few arguments for operation: %s",
           SDATA (SYMBOL_NAME (operation)));
-  target = args[XINT (target_idx) + 1];
+  target = args[XFASTINT (target_idx) + 1];
  if (!(STRINGP (target)
        || (EQ (operation, Qinsert_file_contents) && CONSP (target)
            && STRINGP (XCAR (target)) && BUFFERP (XCDR (target)))
        || (EQ (operation, Qopen_network_stream) && INTEGERP (target))))
-    error ("Invalid %dth argument", XINT (target_idx) + 1);
+    error ("Invalid %dth argument", XFASTINT (target_idx) + 1);
  if (CONSP (target))
    target = XCAR (target);
@@ -9375,9 +9375,9 @@ If multiple coding systems belong to the same category,
 all but the first one are ignored.
 usage: (set-coding-system-priority &rest coding-systems)  */)
-  (int nargs, Lisp_Object *args)
+  (size_t nargs, Lisp_Object *args)
 {
-  int i, j;
+  size_t i, j;
  int changed[coding_category_max];
  enum coding_category priorities[coding_category_max];
@@ -9420,7 +9420,7 @@ usage: (set-coding-system-priority &rest coding-systems)  */)
  /* Update `coding-category-list'.  */
  Vcoding_category_list = Qnil;
-  for (i = coding_category_max - 1; i >= 0; i--)
+  for (i = coding_category_max; i-- > 0; )
    Vcoding_category_list
      = Fcons (AREF (Vcoding_category_table, priorities[i]),
               Vcoding_category_list);
@@ -9481,7 +9481,7 @@ DEFUN ("define-coding-system-internal", Fdefine_coding_system_internal,
       Sdefine_coding_system_internal, coding_arg_max, MANY, 0,
       doc: /* For internal use only.
 usage: (define-coding-system-internal ...)  */)
-  (int nargs, Lisp_Object *args)
+  (size_t nargs, Lisp_Object *args)
 {
  Lisp_Object name;
  Lisp_Object spec_vec;         /* [ ATTRS ALIASE EOL_TYPE ] */
diff --git a/src/composite.c b/src/composite.c
index 0b0602bf283..bc5644a4612 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -1115,7 +1115,7 @@ composition_compute_stop_pos (struct composition_it *cmp_it, EMACS_INT charpos,
          if (! NILP (val))
            {
              Lisp_Object elt;
-              int ridx, back, len;
+              int ridx, back, blen;
              for (ridx = 0; CONSP (val); val = XCDR (val), ridx++)
                {
@@ -1132,17 +1132,17 @@ composition_compute_stop_pos (struct composition_it *cmp_it, EMACS_INT charpos,
                        bpos = (NILP (string) ? CHAR_TO_BYTE (cpos)
                                : string_char_to_byte (string, cpos));
                      if (STRINGP (AREF (elt, 0)))
-                        len = fast_looking_at (AREF (elt, 0), cpos, bpos,
+                        blen = fast_looking_at (AREF (elt, 0), cpos, bpos,
-                                               start + 1, limit, string);
+                                                start + 1, limit, string);
                      else
-                        len = 1;
+                        blen = 1;
-                      if (len > 0)
+                      if (blen > 0)
                        {
                          /* Make CPOS point to the last character of
-                             match.  Note that LEN is byte-length.  */
+                             match.  Note that BLEN is byte-length.  */
-                          if (len > 1)
+                          if (blen > 1)
                            {
-                              bpos += len;
+                              bpos += blen;
                              if (NILP (string))
                                cpos = BYTE_TO_CHAR (bpos) - 1;
                              else
@@ -1248,8 +1248,8 @@ composition_reseat_it (struct composition_it *cmp_it, EMACS_INT charpos, EMACS_I
  else if (w)
    {
      Lisp_Object lgstring = Qnil;
-      Lisp_Object val, elt, re;
+      Lisp_Object val, elt;
-      int len, i;
+      int i;
      val = CHAR_TABLE_REF (Vcomposition_function_table, cmp_it->ch);
      for (i = 0; i < cmp_it->rule_idx; i++, val = XCDR (val));
@@ -1364,7 +1364,7 @@ composition_reseat_it (struct composition_it *cmp_it, EMACS_INT charpos, EMACS_I
 int
 composition_update_it (struct composition_it *cmp_it, EMACS_INT charpos, EMACS_INT bytepos, Lisp_Object string)
 {
-  int i, c;
+  int i, c IF_LINT (= 0);
  if (cmp_it->ch < 0)
    {
@@ -1489,9 +1489,14 @@ find_automatic_composition (EMACS_INT pos, EMACS_INT limit, EMACS_INT *start, EM
  EMACS_INT head, tail, stop;
  /* Limit to check a composition after POS.  */
  EMACS_INT fore_check_limit;
-  struct position_record orig, cur, check, prev;
+  struct position_record orig, cur;
+  /* FIXME: It's not obvious whether these two variables need initialization.
+     If they do, please supply initial values.
+     If not, please remove this comment.  */
+  struct position_record check IF_LINT (= {0}), prev IF_LINT (= {0});
  Lisp_Object check_val, val, elt;
-  int check_lookback;
  int c;
  Lisp_Object window;
  struct window *w;
@@ -1657,7 +1662,7 @@ find_automatic_composition (EMACS_INT pos, EMACS_INT limit, EMACS_INT *start, EM
 EMACS_INT
 composition_adjust_point (EMACS_INT last_pt, EMACS_INT new_pt)
 {
-  EMACS_INT charpos, bytepos, startpos, beg, end, pos;
+  EMACS_INT beg, end;
  Lisp_Object val;
  int i;
@@ -2032,4 +2037,3 @@ See also the documentation of `auto-composition-mode'.  */);
  defsubr (&Sfind_composition_internal);
  defsubr (&Scomposition_get_gstring);
 }
diff --git a/src/data.c b/src/data.c
index e5c485f5322..4b9d2ec0387 100644
--- a/src/data.c
+++ b/src/data.c
@@ -2476,13 +2476,13 @@ enum arithop
    Amin
  };
-static Lisp_Object float_arith_driver (double, int, enum arithop,
+static Lisp_Object float_arith_driver (double, size_t, enum arithop,
-                                       int, Lisp_Object *);
+                                       size_t, Lisp_Object *);
 static Lisp_Object
-arith_driver (enum arithop code, int nargs, register Lisp_Object *args)
+arith_driver (enum arithop code, size_t nargs, register Lisp_Object *args)
 {
  register Lisp_Object val;
-  register int argnum;
+  register size_t argnum;
  register EMACS_INT accum = 0;
  register EMACS_INT next;
@@ -2564,7 +2564,8 @@ arith_driver (enum arithop code, int nargs, register Lisp_Object *args)
 #define isnan(x) ((x) != (x))
 static Lisp_Object
-float_arith_driver (double accum, register int argnum, enum arithop code, int nargs, register Lisp_Object *args)
+float_arith_driver (double accum, register size_t argnum, enum arithop code,
+                    size_t nargs, register Lisp_Object *args)
 {
  register Lisp_Object val;
  double next;
@@ -2626,7 +2627,7 @@ float_arith_driver (double accum, register int argnum, enum arithop code, int na
 DEFUN ("+", Fplus, Splus, 0, MANY, 0,
       doc: /* Return sum of any number of arguments, which are numbers or markers.
 usage: (+ &rest NUMBERS-OR-MARKERS)  */)
-  (int nargs, Lisp_Object *args)
+  (size_t nargs, Lisp_Object *args)
 {
  return arith_driver (Aadd, nargs, args);
 }
@@ -2636,7 +2637,7 @@ DEFUN ("-", Fminus, Sminus, 0, MANY, 0,
 With one arg, negates it.  With more than one arg,
 subtracts all but the first from the first.
 usage: (- &optional NUMBER-OR-MARKER &rest MORE-NUMBERS-OR-MARKERS)  */)
-  (int nargs, Lisp_Object *args)
+  (size_t nargs, Lisp_Object *args)
 {
  return arith_driver (Asub, nargs, args);
 }
@@ -2644,7 +2645,7 @@ usage: (- &optional NUMBER-OR-MARKER &rest MORE-NUMBERS-OR-MARKERS)  */)
 DEFUN ("*", Ftimes, Stimes, 0, MANY, 0,
       doc: /* Return product of any number of arguments, which are numbers or markers.
 usage: (* &rest NUMBERS-OR-MARKERS)  */)
-  (int nargs, Lisp_Object *args)
+  (size_t nargs, Lisp_Object *args)
 {
  return arith_driver (Amult, nargs, args);
 }
@@ -2653,9 +2654,9 @@ DEFUN ("/", Fquo, Squo, 2, MANY, 0,
       doc: /* Return first argument divided by all the remaining arguments.
 The arguments must be numbers or markers.
 usage: (/ DIVIDEND DIVISOR &rest DIVISORS)  */)
-  (int nargs, Lisp_Object *args)
+  (size_t nargs, Lisp_Object *args)
 {
-  int argnum;
+  size_t argnum;
  for (argnum = 2; argnum < nargs; argnum++)
    if (FLOATP (args[argnum]))
      return float_arith_driver (0, 0, Adiv, nargs, args);
@@ -2737,7 +2738,7 @@ DEFUN ("max", Fmax, Smax, 1, MANY, 0,
       doc: /* Return largest of all the arguments (which must be numbers or markers).
 The value is always a number; markers are converted to numbers.
 usage: (max NUMBER-OR-MARKER &rest NUMBERS-OR-MARKERS)  */)
-  (int nargs, Lisp_Object *args)
+  (size_t nargs, Lisp_Object *args)
 {
  return arith_driver (Amax, nargs, args);
 }
@@ -2746,7 +2747,7 @@ DEFUN ("min", Fmin, Smin, 1, MANY, 0,
       doc: /* Return smallest of all the arguments (which must be numbers or markers).
 The value is always a number; markers are converted to numbers.
 usage: (min NUMBER-OR-MARKER &rest NUMBERS-OR-MARKERS)  */)
-  (int nargs, Lisp_Object *args)
+  (size_t nargs, Lisp_Object *args)
 {
  return arith_driver (Amin, nargs, args);
 }
@@ -2755,7 +2756,7 @@ DEFUN ("logand", Flogand, Slogand, 0, MANY, 0,
       doc: /* Return bitwise-and of all the arguments.
 Arguments may be integers, or markers converted to integers.
 usage: (logand &rest INTS-OR-MARKERS)  */)
-  (int nargs, Lisp_Object *args)
+  (size_t nargs, Lisp_Object *args)
 {
  return arith_driver (Alogand, nargs, args);
 }
@@ -2764,7 +2765,7 @@ DEFUN ("logior", Flogior, Slogior, 0, MANY, 0,
       doc: /* Return bitwise-or of all the arguments.
 Arguments may be integers, or markers converted to integers.
 usage: (logior &rest INTS-OR-MARKERS)  */)
-  (int nargs, Lisp_Object *args)
+  (size_t nargs, Lisp_Object *args)
 {
  return arith_driver (Alogior, nargs, args);
 }
@@ -2773,7 +2774,7 @@ DEFUN ("logxor", Flogxor, Slogxor, 0, MANY, 0,
       doc: /* Return bitwise-exclusive-or of all the arguments.
 Arguments may be integers, or markers converted to integers.
 usage: (logxor &rest INTS-OR-MARKERS)  */)
-  (int nargs, Lisp_Object *args)
+  (size_t nargs, Lisp_Object *args)
 {
  return arith_driver (Alogxor, nargs, args);
 }
@@ -3302,7 +3303,7 @@ syms_of_data (void)
  XSYMBOL (intern_c_string ("most-negative-fixnum"))->constant = 1;
 }
-static SIGTYPE
+static void
 arith_error (int signo)
 {
  sigsetmask (SIGEMPTYMASK);
diff --git a/src/dbusbind.c b/src/dbusbind.c
index 2c8de20a4d4..8a6870555d0 100644
--- a/src/dbusbind.c
+++ b/src/dbusbind.c
@@ -1051,7 +1051,7 @@ object is returned instead of a list containing this single Lisp object.
  => "i686"
 usage: (dbus-call-method BUS SERVICE PATH INTERFACE METHOD &optional :timeout TIMEOUT &rest ARGS)  */)
-  (int nargs, register Lisp_Object *args)
+  (size_t nargs, register Lisp_Object *args)
 {
  Lisp_Object bus, service, path, interface, method;
  Lisp_Object result;
@@ -1063,7 +1063,7 @@ usage: (dbus-call-method BUS SERVICE PATH INTERFACE METHOD &optional :timeout TI
  DBusError derror;
  unsigned int dtype;
  int timeout = -1;
-  int i = 5;
+  size_t i = 5;
  char signature[DBUS_MAXIMUM_SIGNATURE_LENGTH];
  /* Check parameters.  */
@@ -1116,7 +1116,7 @@ usage: (dbus-call-method BUS SERVICE PATH INTERFACE METHOD &optional :timeout TI
        {
          XD_DEBUG_VALID_LISP_OBJECT_P (args[i]);
          XD_DEBUG_VALID_LISP_OBJECT_P (args[i+1]);
-          XD_DEBUG_MESSAGE ("Parameter%d %s %s", i-4,
+          XD_DEBUG_MESSAGE ("Parameter%lu %s %s", (unsigned long) (i-4),
                            SDATA (format2 ("%s", args[i], Qnil)),
                            SDATA (format2 ("%s", args[i+1], Qnil)));
          ++i;
@@ -1124,7 +1124,7 @@ usage: (dbus-call-method BUS SERVICE PATH INTERFACE METHOD &optional :timeout TI
      else
        {
          XD_DEBUG_VALID_LISP_OBJECT_P (args[i]);
-          XD_DEBUG_MESSAGE ("Parameter%d %s", i-4,
+          XD_DEBUG_MESSAGE ("Parameter%lu %s", (unsigned long) (i-4),
                            SDATA (format2 ("%s", args[i], Qnil)));
        }
@@ -1233,7 +1233,7 @@ Example:
  -| i686
 usage: (dbus-call-method-asynchronously BUS SERVICE PATH INTERFACE METHOD HANDLER &optional :timeout TIMEOUT &rest ARGS)  */)
-  (int nargs, register Lisp_Object *args)
+  (size_t nargs, register Lisp_Object *args)
 {
  Lisp_Object bus, service, path, interface, method, handler;
  Lisp_Object result;
@@ -1243,7 +1243,7 @@ usage: (dbus-call-method-asynchronously BUS SERVICE PATH INTERFACE METHOD HANDLE
  DBusMessageIter iter;
  unsigned int dtype;
  int timeout = -1;
-  int i = 6;
+  size_t i = 6;
  char signature[DBUS_MAXIMUM_SIGNATURE_LENGTH];
  /* Check parameters.  */
@@ -1298,7 +1298,7 @@ usage: (dbus-call-method-asynchronously BUS SERVICE PATH INTERFACE METHOD HANDLE
        {
          XD_DEBUG_VALID_LISP_OBJECT_P (args[i]);
          XD_DEBUG_VALID_LISP_OBJECT_P (args[i+1]);
-          XD_DEBUG_MESSAGE ("Parameter%d %s %s", i-4,
+          XD_DEBUG_MESSAGE ("Parameter%lu %s %s", (unsigned long) (i-4),
                            SDATA (format2 ("%s", args[i], Qnil)),
                            SDATA (format2 ("%s", args[i+1], Qnil)));
          ++i;
@@ -1306,7 +1306,7 @@ usage: (dbus-call-method-asynchronously BUS SERVICE PATH INTERFACE METHOD HANDLE
      else
        {
          XD_DEBUG_VALID_LISP_OBJECT_P (args[i]);
-          XD_DEBUG_MESSAGE ("Parameter%d %s", i-4,
+          XD_DEBUG_MESSAGE ("Parameter%lu %s", (unsigned long) (i - 4),
                            SDATA (format2 ("%s", args[i], Qnil)));
        }
@@ -1357,7 +1357,7 @@ DEFUN ("dbus-method-return-internal", Fdbus_method_return_internal,
 This is an internal function, it shall not be used outside dbus.el.
 usage: (dbus-method-return-internal BUS SERIAL SERVICE &rest ARGS)  */)
-  (int nargs, register Lisp_Object *args)
+  (size_t nargs, register Lisp_Object *args)
 {
  Lisp_Object bus, serial, service;
  struct gcpro gcpro1, gcpro2, gcpro3;
@@ -1365,7 +1365,7 @@ usage: (dbus-method-return-internal BUS SERIAL SERVICE &rest ARGS)  */)
  DBusMessage *dmessage;
  DBusMessageIter iter;
  unsigned int dtype;
-  int i;
+  size_t i;
  char signature[DBUS_MAXIMUM_SIGNATURE_LENGTH];
  /* Check parameters.  */
@@ -1405,7 +1405,7 @@ usage: (dbus-method-return-internal BUS SERIAL SERVICE &rest ARGS)  */)
        {
          XD_DEBUG_VALID_LISP_OBJECT_P (args[i]);
          XD_DEBUG_VALID_LISP_OBJECT_P (args[i+1]);
-          XD_DEBUG_MESSAGE ("Parameter%d %s %s", i-2,
+          XD_DEBUG_MESSAGE ("Parameter%lu %s %s", (unsigned long) (i-2),
                            SDATA (format2 ("%s", args[i], Qnil)),
                            SDATA (format2 ("%s", args[i+1], Qnil)));
          ++i;
@@ -1413,7 +1413,7 @@ usage: (dbus-method-return-internal BUS SERIAL SERVICE &rest ARGS)  */)
      else
        {
          XD_DEBUG_VALID_LISP_OBJECT_P (args[i]);
-          XD_DEBUG_MESSAGE ("Parameter%d %s", i-2,
+          XD_DEBUG_MESSAGE ("Parameter%lu %s", (unsigned long) (i-2),
                            SDATA (format2 ("%s", args[i], Qnil)));
        }
@@ -1445,7 +1445,7 @@ DEFUN ("dbus-method-error-internal", Fdbus_method_error_internal,
 This is an internal function, it shall not be used outside dbus.el.
 usage: (dbus-method-error-internal BUS SERIAL SERVICE &rest ARGS)  */)
-  (int nargs, register Lisp_Object *args)
+  (size_t nargs, register Lisp_Object *args)
 {
  Lisp_Object bus, serial, service;
  struct gcpro gcpro1, gcpro2, gcpro3;
@@ -1453,7 +1453,7 @@ usage: (dbus-method-error-internal BUS SERIAL SERVICE &rest ARGS)  */)
  DBusMessage *dmessage;
  DBusMessageIter iter;
  unsigned int dtype;
-  int i;
+  size_t i;
  char signature[DBUS_MAXIMUM_SIGNATURE_LENGTH];
  /* Check parameters.  */
@@ -1494,7 +1494,7 @@ usage: (dbus-method-error-internal BUS SERIAL SERVICE &rest ARGS)  */)
        {
          XD_DEBUG_VALID_LISP_OBJECT_P (args[i]);
          XD_DEBUG_VALID_LISP_OBJECT_P (args[i+1]);
-          XD_DEBUG_MESSAGE ("Parameter%d %s %s", i-2,
+          XD_DEBUG_MESSAGE ("Parameter%lu %s %s", (unsigned long) (i-2),
                            SDATA (format2 ("%s", args[i], Qnil)),
                            SDATA (format2 ("%s", args[i+1], Qnil)));
          ++i;
@@ -1502,7 +1502,7 @@ usage: (dbus-method-error-internal BUS SERIAL SERVICE &rest ARGS)  */)
      else
        {
          XD_DEBUG_VALID_LISP_OBJECT_P (args[i]);
-          XD_DEBUG_MESSAGE ("Parameter%d %s", i-2,
+          XD_DEBUG_MESSAGE ("Parameter%lu %s", (unsigned long) (i-2),
                            SDATA (format2 ("%s", args[i], Qnil)));
        }
@@ -1557,7 +1557,7 @@ Example:
  "org.gnu.Emacs.FileManager" "FileModified" "/home/albinus/.emacs")
 usage: (dbus-send-signal BUS SERVICE PATH INTERFACE SIGNAL &rest ARGS)  */)
-  (int nargs, register Lisp_Object *args)
+  (size_t nargs, register Lisp_Object *args)
 {
  Lisp_Object bus, service, path, interface, signal;
  struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5;
@@ -1565,7 +1565,7 @@ usage: (dbus-send-signal BUS SERVICE PATH INTERFACE SIGNAL &rest ARGS)  */)
  DBusMessage *dmessage;
  DBusMessageIter iter;
  unsigned int dtype;
-  int i;
+  size_t i;
  char signature[DBUS_MAXIMUM_SIGNATURE_LENGTH];
  /* Check parameters.  */
@@ -1609,7 +1609,7 @@ usage: (dbus-send-signal BUS SERVICE PATH INTERFACE SIGNAL &rest ARGS)  */)
        {
          XD_DEBUG_VALID_LISP_OBJECT_P (args[i]);
          XD_DEBUG_VALID_LISP_OBJECT_P (args[i+1]);
-          XD_DEBUG_MESSAGE ("Parameter%d %s %s", i-4,
+          XD_DEBUG_MESSAGE ("Parameter%lu %s %s", (unsigned long) (i-4),
                            SDATA (format2 ("%s", args[i], Qnil)),
                            SDATA (format2 ("%s", args[i+1], Qnil)));
          ++i;
@@ -1617,7 +1617,7 @@ usage: (dbus-send-signal BUS SERVICE PATH INTERFACE SIGNAL &rest ARGS)  */)
      else
        {
          XD_DEBUG_VALID_LISP_OBJECT_P (args[i]);
-          XD_DEBUG_MESSAGE ("Parameter%d %s", i-4,
+          XD_DEBUG_MESSAGE ("Parameter%lu %s", (unsigned long) (i-4),
                            SDATA (format2 ("%s", args[i], Qnil)));
        }
@@ -1885,11 +1885,11 @@ Example:
  => :already-owner.
 usage: (dbus-register-service BUS SERVICE &rest FLAGS)  */)
-  (int nargs, register Lisp_Object *args)
+  (size_t nargs, register Lisp_Object *args)
 {
  Lisp_Object bus, service;
  DBusConnection *connection;
-  unsigned int i;
+  size_t i;
  unsigned int value;
  unsigned int flags = 0;
  int result;
@@ -1985,13 +1985,13 @@ INTERFACE, SIGNAL and HANDLER must not be nil.  Example:
 `dbus-unregister-object' for removing the registration.
 usage: (dbus-register-signal BUS SERVICE PATH INTERFACE SIGNAL HANDLER &rest ARGS) */)
-  (int nargs, register Lisp_Object *args)
+  (size_t nargs, register Lisp_Object *args)
 {
  Lisp_Object bus, service, path, interface, signal, handler;
  struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5, gcpro6;
  Lisp_Object uname, key, key1, value;
  DBusConnection *connection;
-  int i;
+  size_t i;
  char rule[DBUS_MAXIMUM_MATCH_RULE_LENGTH];
  char x[DBUS_MAXIMUM_MATCH_RULE_LENGTH];
  DBusError derror;
@@ -2061,7 +2061,8 @@ usage: (dbus-register-signal BUS SERVICE PATH INTERFACE SIGNAL HANDLER &rest ARG
        if (!NILP (args[i]))
          {
            CHECK_STRING (args[i]);
-            sprintf (x, ",arg%d='%s'", i-6, SDATA (args[i]));
+            sprintf (x, ",arg%lu='%s'", (unsigned long) (i-6),
+                     SDATA (args[i]));
            strcat (rule, x);
          }
diff --git a/src/deps.mk b/src/deps.mk
index 35754dfa7de..d84e80dca44 100644
--- a/src/deps.mk
+++ b/src/deps.mk
@@ -65,7 +65,7 @@ coding.o: coding.c coding.h ccl.h buffer.h character.h charset.h composite.h \
   window.h dispextern.h msdos.h frame.h termhooks.h \
   lisp.h globals.h $(config_h)
 cm.o: cm.c frame.h cm.h termhooks.h termchar.h dispextern.h msdos.h \
-   lisp.h globals.h $(config_h)
+   tparam.h lisp.h globals.h $(config_h)
 cmds.o: cmds.c syntax.h buffer.h character.h commands.h window.h lisp.h \
   globals.h $(config_h) msdos.h dispextern.h keyboard.h keymap.h systime.h \
   coding.h frame.h composite.h
@@ -196,7 +196,7 @@ termcap.o: termcap.c lisp.h tparam.h msdos.h $(config_h)
 terminal.o: terminal.c frame.h termchar.h termhooks.h charset.h coding.h \
   keyboard.h lisp.h globals.h $(config_h) dispextern.h composite.h systime.h \
   msdos.h
-terminfo.o: terminfo.c lisp.h globals.h $(config_h)
+terminfo.o: terminfo.c tparam.h lisp.h globals.h $(config_h)
 tparam.o: tparam.c tparam.h lisp.h $(config_h)
 undo.o: undo.c buffer.h commands.h window.h dispextern.h msdos.h \
   lisp.h globals.h $(config_h)
diff --git a/src/dispextern.h b/src/dispextern.h
index 9843dfd1fcd..17a9bc39fb2 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -662,7 +662,7 @@ struct glyph_matrix
     line.  */
  unsigned header_line_p : 1;
-#ifdef GLYPH_DEBUG
+#if GLYPH_DEBUG
  /* A string identifying the method used to display the matrix.  */
  char method[512];
 #endif
@@ -2953,8 +2953,6 @@ extern int  bidi_mirror_char (int);
 struct glyph_row *row_containing_pos (struct window *, EMACS_INT,
                                      struct glyph_row *,
                                      struct glyph_row *, int);
-EMACS_INT string_buffer_position (struct window *, Lisp_Object,
-                                  EMACS_INT);
 int line_bottom_y (struct it *);
 int display_prop_intangible_p (Lisp_Object);
 void resize_echo_area_exactly (void);
diff --git a/src/dispnew.c b/src/dispnew.c
index 1408bea2fc6..3a78845fa56 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -1297,13 +1297,11 @@ line_draw_cost (struct glyph_matrix *matrix, int vpos)
 /* Test two glyph rows A and B for equality.  Value is non-zero if A
-   and B have equal contents.  W is the window to which the glyphs
+   and B have equal contents.  MOUSE_FACE_P non-zero means compare the
-   rows A and B belong.  It is needed here to test for partial row
+   mouse_face_p flags of A and B, too.  */
-   visibility.  MOUSE_FACE_P non-zero means compare the mouse_face_p
-   flags of A and B, too.  */
 static INLINE int
-row_equal_p (struct window *w, struct glyph_row *a, struct glyph_row *b, int mouse_face_p)
+row_equal_p (struct glyph_row *a, struct glyph_row *b, int mouse_face_p)
 {
  if (a == b)
    return 1;
@@ -3592,7 +3590,10 @@ update_window (struct window *w, int force_p)
      struct glyph_row *row, *end;
      struct glyph_row *mode_line_row;
      struct glyph_row *header_line_row;
-      int yb, changed_p = 0, mouse_face_overwritten_p = 0, n_updated;
+      int yb, changed_p = 0, mouse_face_overwritten_p = 0;
+#if ! PERIODIC_PREEMPTION_CHECKING
+      int n_updated = 0;
+#endif
      rif->update_window_begin_hook (w);
      yb = window_text_bottom_y (w);
@@ -3645,7 +3646,7 @@ update_window (struct window *w, int force_p)
        }
      /* Update the rest of the lines.  */
-      for (n_updated = 0; row < end && (force_p || !input_pending); ++row)
+      for (; row < end && (force_p || !input_pending); ++row)
        if (row->enabled_p)
          {
            int vpos = MATRIX_ROW_VPOS (row, desired_matrix);
@@ -4251,17 +4252,16 @@ static int runs_size;
 static struct run **runs;
-/* Add glyph row ROW to the scrolling hash table during the scrolling
+/* Add glyph row ROW to the scrolling hash table.  */
-   of window W.  */
 static INLINE struct row_entry *
-add_row_entry (struct window *w, struct glyph_row *row)
+add_row_entry (struct glyph_row *row)
 {
  struct row_entry *entry;
  int i = row->hash % row_table_size;
  entry = row_table[i];
-  while (entry && !row_equal_p (w, entry->row, row, 1))
+  while (entry && !row_equal_p (entry->row, row, 1))
    entry = entry->next;
  if (entry == NULL)
@@ -4328,7 +4328,7 @@ scrolling_window (struct window *w, int header_line_p)
          && c->y == d->y
          && MATRIX_ROW_BOTTOM_Y (c) <= yb
          && MATRIX_ROW_BOTTOM_Y (d) <= yb
-          && row_equal_p (w, c, d, 1))
+          && row_equal_p (c, d, 1))
        {
          assign_row (c, d);
          d->enabled_p = 0;
@@ -4381,8 +4381,7 @@ scrolling_window (struct window *w, int header_line_p)
         && (MATRIX_ROW (current_matrix, i - 1)->y
             == MATRIX_ROW (desired_matrix, j - 1)->y)
         && !MATRIX_ROW (desired_matrix, j - 1)->redraw_fringe_bitmaps_p
-         && row_equal_p (w,
+         && row_equal_p (MATRIX_ROW (desired_matrix, i - 1),
-                         MATRIX_ROW (desired_matrix, i - 1),
                         MATRIX_ROW (current_matrix, j - 1), 1))
    --i, --j;
  last_new = i;
@@ -4443,7 +4442,7 @@ scrolling_window (struct window *w, int header_line_p)
    {
      if (MATRIX_ROW (current_matrix, i)->enabled_p)
        {
-          entry = add_row_entry (w, MATRIX_ROW (current_matrix, i));
+          entry = add_row_entry (MATRIX_ROW (current_matrix, i));
          old_lines[i] = entry;
          ++entry->old_uses;
        }
@@ -4454,7 +4453,7 @@ scrolling_window (struct window *w, int header_line_p)
  for (i = first_new; i < last_new; ++i)
    {
      xassert (MATRIX_ROW_ENABLED_P (desired_matrix, i));
-      entry = add_row_entry (w, MATRIX_ROW (desired_matrix, i));
+      entry = add_row_entry (MATRIX_ROW (desired_matrix, i));
      ++entry->new_uses;
      entry->new_line_number = i;
      new_lines[i] = entry;
@@ -5570,7 +5569,7 @@ marginal_area_string (struct window *w, enum window_part part,
 #ifdef SIGWINCH
-static SIGTYPE
+static void
 window_change_signal (int signalnum) /* If we don't have an argument, */
                                /* some compilers complain in signal calls.  */
 {
diff --git a/src/editfns.c b/src/editfns.c
index 1f98ff040b3..d0f1df694d5 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -101,7 +101,7 @@ static void general_insert_function (void (*) (const char *, EMACS_INT),
                                     void (*) (Lisp_Object, EMACS_INT,
                                               EMACS_INT, EMACS_INT,
                                               EMACS_INT, int),
-                                     int, int, Lisp_Object *);
+                                     int, size_t, Lisp_Object *);
 static Lisp_Object subst_char_in_region_unwind (Lisp_Object);
 static Lisp_Object subst_char_in_region_unwind_1 (Lisp_Object);
 static void transpose_markers (EMACS_INT, EMACS_INT, EMACS_INT, EMACS_INT,
@@ -928,18 +928,21 @@ save_excursion_restore (Lisp_Object info)
  tem1 = BVAR (current_buffer, mark_active);
  BVAR (current_buffer, mark_active) = tem;
-  if (!NILP (Vrun_hooks))
+  /* If mark is active now, and either was not active
+     or was at a different place, run the activate hook.  */
+  if (! NILP (tem))
    {
-      /* If mark is active now, and either was not active
+      if (! EQ (omark, nmark))
-         or was at a different place, run the activate hook.  */
+        {
-      if (! NILP (BVAR (current_buffer, mark_active)))
+          tem = intern ("activate-mark-hook");
-        {
+          Frun_hooks (1, &tem);
-          if (! EQ (omark, nmark))
+        }
-            call1 (Vrun_hooks, intern ("activate-mark-hook"));
+    }
-        }
+  /* If mark has ceased to be active, run deactivate hook.  */
-      /* If mark has ceased to be active, run deactivate hook.  */
+  else if (! NILP (tem1))
-      else if (! NILP (tem1))
+    {
-        call1 (Vrun_hooks, intern ("deactivate-mark-hook"));
+      tem = intern ("deactivate-mark-hook");
+      Frun_hooks (1, &tem);
    }
  /* If buffer was visible in a window, and a different window was
@@ -1868,7 +1871,7 @@ Years before 1970 are not guaranteed to work.  On some systems,
 year values as low as 1901 do work.
 usage: (encode-time SECOND MINUTE HOUR DAY MONTH YEAR &optional ZONE)  */)
-  (int nargs, register Lisp_Object *args)
+  (size_t nargs, register Lisp_Object *args)
 {
  time_t value;
  struct tm tm;
@@ -2204,9 +2207,9 @@ general_insert_function (void (*insert_func)
                         void (*insert_from_string_func)
                              (Lisp_Object, EMACS_INT, EMACS_INT,
                               EMACS_INT, EMACS_INT, int),
-                         int inherit, int nargs, Lisp_Object *args)
+                         int inherit, size_t nargs, Lisp_Object *args)
 {
-  register int argnum;
+  register size_t argnum;
  register Lisp_Object val;
  for (argnum = 0; argnum < nargs; argnum++)
@@ -2223,7 +2226,7 @@ general_insert_function (void (*insert_func)
            {
              str[0] = (ASCII_CHAR_P (XINT (val))
                        ? XINT (val)
-                        : multibyte_char_to_unibyte (XINT (val), Qnil));
+                        : multibyte_char_to_unibyte (XINT (val)));
              len = 1;
            }
          (*insert_func) ((char *) str, len);
@@ -2269,7 +2272,7 @@ buffer; to accomplish this, apply `string-as-multibyte' to the string
 and insert the result.
 usage: (insert &rest ARGS)  */)
-  (int nargs, register Lisp_Object *args)
+  (size_t nargs, register Lisp_Object *args)
 {
  general_insert_function (insert, insert_from_string, 0, nargs, args);
  return Qnil;
@@ -2288,7 +2291,7 @@ If the current buffer is unibyte, multibyte strings are converted
 to unibyte for insertion.
 usage: (insert-and-inherit &rest ARGS)  */)
-  (int nargs, register Lisp_Object *args)
+  (size_t nargs, register Lisp_Object *args)
 {
  general_insert_function (insert_and_inherit, insert_from_string, 1,
                           nargs, args);
@@ -2305,7 +2308,7 @@ If the current buffer is unibyte, multibyte strings are converted
 to unibyte for insertion.
 usage: (insert-before-markers &rest ARGS)  */)
-  (int nargs, register Lisp_Object *args)
+  (size_t nargs, register Lisp_Object *args)
 {
  general_insert_function (insert_before_markers,
                           insert_from_string_before_markers, 0,
@@ -2324,7 +2327,7 @@ If the current buffer is unibyte, multibyte strings are converted
 to unibyte for insertion.
 usage: (insert-before-markers-and-inherit &rest ARGS)  */)
-  (int nargs, register Lisp_Object *args)
+  (size_t nargs, register Lisp_Object *args)
 {
  general_insert_function (insert_before_markers_and_inherit,
                           insert_from_string_before_markers, 1,
@@ -3396,7 +3399,7 @@ any existing message; this lets the minibuffer contents show.  See
 also `current-message'.
 usage: (message FORMAT-STRING &rest ARGS)  */)
-  (int nargs, Lisp_Object *args)
+  (size_t nargs, Lisp_Object *args)
 {
  if (NILP (args[0])
      || (STRINGP (args[0])
@@ -3424,7 +3427,7 @@ If the first argument is nil or the empty string, clear any existing
 message; let the minibuffer contents show.
 usage: (message-box FORMAT-STRING &rest ARGS)  */)
-  (int nargs, Lisp_Object *args)
+  (size_t nargs, Lisp_Object *args)
 {
  if (NILP (args[0]))
    {
@@ -3441,12 +3444,12 @@ usage: (message-box FORMAT-STRING &rest ARGS)  */)
      if (FRAME_WINDOW_P (XFRAME (selected_frame))
          || FRAME_MSDOS_P (XFRAME (selected_frame)))
      {
-        Lisp_Object pane, menu, obj;
+        Lisp_Object pane, menu;
        struct gcpro gcpro1;
        pane = Fcons (Fcons (build_string ("OK"), Qt), Qnil);
        GCPRO1 (pane);
        menu = Fcons (val, pane);
-        obj = Fx_popup_dialog (Qt, menu, Qt);
+        Fx_popup_dialog (Qt, menu, Qt);
        UNGCPRO;
        return val;
      }
@@ -3481,7 +3484,7 @@ If the first argument is nil or the empty string, clear any existing
 message; let the minibuffer contents show.
 usage: (message-or-box FORMAT-STRING &rest ARGS)  */)
-  (int nargs, Lisp_Object *args)
+  (size_t nargs, Lisp_Object *args)
 {
 #ifdef HAVE_MENUS
  if ((NILP (last_nonmenu_event) || CONSP (last_nonmenu_event))
@@ -3505,14 +3508,14 @@ First argument is the string to copy.
 Remaining arguments form a sequence of PROPERTY VALUE pairs for text
 properties to add to the result.
 usage: (propertize STRING &rest PROPERTIES)  */)
-  (int nargs, Lisp_Object *args)
+  (size_t nargs, Lisp_Object *args)
 {
  Lisp_Object properties, string;
  struct gcpro gcpro1, gcpro2;
-  int i;
+  size_t i;
  /* Number of args must be odd.  */
-  if ((nargs & 1) == 0 || nargs < 1)
+  if ((nargs & 1) == 0)
    error ("Wrong number of arguments");
  properties = string = Qnil;
@@ -3587,10 +3590,10 @@ decimal point itself is omitted.  For %s and %S, the precision
 specifier truncates the string to the given width.
 usage: (format STRING &rest OBJECTS)  */)
-  (int nargs, register Lisp_Object *args)
+  (size_t nargs, register Lisp_Object *args)
 {
-  register int n;               /* The number of the next arg to substitute */
+  register size_t n;            /* The number of the next arg to substitute */
-  register EMACS_INT total;     /* An estimate of the final length */
+  register size_t total;        /* An estimate of the final length */
  char *buf, *p;
  register char *format, *end, *format_start;
  int nchars;
@@ -3666,8 +3669,8 @@ usage: (format STRING &rest OBJECTS)  */)
  /* Allocate the info and discarded tables.  */
  {
-    int nbytes = (nargs+1) * sizeof *info;
+    size_t nbytes = (nargs+1) * sizeof *info;
-    int i;
+    size_t i;
    if (!info)
      info = (struct info *) alloca (nbytes);
    memset (info, 0, nbytes);
diff --git a/src/emacs.c b/src/emacs.c
index 052f22ea622..6bdd2550ed1 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -308,7 +308,7 @@ pthread_t main_thread;
 /* Handle bus errors, invalid instruction, etc.  */
-SIGTYPE
+void
 fatal_error_signal (int sig)
 {
  SIGNAL_THREAD_CHECK (sig);
@@ -345,7 +345,7 @@ fatal_error_signal (int sig)
 #ifdef SIGDANGER
 /* Handler for SIGDANGER.  */
-SIGTYPE
+void
 memory_warning_signal (sig)
     int sig;
 {
@@ -1972,14 +1972,15 @@ all of which are called before Emacs is actually killed.  */)
  (Lisp_Object arg)
 {
  struct gcpro gcpro1;
+  Lisp_Object hook;
  GCPRO1 (arg);
  if (feof (stdin))
    arg = Qt;
-  if (!NILP (Vrun_hooks))
+  hook = intern ("kill-emacs-hook");
-    call1 (Vrun_hooks, intern ("kill-emacs-hook"));
+  Frun_hooks (1, &hook);
  UNGCPRO;
@@ -2312,6 +2313,7 @@ from the parent process and its tty file descriptors.  */)
  (void)
 {
  int nfd;
+  int err = 0;
  if (!IS_DAEMON)
    error ("This function can only be called if emacs is run as a daemon");
@@ -2324,10 +2326,11 @@ from the parent process and its tty file descriptors.  */)
  /* Get rid of stdin, stdout and stderr.  */
  nfd = open ("/dev/null", O_RDWR);
-  dup2 (nfd, 0);
+  err |= nfd < 0;
-  dup2 (nfd, 1);
+  err |= dup2 (nfd, 0) < 0;
-  dup2 (nfd, 2);
+  err |= dup2 (nfd, 1) < 0;
-  close (nfd);
+  err |= dup2 (nfd, 2) < 0;
+  err |= close (nfd) != 0;
  /* Closing the pipe will notify the parent that it can exit.
     FIXME: In case some other process inherited the pipe, closing it here
@@ -2336,10 +2339,13 @@ from the parent process and its tty file descriptors.  */)
     Instead, we should probably close the pipe in start-process and
     call-process to make sure the pipe is never inherited by
     subprocesses.  */
-  write (daemon_pipe[1], "\n", 1);
+  err |= write (daemon_pipe[1], "\n", 1) < 0;
-  close (daemon_pipe[1]);
+  err |= close (daemon_pipe[1]) != 0;
  /* Set it to an invalid value so we know we've already run this function.  */
  daemon_pipe[1] = -1;
+  if (err)
+    error ("I/O error during daemon initialization");
  return Qt;
 }
diff --git a/src/eval.c b/src/eval.c
index c22e7d3f571..9f90e6df4b5 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -30,24 +30,28 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "xterm.h"
 #endif
-/* This definition is duplicated in alloc.c and keyboard.c */
+/* This definition is duplicated in alloc.c and keyboard.c.  */
-/* Putting it in lisp.h makes cc bomb out! */
+/* Putting it in lisp.h makes cc bomb out!  */
 struct backtrace
 {
  struct backtrace *next;
  Lisp_Object *function;
-  Lisp_Object *args;    /* Points to vector of args. */
+  Lisp_Object *args;    /* Points to vector of args.  */
-  int nargs;            /* Length of vector.
+#define NARGS_BITS (BITS_PER_INT - 2)
-                           If nargs is UNEVALLED, args points to slot holding
+  /* Let's not use size_t because we want to allow negative values (for
-                           list of unevalled args */
+     UNEVALLED).  Also let's steal 2 bits so we save a word (or more for
-  char evalargs;
+     alignment).  In any case I doubt Emacs would survive a function call with
-  /* Nonzero means call value of debugger when done with this operation. */
+     more than 500M arguments.  */
-  char debug_on_exit;
+  int nargs : NARGS_BITS; /* Length of vector.
+                             If nargs is UNEVALLED, args points
+                             to slot holding list of unevalled args.  */
+  char evalargs : 1;
+  /* Nonzero means call value of debugger when done with this operation.  */
+  char debug_on_exit : 1;
 };
 struct backtrace *backtrace_list;
 struct catchtag *catchlist;
 #ifdef DEBUG_GCPRO
@@ -114,7 +118,7 @@ Lisp_Object Vsignaling_function;
 int handling_signal;
 static Lisp_Object apply_lambda (Lisp_Object fun, Lisp_Object args);
-static Lisp_Object funcall_lambda (Lisp_Object, int, Lisp_Object *);
+static Lisp_Object funcall_lambda (Lisp_Object, size_t, Lisp_Object *);
 static void unwind_to_catch (struct catchtag *, Lisp_Object) NO_RETURN;
 static int interactive_p (int);
@@ -148,7 +152,7 @@ init_eval (void)
  when_entered_debugger = -1;
 }
-/* unwind-protect function used by call_debugger.  */
+/* Unwind-protect function used by call_debugger.  */
 static Lisp_Object
 restore_stack_limits (Lisp_Object data)
@@ -578,7 +582,7 @@ interactive_p (int exclude_subrs_p)
             || btp->nargs == UNEVALLED))
    btp = btp->next;
-  /* btp now points at the frame of the innermost function that isn't
+  /* `btp' now points at the frame of the innermost function that isn't
     a special form, ignoring frames for Finteractive_p and/or
     Fbytecode at the top.  If this frame is for a built-in function
     (such as load or eval-region) return nil.  */
@@ -586,7 +590,7 @@ interactive_p (int exclude_subrs_p)
  if (exclude_subrs_p && SUBRP (fun))
    return 0;
-  /* btp points to the frame of a Lisp function that called interactive-p.
+  /* `btp' points to the frame of a Lisp function that called interactive-p.
     Return t if that function was called interactively.  */
  if (btp && btp->next && EQ (*btp->next->function, Qcall_interactively))
    return 1;
@@ -1028,17 +1032,17 @@ usage: (let VARLIST BODY...)  */)
  Lisp_Object *temps, tem, lexenv;
  register Lisp_Object elt, varlist;
  int count = SPECPDL_INDEX ();
-  register int argnum;
+  register size_t argnum;
  struct gcpro gcpro1, gcpro2;
  USE_SAFE_ALLOCA;
  varlist = Fcar (args);
-  /* Make space to hold the values to give the bound variables */
+  /* Make space to hold the values to give the bound variables.  */
  elt = Flength (varlist);
  SAFE_ALLOCA_LISP (temps, XFASTINT (elt));
-  /* Compute the values and store them in `temps' */
+  /* Compute the values and store them in `temps'.  */
  GCPRO2 (args, *temps);
  gcpro2.nvars = 0;
@@ -1155,7 +1159,7 @@ definitions to shadow the loaded ones for use in file byte-compilation.  */)
          /* SYM is not mentioned in ENVIRONMENT.
             Look at its function definition.  */
          if (EQ (def, Qunbound) || !CONSP (def))
-            /* Not defined or definition not suitable */
+            /* Not defined or definition not suitable.  */
            break;
          if (EQ (XCAR (def), Qautoload))
            {
@@ -1296,10 +1300,7 @@ unwind_to_catch (struct catchtag *catch, Lisp_Object value)
  byte_stack_list = catch->byte_stack;
  gcprolist = catch->gcpro;
 #ifdef DEBUG_GCPRO
-  if (gcprolist != 0)
+  gcpro_level = gcprolist ? gcprolist->level + 1 : gcpro_level = 0;
-    gcpro_level = gcprolist->level + 1;
-  else
-    gcpro_level = 0;
 #endif
  backtrace_list = catch->backlist;
  lisp_eval_depth = catch->lisp_eval_depth;
@@ -1594,8 +1595,8 @@ internal_condition_case_2 (Lisp_Object (*bfun) (Lisp_Object, Lisp_Object),
   and ARGS as second argument.  */
 Lisp_Object
-internal_condition_case_n (Lisp_Object (*bfun) (int, Lisp_Object*),
+internal_condition_case_n (Lisp_Object (*bfun) (size_t, Lisp_Object *),
-                           int nargs,
+                           size_t nargs,
                           Lisp_Object *args,
                           Lisp_Object handlers,
                           Lisp_Object (*hfun) (Lisp_Object))
@@ -1907,7 +1908,7 @@ maybe_call_debugger (Lisp_Object conditions, Lisp_Object sig, Lisp_Object data)
          ? debug_on_quit
          : wants_debugger (Vdebug_on_error, conditions))
      && ! skip_debugger (conditions, combined_data)
-      /* rms: what's this for? */
+      /* RMS: What's this for?  */
      && when_entered_debugger < num_nonmacro_input_events)
    {
      call_debugger (Fcons (Qerror, Fcons (combined_data, Qnil)));
@@ -1974,7 +1975,7 @@ find_handler_clause (Lisp_Object handlers, Lisp_Object conditions,
 }
-/* dump an error message; called like vprintf */
+/* Dump an error message; called like vprintf.  */
 void
 verror (const char *m, va_list ap)
 {
@@ -2011,7 +2012,7 @@ verror (const char *m, va_list ap)
 }
-/* dump an error message; called like printf */
+/* Dump an error message; called like printf.  */
 /* VARARGS 1 */
 void
@@ -2109,7 +2110,7 @@ this does nothing and returns nil.  */)
  CHECK_SYMBOL (function);
  CHECK_STRING (file);
-  /* If function is defined and not as an autoload, don't override */
+  /* If function is defined and not as an autoload, don't override.  */
  if (!EQ (XSYMBOL (function)->function, Qunbound)
      && !(CONSP (XSYMBOL (function)->function)
           && EQ (XCAR (XSYMBOL (function)->function), Qautoload)))
@@ -2269,7 +2270,7 @@ eval_sub (Lisp_Object form)
  backtrace.next = backtrace_list;
  backtrace_list = &backtrace;
-  backtrace.function = &original_fun; /* This also protects them from gc */
+  backtrace.function = &original_fun; /* This also protects them from gc.  */
  backtrace.args = &original_args;
  backtrace.nargs = UNEVALLED;
  backtrace.evalargs = 1;
@@ -2279,7 +2280,7 @@ eval_sub (Lisp_Object form)
    do_debug_on_call (Qt);
  /* At this point, only original_fun and original_args
-     have values that will be used below */
+     have values that will be used below.  */
 retry:
  /* Optimize for no indirection.  */
@@ -2300,8 +2301,9 @@ eval_sub (Lisp_Object form)
      CHECK_CONS_LIST ();
-      if (XINT (numargs) < XSUBR (fun)->min_args ||
+      if (XINT (numargs) < XSUBR (fun)->min_args
-          (XSUBR (fun)->max_args >= 0 && XSUBR (fun)->max_args < XINT (numargs)))
+          || (XSUBR (fun)->max_args >= 0
+              && XSUBR (fun)->max_args < XINT (numargs)))
        xsignal2 (Qwrong_number_of_arguments, original_fun, numargs);
      else if (XSUBR (fun)->max_args == UNEVALLED)
@@ -2311,9 +2313,9 @@ eval_sub (Lisp_Object form)
        }
      else if (XSUBR (fun)->max_args == MANY)
        {
-          /* Pass a vector of evaluated arguments */
+          /* Pass a vector of evaluated arguments.  */
          Lisp_Object *vals;
-          register int argnum = 0;
+          register size_t argnum = 0;
          USE_SAFE_ALLOCA;
          SAFE_ALLOCA_LISP (vals, XINT (numargs));
@@ -2443,9 +2445,9 @@ DEFUN ("apply", Fapply, Sapply, 2, MANY, 0,
 Then return the value FUNCTION returns.
 Thus, (apply '+ 1 2 '(3 4)) returns 10.
 usage: (apply FUNCTION &rest ARGUMENTS)  */)
-  (int nargs, Lisp_Object *args)
+  (size_t nargs, Lisp_Object *args)
 {
-  register int i, numargs;
+  register size_t i, numargs;
  register Lisp_Object spread_arg;
  register Lisp_Object *funcall_args;
  Lisp_Object fun, retval;
@@ -2475,7 +2477,7 @@ usage: (apply FUNCTION &rest ARGUMENTS)  */)
    fun = indirect_function (fun);
  if (EQ (fun, Qunbound))
    {
-      /* Let funcall get the error */
+      /* Let funcall get the error.  */
      fun = args[0];
      goto funcall;
    }
@@ -2484,11 +2486,11 @@ usage: (apply FUNCTION &rest ARGUMENTS)  */)
    {
      if (numargs < XSUBR (fun)->min_args
          || (XSUBR (fun)->max_args >= 0 && XSUBR (fun)->max_args < numargs))
-        goto funcall;           /* Let funcall get the error */
+        goto funcall;           /* Let funcall get the error.  */
-      else if (XSUBR (fun)->max_args > numargs)
+      else if (XSUBR (fun)->max_args >= 0 && XSUBR (fun)->max_args > numargs)
        {
          /* Avoid making funcall cons up a yet another new vector of arguments
-             by explicitly supplying nil's for optional values */
+             by explicitly supplying nil's for optional values.  */
          SAFE_ALLOCA_LISP (funcall_args, 1 + XSUBR (fun)->max_args);
          for (i = numargs; i < XSUBR (fun)->max_args;)
            funcall_args[++i] = Qnil;
@@ -2526,9 +2528,12 @@ usage: (apply FUNCTION &rest ARGUMENTS)  */)
 /* Run hook variables in various ways.  */
-enum run_hooks_condition {to_completion, until_success, until_failure};
+static Lisp_Object
-static Lisp_Object run_hook_with_args (int, Lisp_Object *,
+funcall_nil (size_t nargs, Lisp_Object *args)
-                                       enum run_hooks_condition);
+{
+  Ffuncall (nargs, args);
+  return Qnil;
+}
 DEFUN ("run-hooks", Frun_hooks, Srun_hooks, 0, MANY, 0,
       doc: /* Run each hook in HOOKS.
@@ -2545,15 +2550,15 @@ hook; they should use `run-mode-hooks' instead.
 Do not use `make-local-variable' to make a hook variable buffer-local.
 Instead, use `add-hook' and specify t for the LOCAL argument.
 usage: (run-hooks &rest HOOKS)  */)
-  (int nargs, Lisp_Object *args)
+  (size_t nargs, Lisp_Object *args)
 {
  Lisp_Object hook[1];
-  register int i;
+  register size_t i;
  for (i = 0; i < nargs; i++)
    {
      hook[0] = args[i];
-      run_hook_with_args (1, hook, to_completion);
+      run_hook_with_args (1, hook, funcall_nil);
    }
  return Qnil;
@@ -2574,9 +2579,9 @@ as that may change.
 Do not use `make-local-variable' to make a hook variable buffer-local.
 Instead, use `add-hook' and specify t for the LOCAL argument.
 usage: (run-hook-with-args HOOK &rest ARGS)  */)
-  (int nargs, Lisp_Object *args)
+  (size_t nargs, Lisp_Object *args)
 {
-  return run_hook_with_args (nargs, args, to_completion);
+  return run_hook_with_args (nargs, args, funcall_nil);
 }
 DEFUN ("run-hook-with-args-until-success", Frun_hook_with_args_until_success,
@@ -2594,9 +2599,15 @@ However, if they all return nil, we return nil.
 Do not use `make-local-variable' to make a hook variable buffer-local.
 Instead, use `add-hook' and specify t for the LOCAL argument.
 usage: (run-hook-with-args-until-success HOOK &rest ARGS)  */)
-  (int nargs, Lisp_Object *args)
+  (size_t nargs, Lisp_Object *args)
 {
-  return run_hook_with_args (nargs, args, until_success);
+  return run_hook_with_args (nargs, args, Ffuncall);
+}
+static Lisp_Object
+funcall_not (size_t nargs, Lisp_Object *args)
+{
+  return NILP (Ffuncall (nargs, args)) ? Qt : Qnil;
 }
 DEFUN ("run-hook-with-args-until-failure", Frun_hook_with_args_until_failure,
@@ -2613,23 +2624,47 @@ Then we return nil.  However, if they all return non-nil, we return non-nil.
 Do not use `make-local-variable' to make a hook variable buffer-local.
 Instead, use `add-hook' and specify t for the LOCAL argument.
 usage: (run-hook-with-args-until-failure HOOK &rest ARGS)  */)
-  (int nargs, Lisp_Object *args)
+  (size_t nargs, Lisp_Object *args)
 {
-  return run_hook_with_args (nargs, args, until_failure);
+  return NILP (run_hook_with_args (nargs, args, funcall_not)) ? Qt : Qnil;
+}
+static Lisp_Object
+run_hook_wrapped_funcall (size_t nargs, Lisp_Object *args)
+{
+  Lisp_Object tmp = args[0], ret;
+  args[0] = args[1];
+  args[1] = tmp;
+  ret = Ffuncall (nargs, args);
+  args[1] = args[0];
+  args[0] = tmp;
+  return ret;
+}
+DEFUN ("run-hook-wrapped", Frun_hook_wrapped, Srun_hook_wrapped, 2, MANY, 0,
+       doc: /* Run HOOK, passing each function through WRAP-FUNCTION.
+I.e. instead of calling each function FUN directly with arguments ARGS,
+it calls WRAP-FUNCTION with arguments FUN and ARGS.
+As soon as a call to WRAP-FUNCTION returns non-nil, `run-hook-wrapped'
+aborts and returns that value.
+usage: (run-hook-wrapped HOOK WRAP-FUNCTION &rest ARGS)  */)
+     (size_t nargs, Lisp_Object *args)
+{
+  return run_hook_with_args (nargs, args, run_hook_wrapped_funcall);
 }
 /* ARGS[0] should be a hook symbol.
   Call each of the functions in the hook value, passing each of them
   as arguments all the rest of ARGS (all NARGS - 1 elements).
-   COND specifies a condition to test after each call
+   FUNCALL specifies how to call each function on the hook.
-   to decide whether to stop.
   The caller (or its caller, etc) must gcpro all of ARGS,
   except that it isn't necessary to gcpro ARGS[0].  */
-static Lisp_Object
+Lisp_Object
-run_hook_with_args (int nargs, Lisp_Object *args, enum run_hooks_condition cond)
+run_hook_with_args (size_t nargs, Lisp_Object *args,
+                    Lisp_Object (*funcall) (size_t nargs, Lisp_Object *args))
 {
-  Lisp_Object sym, val, ret;
+  Lisp_Object sym, val, ret = Qnil;
  struct gcpro gcpro1, gcpro2, gcpro3;
  /* If we are dying or still initializing,
@@ -2639,14 +2674,13 @@ run_hook_with_args (int nargs, Lisp_Object *args, enum run_hooks_condition cond)
  sym = args[0];
  val = find_symbol_value (sym);
-  ret = (cond == until_failure ? Qt : Qnil);
  if (EQ (val, Qunbound) || NILP (val))
    return ret;
  else if (!CONSP (val) || EQ (XCAR (val), Qlambda))
    {
      args[0] = val;
-      return Ffuncall (nargs, args);
+      return funcall (nargs, args);
    }
  else
    {
@@ -2654,9 +2688,7 @@ run_hook_with_args (int nargs, Lisp_Object *args, enum run_hooks_condition cond)
      GCPRO3 (sym, val, global_vals);
      for (;
-           CONSP (val) && ((cond == to_completion)
+           CONSP (val) && NILP (ret);
-                           || (cond == until_success ? NILP (ret)
-                               : !NILP (ret)));
           val = XCDR (val))
        {
          if (EQ (XCAR (val), Qt))
@@ -2669,30 +2701,26 @@ run_hook_with_args (int nargs, Lisp_Object *args, enum run_hooks_condition cond)
              if (!CONSP (global_vals) || EQ (XCAR (global_vals), Qlambda))
                {
                  args[0] = global_vals;
-                  ret = Ffuncall (nargs, args);
+                  ret = funcall (nargs, args);
                }
              else
                {
                  for (;
-                       (CONSP (global_vals)
+                       CONSP (global_vals) && NILP (ret);
-                        && (cond == to_completion
-                            || (cond == until_success
-                                ? NILP (ret)
-                                : !NILP (ret))));
                       global_vals = XCDR (global_vals))
                    {
                      args[0] = XCAR (global_vals);
                      /* In a global value, t should not occur.  If it does, we
                         must ignore it to avoid an endless loop.  */
                      if (!EQ (args[0], Qt))
-                        ret = Ffuncall (nargs, args);
+                        ret = funcall (nargs, args);
                    }
                }
            }
          else
            {
              args[0] = XCAR (val);
-              ret = Ffuncall (nargs, args);
+              ret = funcall (nargs, args);
            }
        }
@@ -2714,7 +2742,7 @@ run_hook_with_args_2 (Lisp_Object hook, Lisp_Object arg1, Lisp_Object arg2)
  Frun_hook_with_args (3, temp);
 }
-/* Apply fn to arg */
+/* Apply fn to arg.  */
 Lisp_Object
 apply1 (Lisp_Object fn, Lisp_Object arg)
 {
@@ -2733,7 +2761,7 @@ apply1 (Lisp_Object fn, Lisp_Object arg)
  }
 }
-/* Call function fn on no arguments */
+/* Call function fn on no arguments.  */
 Lisp_Object
 call0 (Lisp_Object fn)
 {
@@ -2743,7 +2771,7 @@ call0 (Lisp_Object fn)
  RETURN_UNGCPRO (Ffuncall (1, &fn));
 }
-/* Call function fn with 1 argument arg1 */
+/* Call function fn with 1 argument arg1.  */
 /* ARGSUSED */
 Lisp_Object
 call1 (Lisp_Object fn, Lisp_Object arg1)
@@ -2758,7 +2786,7 @@ call1 (Lisp_Object fn, Lisp_Object arg1)
  RETURN_UNGCPRO (Ffuncall (2, args));
 }
-/* Call function fn with 2 arguments arg1, arg2 */
+/* Call function fn with 2 arguments arg1, arg2.  */
 /* ARGSUSED */
 Lisp_Object
 call2 (Lisp_Object fn, Lisp_Object arg1, Lisp_Object arg2)
@@ -2773,7 +2801,7 @@ call2 (Lisp_Object fn, Lisp_Object arg1, Lisp_Object arg2)
  RETURN_UNGCPRO (Ffuncall (3, args));
 }
-/* Call function fn with 3 arguments arg1, arg2, arg3 */
+/* Call function fn with 3 arguments arg1, arg2, arg3.  */
 /* ARGSUSED */
 Lisp_Object
 call3 (Lisp_Object fn, Lisp_Object arg1, Lisp_Object arg2, Lisp_Object arg3)
@@ -2789,7 +2817,7 @@ call3 (Lisp_Object fn, Lisp_Object arg1, Lisp_Object arg2, Lisp_Object arg3)
  RETURN_UNGCPRO (Ffuncall (4, args));
 }
-/* Call function fn with 4 arguments arg1, arg2, arg3, arg4 */
+/* Call function fn with 4 arguments arg1, arg2, arg3, arg4.  */
 /* ARGSUSED */
 Lisp_Object
 call4 (Lisp_Object fn, Lisp_Object arg1, Lisp_Object arg2, Lisp_Object arg3,
@@ -2807,7 +2835,7 @@ call4 (Lisp_Object fn, Lisp_Object arg1, Lisp_Object arg2, Lisp_Object arg3,
  RETURN_UNGCPRO (Ffuncall (5, args));
 }
-/* Call function fn with 5 arguments arg1, arg2, arg3, arg4, arg5 */
+/* Call function fn with 5 arguments arg1, arg2, arg3, arg4, arg5.  */
 /* ARGSUSED */
 Lisp_Object
 call5 (Lisp_Object fn, Lisp_Object arg1, Lisp_Object arg2, Lisp_Object arg3,
@@ -2826,7 +2854,7 @@ call5 (Lisp_Object fn, Lisp_Object arg1, Lisp_Object arg2, Lisp_Object arg3,
  RETURN_UNGCPRO (Ffuncall (6, args));
 }
-/* Call function fn with 6 arguments arg1, arg2, arg3, arg4, arg5, arg6 */
+/* Call function fn with 6 arguments arg1, arg2, arg3, arg4, arg5, arg6.  */
 /* ARGSUSED */
 Lisp_Object
 call6 (Lisp_Object fn, Lisp_Object arg1, Lisp_Object arg2, Lisp_Object arg3,
@@ -2846,7 +2874,7 @@ call6 (Lisp_Object fn, Lisp_Object arg1, Lisp_Object arg2, Lisp_Object arg3,
  RETURN_UNGCPRO (Ffuncall (7, args));
 }
-/* Call function fn with 7 arguments arg1, arg2, arg3, arg4, arg5, arg6, arg7 */
+/* Call function fn with 7 arguments arg1, arg2, arg3, arg4, arg5, arg6, arg7.  */
 /* ARGSUSED */
 Lisp_Object
 call7 (Lisp_Object fn, Lisp_Object arg1, Lisp_Object arg2, Lisp_Object arg3,
@@ -2907,16 +2935,16 @@ DEFUN ("funcall", Ffuncall, Sfuncall, 1, MANY, 0,
 Return the value that function returns.
 Thus, (funcall 'cons 'x 'y) returns (x . y).
 usage: (funcall FUNCTION &rest ARGUMENTS)  */)
-  (int nargs, Lisp_Object *args)
+  (size_t nargs, Lisp_Object *args)
 {
  Lisp_Object fun, original_fun;
  Lisp_Object funcar;
-  int numargs = nargs - 1;
+  size_t numargs = nargs - 1;
  Lisp_Object lisp_numargs;
  Lisp_Object val;
  struct backtrace backtrace;
  register Lisp_Object *internal_args;
-  register int i;
+  register size_t i;
  QUIT;
  if ((consing_since_gc > gc_cons_threshold
@@ -3070,21 +3098,21 @@ static Lisp_Object
 apply_lambda (Lisp_Object fun, Lisp_Object args)
 {
  Lisp_Object args_left;
-  Lisp_Object numargs;
+  size_t numargs;
  register Lisp_Object *arg_vector;
  struct gcpro gcpro1, gcpro2, gcpro3;
-  register int i;
+  register size_t i;
  register Lisp_Object tem;
  USE_SAFE_ALLOCA;
-  numargs = Flength (args);
+  numargs = XINT (Flength (args));
-  SAFE_ALLOCA_LISP (arg_vector, XINT (numargs));
+  SAFE_ALLOCA_LISP (arg_vector, numargs);
  args_left = args;
  GCPRO3 (*arg_vector, args_left, fun);
  gcpro1.nvars = 0;
-  for (i = 0; i < XINT (numargs);)
+  for (i = 0; i < numargs; )
    {
      tem = Fcar (args_left), args_left = Fcdr (args_left);
      tem = eval_sub (tem);
@@ -3097,7 +3125,7 @@ apply_lambda (Lisp_Object fun, Lisp_Object args)
  backtrace_list->args = arg_vector;
  backtrace_list->nargs = i;
  backtrace_list->evalargs = 0;
-  tem = funcall_lambda (fun, XINT (numargs), arg_vector);
+  tem = funcall_lambda (fun, numargs, arg_vector);
  /* Do the debug-on-exit now, while arg_vector still exists.  */
  if (backtrace_list->debug_on_exit)
@@ -3113,12 +3141,13 @@ apply_lambda (Lisp_Object fun, Lisp_Object args)
   FUN must be either a lambda-expression or a compiled-code object.  */
 static Lisp_Object
-funcall_lambda (Lisp_Object fun, int nargs,
+funcall_lambda (Lisp_Object fun, size_t nargs,
                register Lisp_Object *arg_vector)
 {
  Lisp_Object val, syms_left, next, lexenv;
  int count = SPECPDL_INDEX ();
-  int i, optional, rest;
+  size_t i;
+  int optional, rest;
  if (CONSP (fun))
    {
@@ -3270,7 +3299,7 @@ grow_specpdl (void)
  specpdl_ptr = specpdl + count;
 }
-/* specpdl_ptr->symbol is a field which describes which variable is
+/* `specpdl_ptr->symbol' is a field which describes which variable is
   let-bound, so it can be properly undone when we unbind_to.
   It can have the following two shapes:
   - SYMBOL : if it's a plain symbol, it means that we have let-bound
@@ -3500,7 +3529,6 @@ Output stream used is value of `standard-output'.  */)
  (void)
 {
  register struct backtrace *backlist = backtrace_list;
-  register int i;
  Lisp_Object tail;
  Lisp_Object tem;
  struct gcpro gcpro1;
@@ -3523,13 +3551,14 @@ Output stream used is value of `standard-output'.  */)
      else
        {
          tem = *backlist->function;
-          Fprin1 (tem, Qnil);   /* This can QUIT */
+          Fprin1 (tem, Qnil);   /* This can QUIT.  */
          write_string ("(", -1);
          if (backlist->nargs == MANY)
-            {
+            {                   /* FIXME: Can this happen?  */
+              int i;
              for (tail = *backlist->args, i = 0;
                   !NILP (tail);
-                   tail = Fcdr (tail), i++)
+                   tail = Fcdr (tail), i = 1)
                {
                  if (i) write_string (" ", -1);
                  Fprin1 (Fcar (tail), Qnil);
@@ -3537,6 +3566,7 @@ Output stream used is value of `standard-output'.  */)
            }
          else
            {
+              size_t i;
              for (i = 0; i < backlist->nargs; i++)
                {
                  if (i) write_string (" ", -1);
@@ -3566,7 +3596,7 @@ If NFRAMES is more than the number of frames, the value is nil.  */)
  (Lisp_Object nframes)
 {
  register struct backtrace *backlist = backtrace_list;
-  register int i;
+  register EMACS_INT i;
  Lisp_Object tem;
  CHECK_NATNUM (nframes);
@@ -3581,7 +3611,7 @@ If NFRAMES is more than the number of frames, the value is nil.  */)
    return Fcons (Qnil, Fcons (*backlist->function, *backlist->args));
  else
    {
-      if (backlist->nargs == MANY)
+      if (backlist->nargs == MANY) /* FIXME: Can this happen?  */
        tem = *backlist->args;
      else
        tem = Flist (backlist->nargs, backlist->args);
@@ -3595,17 +3625,18 @@ void
 mark_backtrace (void)
 {
  register struct backtrace *backlist;
-  register int i;
+  register size_t i;
  for (backlist = backtrace_list; backlist; backlist = backlist->next)
    {
      mark_object (*backlist->function);
-      if (backlist->nargs == UNEVALLED || backlist->nargs == MANY)
+      if (backlist->nargs == UNEVALLED
-        i = 0;
+          || backlist->nargs == MANY) /* FIXME: Can this happen?  */
+        i = 1;
      else
-        i = backlist->nargs - 1;
+        i = backlist->nargs;
-      for (; i >= 0; i--)
+      while (i--)
        mark_object (backlist->args[i]);
    }
 }
@@ -3820,6 +3851,7 @@ alist of active lexical bindings.  */);
  defsubr (&Srun_hook_with_args);
  defsubr (&Srun_hook_with_args_until_success);
  defsubr (&Srun_hook_with_args_until_failure);
+  defsubr (&Srun_hook_wrapped);
  defsubr (&Sfetch_bytecode);
  defsubr (&Sbacktrace_debug);
  defsubr (&Sbacktrace);
diff --git a/src/fileio.c b/src/fileio.c
index 5d33fb93878..85431dfd5b1 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -1951,9 +1951,10 @@ on the system, we copy the SELinux context of FILE to NEWNAME.  */)
     owner and group.  */
  if (input_file_statable_p)
    {
-      if (! NILP (preserve_uid_gid))
+      if (!NILP (preserve_uid_gid) && fchown (ofd, st.st_uid, st.st_gid) != 0)
-        fchown (ofd, st.st_uid, st.st_gid);
+        report_file_error ("Doing chown", Fcons (newname, Qnil));
-      fchmod (ofd, st.st_mode & 07777);
+      if (fchmod (ofd, st.st_mode & 07777) != 0)
+        report_file_error ("Doing chmod", Fcons (newname, Qnil));
    }
 #endif  /* not MSDOS */
@@ -2358,8 +2359,6 @@ static int
 check_executable (char *filename)
 {
 #ifdef DOS_NT
-  int len = strlen (filename);
-  char *suffix;
  struct stat st;
  if (stat (filename, &st) < 0)
    return 0;
@@ -2785,13 +2784,14 @@ as a list ("user", "role", "type", "range"). Has no effect if SELinux
 is disabled. */)
  (Lisp_Object filename, Lisp_Object context)
 {
-  Lisp_Object absname, encoded_absname;
+  Lisp_Object absname;
  Lisp_Object handler;
+#if HAVE_LIBSELINUX
+  Lisp_Object encoded_absname;
  Lisp_Object user = CAR_SAFE (context);
  Lisp_Object role = CAR_SAFE (CDR_SAFE (context));
  Lisp_Object type = CAR_SAFE (CDR_SAFE (CDR_SAFE (context)));
  Lisp_Object range = CAR_SAFE (CDR_SAFE (CDR_SAFE (CDR_SAFE (context))));
-#if HAVE_LIBSELINUX
  security_context_t con;
  int fail, conlength;
  context_t parsed_con;
@@ -2805,12 +2805,11 @@ is disabled. */)
  if (!NILP (handler))
    return call3 (handler, Qset_file_selinux_context, absname, context);
-  encoded_absname = ENCODE_FILE (absname);
 #if HAVE_LIBSELINUX
  if (is_selinux_enabled ())
    {
      /* Get current file context. */
+      encoded_absname = ENCODE_FILE (absname);
      conlength = lgetfilecon (SSDATA (encoded_absname), &con);
      if (conlength > 0)
        {
@@ -5179,7 +5178,7 @@ A non-nil CURRENT-ONLY argument means save only current buffer.  */)
  (Lisp_Object no_message, Lisp_Object current_only)
 {
  struct buffer *old = current_buffer, *b;
-  Lisp_Object tail, buf;
+  Lisp_Object tail, buf, hook;
  int auto_saved = 0;
  int do_handled_files;
  Lisp_Object oquit;
@@ -5209,8 +5208,8 @@ A non-nil CURRENT-ONLY argument means save only current buffer.  */)
  /* No GCPRO needed, because (when it matters) all Lisp_Object variables
     point to non-strings reached from Vbuffer_alist.  */
-  if (!NILP (Vrun_hooks))
+  hook = intern ("auto-save-hook");
-    call1 (Vrun_hooks, intern ("auto-save-hook"));
+  Frun_hooks (1, &hook);
  if (STRINGP (Vauto_save_list_file_name))
    {
diff --git a/src/floatfns.c b/src/floatfns.c
index bc03509b757..1232fc0afa1 100644
--- a/src/floatfns.c
+++ b/src/floatfns.c
@@ -103,7 +103,7 @@ extern double logb (double);
 #endif
 #ifdef FLOAT_CATCH_SIGILL
-static SIGTYPE float_error ();
+static void float_error ();
 #endif
 /* Nonzero while executing in floating point.
@@ -126,7 +126,7 @@ static const char *float_error_fn_name;
   Handle errors which may result in signals or may set errno.
   Note that float_error may be declared to return void, so you can't
-   just cast the zero after the colon to (SIGTYPE) to make the types
+   just cast the zero after the colon to (void) to make the types
   check properly.  */
 #ifdef FLOAT_CHECK_ERRNO
@@ -960,7 +960,7 @@ Rounds the value toward zero.  */)
 }
 #ifdef FLOAT_CATCH_SIGILL
-static SIGTYPE
+static void
 float_error (signo)
     int signo;
 {
diff --git a/src/fns.c b/src/fns.c
index 9a009c8ab44..bce922859d1 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -348,7 +348,7 @@ Symbols are also allowed; their print names are used instead.  */)
  return i1 < SCHARS (s2) ? Qt : Qnil;
 }
-static Lisp_Object concat (int nargs, Lisp_Object *args,
+static Lisp_Object concat (size_t nargs, Lisp_Object *args,
                           enum Lisp_Type target_type, int last_special);
 /* ARGSUSED */
@@ -378,7 +378,7 @@ The result is a list whose elements are the elements of all the arguments.
 Each argument may be a list, vector or string.
 The last argument is not copied, just used as the tail of the new list.
 usage: (append &rest SEQUENCES)  */)
-  (int nargs, Lisp_Object *args)
+  (size_t nargs, Lisp_Object *args)
 {
  return concat (nargs, args, Lisp_Cons, 1);
 }
@@ -388,7 +388,7 @@ DEFUN ("concat", Fconcat, Sconcat, 0, MANY, 0,
 The result is a string whose elements are the elements of all the arguments.
 Each argument may be a string or a list or vector of characters (integers).
 usage: (concat &rest SEQUENCES)  */)
-  (int nargs, Lisp_Object *args)
+  (size_t nargs, Lisp_Object *args)
 {
  return concat (nargs, args, Lisp_String, 0);
 }
@@ -398,7 +398,7 @@ DEFUN ("vconcat", Fvconcat, Svconcat, 0, MANY, 0,
 The result is a vector whose elements are the elements of all the arguments.
 Each argument may be a list, vector or string.
 usage: (vconcat &rest SEQUENCES)   */)
-  (int nargs, Lisp_Object *args)
+  (size_t nargs, Lisp_Object *args)
 {
  return concat (nargs, args, Lisp_Vectorlike, 0);
 }
@@ -446,7 +446,8 @@ struct textprop_rec
 };
 static Lisp_Object
-concat (int nargs, Lisp_Object *args, enum Lisp_Type target_type, int last_special)
+concat (size_t nargs, Lisp_Object *args,
+        enum Lisp_Type target_type, int last_special)
 {
  Lisp_Object val;
  register Lisp_Object tail;
@@ -455,7 +456,7 @@ concat (int nargs, Lisp_Object *args, enum Lisp_Type target_type, int last_speci
  EMACS_INT toindex_byte = 0;
  register EMACS_INT result_len;
  register EMACS_INT result_len_byte;
-  register int argnum;
+  register size_t argnum;
  Lisp_Object last_tail;
  Lisp_Object prev;
  int some_multibyte;
@@ -2232,9 +2233,9 @@ DEFUN ("nconc", Fnconc, Snconc, 0, MANY, 0,
       doc: /* Concatenate any number of lists by altering them.
 Only the last argument is not altered, and need not be a list.
 usage: (nconc &rest LISTS)  */)
-  (int nargs, Lisp_Object *args)
+  (size_t nargs, Lisp_Object *args)
 {
-  register int argnum;
+  register size_t argnum;
  register Lisp_Object tail, tem, val;
  val = tail = Qnil;
@@ -2763,7 +2764,7 @@ DEFUN ("widget-apply", Fwidget_apply, Swidget_apply, 2, MANY, 0,
       doc: /* Apply the value of WIDGET's PROPERTY to the widget itself.
 ARGS are passed as extra arguments to the function.
 usage: (widget-apply WIDGET PROPERTY &rest ARGS)  */)
-  (int nargs, Lisp_Object *args)
+  (size_t nargs, Lisp_Object *args)
 {
  /* This function can GC. */
  Lisp_Object newargs[3];
@@ -3367,7 +3368,7 @@ Lisp_Object Qhash_table_test, Qkey_or_value, Qkey_and_value;
 /* Function prototypes.  */
 static struct Lisp_Hash_Table *check_hash_table (Lisp_Object);
-static int get_key_arg (Lisp_Object, int, Lisp_Object *, char *);
+static size_t get_key_arg (Lisp_Object, size_t, Lisp_Object *, char *);
 static void maybe_resize_hash_table (struct Lisp_Hash_Table *);
 static int cmpfn_eql (struct Lisp_Hash_Table *, Lisp_Object, unsigned,
                      Lisp_Object, unsigned);
@@ -3422,27 +3423,23 @@ next_almost_prime (int n)
 /* Find KEY in ARGS which has size NARGS.  Don't consider indices for
   which USED[I] is non-zero.  If found at index I in ARGS, set
   USED[I] and USED[I + 1] to 1, and return I + 1.  Otherwise return
-   -1.  This function is used to extract a keyword/argument pair from
+   0.  This function is used to extract a keyword/argument pair from
   a DEFUN parameter list.  */
-static int
+static size_t
-get_key_arg (Lisp_Object key, int nargs, Lisp_Object *args, char *used)
+get_key_arg (Lisp_Object key, size_t nargs, Lisp_Object *args, char *used)
 {
-  int i;
+  size_t i;
-  for (i = 0; i < nargs - 1; ++i)
-    if (!used[i] && EQ (args[i], key))
-      break;
-  if (i >= nargs - 1)
+  for (i = 1; i < nargs; i++)
-    i = -1;
+    if (!used[i - 1] && EQ (args[i - 1], key))
-  else
+      {
-    {
+        used[i - 1] = 1;
-      used[i++] = 1;
+        used[i] = 1;
-      used[i] = 1;
+        return i;
-    }
+      }
-  return i;
+  return 0;
 }
@@ -4290,12 +4287,12 @@ WEAK.  WEAK t is equivalent to `key-and-value'.  Default value of WEAK
 is nil.
 usage: (make-hash-table &rest KEYWORD-ARGS)  */)
-  (int nargs, Lisp_Object *args)
+  (size_t nargs, Lisp_Object *args)
 {
  Lisp_Object test, size, rehash_size, rehash_threshold, weak;
  Lisp_Object user_test, user_hash;
  char *used;
-  int i;
+  size_t i;
  /* The vector `used' is used to keep track of arguments that
     have been consumed.  */
@@ -4304,7 +4301,7 @@ usage: (make-hash-table &rest KEYWORD-ARGS)  */)
  /* See if there's a `:test TEST' among the arguments.  */
  i = get_key_arg (QCtest, nargs, args, used);
-  test = i < 0 ? Qeql : args[i];
+  test = i ? args[i] : Qeql;
  if (!EQ (test, Qeq) && !EQ (test, Qeql) && !EQ (test, Qequal))
    {
      /* See if it is a user-defined test.  */
@@ -4321,7 +4318,7 @@ usage: (make-hash-table &rest KEYWORD-ARGS)  */)
  /* See if there's a `:size SIZE' argument.  */
  i = get_key_arg (QCsize, nargs, args, used);
-  size = i < 0 ? Qnil : args[i];
+  size = i ? args[i] : Qnil;
  if (NILP (size))
    size = make_number (DEFAULT_HASH_SIZE);
  else if (!INTEGERP (size) || XINT (size) < 0)
@@ -4329,7 +4326,7 @@ usage: (make-hash-table &rest KEYWORD-ARGS)  */)
  /* Look for `:rehash-size SIZE'.  */
  i = get_key_arg (QCrehash_size, nargs, args, used);
-  rehash_size = i < 0 ? make_float (DEFAULT_REHASH_SIZE) : args[i];
+  rehash_size = i ? args[i] : make_float (DEFAULT_REHASH_SIZE);
  if (!NUMBERP (rehash_size)
      || (INTEGERP (rehash_size) && XINT (rehash_size) <= 0)
      || XFLOATINT (rehash_size) <= 1.0)
@@ -4337,7 +4334,7 @@ usage: (make-hash-table &rest KEYWORD-ARGS)  */)
  /* Look for `:rehash-threshold THRESHOLD'.  */
  i = get_key_arg (QCrehash_threshold, nargs, args, used);
-  rehash_threshold = i < 0 ? make_float (DEFAULT_REHASH_THRESHOLD) : args[i];
+  rehash_threshold = i ? args[i] : make_float (DEFAULT_REHASH_THRESHOLD);
  if (!FLOATP (rehash_threshold)
      || XFLOATINT (rehash_threshold) <= 0.0
      || XFLOATINT (rehash_threshold) > 1.0)
@@ -4345,7 +4342,7 @@ usage: (make-hash-table &rest KEYWORD-ARGS)  */)
  /* Look for `:weakness WEAK'.  */
  i = get_key_arg (QCweakness, nargs, args, used);
-  weak = i < 0 ? Qnil : args[i];
+  weak = i ? args[i] : Qnil;
  if (EQ (weak, Qt))
    weak = Qkey_and_value;
  if (!NILP (weak)
diff --git a/src/font.c b/src/font.c
index 9e8b7029c22..6b2e2f2712d 100644
--- a/src/font.c
+++ b/src/font.c
@@ -3831,10 +3831,10 @@ be an OpenType font, and whose GPOS table of `thai' script's default
 language system must contain `mark' feature.
 usage: (font-spec ARGS...)  */)
-  (int nargs, Lisp_Object *args)
+  (size_t nargs, Lisp_Object *args)
 {
  Lisp_Object spec = font_make_spec ();
-  int i;
+  size_t i;
  for (i = 0; i < nargs; i += 2)
    {
diff --git a/src/frame.c b/src/frame.c
index 05938f3e1f0..1b6d36092ae 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -890,7 +890,7 @@ to that frame.  */)
 {
  /* Preserve prefix arg that the command loop just cleared.  */
  KVAR (current_kboard, Vprefix_arg) = Vcurrent_prefix_arg;
-  call1 (Vrun_hooks, Qmouse_leave_buffer_hook);
+  Frun_hooks (1, &Qmouse_leave_buffer_hook);
  return do_switch_frame (event, 0, 0, Qnil);
 }
@@ -2529,7 +2529,7 @@ use is not recommended.  Explicitly check for a frame-parameter instead.  */)
        }
      /* Now process them in reverse of specified order.  */
-      for (i--; i >= 0; i--)
+      while (--i >= 0)
        {
          prop = parms[i];
          val = values[i];
@@ -2902,7 +2902,7 @@ x_set_frame_parameters (FRAME_PTR f, Lisp_Object alist)
  /* Record in these vectors all the parms specified.  */
  Lisp_Object *parms;
  Lisp_Object *values;
-  int i, p;
+  size_t i, p;
  int left_no_change = 0, top_no_change = 0;
  int icon_left_no_change = 0, icon_top_no_change = 0;
  int size_changed = 0;
@@ -2975,7 +2975,7 @@ x_set_frame_parameters (FRAME_PTR f, Lisp_Object alist)
    }
  /* Now process them in reverse of specified order.  */
-  for (i--; i >= 0; i--)
+  while (i-- != 0)
    {
      Lisp_Object prop, val;
@@ -3713,8 +3713,7 @@ validate_x_resource_name (void)
    return;
  /* If name is entirely invalid, or nearly so, use `emacs'.  */
-  if (good_count == 0
+  if (good_count < 2)
-      || (good_count == 1 && bad_count > 0))
    {
      Vx_resource_name = build_string ("emacs");
      return;
diff --git a/src/ftfont.c b/src/ftfont.c
index db6b29421dc..ad01149106e 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -168,11 +168,11 @@ get_adstyle_property (FcPattern *p)
  for (end = str; *end && *end != ' '; end++);
  if (*end)
    {
-      char *p = alloca (end - str + 1);
+      char *newstr = alloca (end - str + 1);
-      memcpy (p, str, end - str);
+      memcpy (newstr, str, end - str);
-      p[end - str] = '\0';
+      newstr[end - str] = '\0';
-      end = p + (end - str);
+      end = newstr + (end - str);
-      str = p;
+      str = newstr;
    }
  if (xstrcasecmp (str, "Regular") == 0
      || xstrcasecmp (str, "Bold") == 0
@@ -190,18 +190,18 @@ ftfont_pattern_entity (FcPattern *p, Lisp_Object extra)
 {
  Lisp_Object key, cache, entity;
  char *file, *str;
-  int index;
+  int idx;
  int numeric;
  double dbl;
  FcBool b;
  if (FcPatternGetString (p, FC_FILE, 0, (FcChar8 **) &file) != FcResultMatch)
    return Qnil;
-  if (FcPatternGetInteger (p, FC_INDEX, 0, &index) != FcResultMatch)
+  if (FcPatternGetInteger (p, FC_INDEX, 0, &idx) != FcResultMatch)
    return Qnil;
  key = Fcons (make_unibyte_string ((char *) file, strlen ((char *) file)),
-               make_number (index));
+               make_number (idx));
  cache = ftfont_lookup_cache (key, FTFONT_CACHE_FOR_ENTITY);
  entity = XCAR (cache);
  if (! NILP (entity))
@@ -265,7 +265,7 @@ ftfont_pattern_entity (FcPattern *p, Lisp_Object extra)
      ASET (entity, FONT_ADSTYLE_INDEX, get_adstyle_property (p));
      if ((ft_library || FT_Init_FreeType (&ft_library) == 0)
-          && FT_New_Face (ft_library, file, index, &ft_face) == 0)
+          && FT_New_Face (ft_library, file, idx, &ft_face) == 0)
        {
          BDF_PropertyRec rec;
@@ -311,8 +311,9 @@ ftfont_resolve_generic_family (Lisp_Object family, FcPattern *pattern)
  if (FcPatternGetLangSet (pattern, FC_LANG, 0, &langset) != FcResultMatch)
    {
      /* This is to avoid the effect of locale.  */
+      static const FcChar8 lang[] = "en";
      langset = FcLangSetCreate ();
-      FcLangSetAdd (langset, "en");
+      FcLangSetAdd (langset, lang);
      FcPatternAddLangSet (pattern, FC_LANG, langset);
      FcLangSetDestroy (langset);
    }
@@ -393,14 +394,14 @@ ftfont_lookup_cache (Lisp_Object key, enum ftfont_cache_for cache_for)
      ? ! cache_data->ft_face : ! cache_data->fc_charset)
    {
      char *filename = SSDATA (XCAR (key));
-      int index = XINT (XCDR (key));
+      int idx = XINT (XCDR (key));
      if (cache_for == FTFONT_CACHE_FOR_FACE)
        {
          if (! ft_library
              && FT_Init_FreeType (&ft_library) != 0)
            return Qnil;
-          if (FT_New_Face (ft_library, filename, index, &cache_data->ft_face)
+          if (FT_New_Face (ft_library, filename, idx, &cache_data->ft_face)
              != 0)
            return Qnil;
        }
@@ -412,7 +413,7 @@ ftfont_lookup_cache (Lisp_Object key, enum ftfont_cache_for cache_for)
          FcCharSet *charset = NULL;
          pat = FcPatternBuild (0, FC_FILE, FcTypeString, (FcChar8 *) filename,
-                                FC_INDEX, FcTypeInteger, index, NULL);
+                                FC_INDEX, FcTypeInteger, idx, NULL);
          if (! pat)
            goto finish;
          objset = FcObjectSetBuild (FC_CHARSET, FC_STYLE, NULL);
@@ -490,8 +491,12 @@ static int ftfont_get_bitmap (struct font *, unsigned,
                              struct font_bitmap *, int);
 static int ftfont_anchor_point (struct font *, unsigned, int,
                                int *, int *);
+#ifdef HAVE_LIBOTF
 static Lisp_Object ftfont_otf_capability (struct font *);
+# ifdef HAVE_M17N_FLT
 static Lisp_Object ftfont_shape (Lisp_Object);
+# endif
+#endif
 #ifdef HAVE_OTF_GET_VARIATION_GLYPHS
 static int ftfont_variation_glyphs (struct font *, int c,
@@ -618,6 +623,7 @@ struct OpenTypeSpec
    (P)[4] = '\0';                              \
  } while (0)
+#ifdef HAVE_LIBOTF
 #define OTF_TAG_SYM(SYM, TAG)                   \
  do {                                          \
    char str[5];                                \
@@ -625,6 +631,7 @@ struct OpenTypeSpec
    OTF_TAG_STR (TAG, str);                     \
    (SYM) = font_intern_prop (str, 4, 1);       \
  } while (0)
+#endif
 static struct OpenTypeSpec *
@@ -864,7 +871,6 @@ ftfont_list (Lisp_Object frame, Lisp_Object spec)
  FcObjectSet *objset = NULL;
  FcCharSet *charset;
  Lisp_Object chars = Qnil;
-  FcResult result;
  char otlayout[15];            /* For "otlayout:XXXX" */
  struct OpenTypeSpec *otspec = NULL;
  int spacing = -1;
@@ -1153,7 +1159,7 @@ ftfont_open (FRAME_PTR f, Lisp_Object entity, int pixel_size)
  FT_Face ft_face;
  FT_Size ft_size;
  FT_UInt size;
-  Lisp_Object val, filename, index, cache, font_object;
+  Lisp_Object val, filename, idx, cache, font_object;
  int scalable;
  int spacing;
  char name[256];
@@ -1168,7 +1174,7 @@ ftfont_open (FRAME_PTR f, Lisp_Object entity, int pixel_size)
  if (NILP (cache))
    return Qnil;
  filename = XCAR (val);
-  index = XCDR (val);
+  idx = XCDR (val);
  val = XCDR (cache);
  cache_data = XSAVE_VALUE (XCDR (cache))->pointer;
  ft_face = cache_data->ft_face;
@@ -1210,7 +1216,7 @@ ftfont_open (FRAME_PTR f, Lisp_Object entity, int pixel_size)
  font = XFONT_OBJECT (font_object);
  ftfont_info = (struct ftfont_info *) font;
  ftfont_info->ft_size = ft_face->size;
-  ftfont_info->index = XINT (index);
+  ftfont_info->index = XINT (idx);
 #ifdef HAVE_LIBOTF
  ftfont_info->maybe_otf = ft_face->face_flags & FT_FACE_FLAG_SFNT;
  ftfont_info->otf = NULL;
@@ -1455,7 +1461,8 @@ ftfont_get_bitmap (struct font *font, unsigned int code, struct font_bitmap *bit
 }
 static int
-ftfont_anchor_point (struct font *font, unsigned int code, int index, int *x, int *y)
+ftfont_anchor_point (struct font *font, unsigned int code, int idx,
+                     int *x, int *y)
 {
  struct ftfont_info *ftfont_info = (struct ftfont_info *) font;
  FT_Face ft_face = ftfont_info->ft_size->face;
@@ -1466,10 +1473,10 @@ ftfont_anchor_point (struct font *font, unsigned int code, int index, int *x, in
    return -1;
  if (ft_face->glyph->format != FT_GLYPH_FORMAT_OUTLINE)
    return -1;
-  if (index >= ft_face->glyph->outline.n_points)
+  if (idx >= ft_face->glyph->outline.n_points)
    return -1;
-  *x = ft_face->glyph->outline.points[index].x;
+  *x = ft_face->glyph->outline.points[idx].x;
-  *y = ft_face->glyph->outline.points[index].y;
+  *y = ft_face->glyph->outline.points[idx].y;
  return 0;
 }
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 754f61e366d..4e5ecce76c7 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -1555,7 +1555,7 @@ static gboolean
 xg_maybe_add_timer (gpointer data)
 {
  struct xg_dialog_data *dd = (struct xg_dialog_data *) data;
-  EMACS_TIME next_time = timer_check (1);
+  EMACS_TIME next_time = timer_check ();
  long secs = EMACS_SECS (next_time);
  long usecs = EMACS_USECS (next_time);
diff --git a/src/image.c b/src/image.c
index 91308c540b5..b37ba398d83 100644
--- a/src/image.c
+++ b/src/image.c
@@ -4483,7 +4483,6 @@ static void
 XPutPixel (XImagePtr ximg, int x, int y, COLORREF color)
 {
  int width = ximg->info.bmiHeader.biWidth;
-  int height = ximg->info.bmiHeader.biHeight;
  unsigned char * pixel;
  /* True color images.  */
@@ -6752,7 +6751,7 @@ tiff_load (struct frame *f, struct image *img)
  TIFF *tiff;
  int width, height, x, y, count;
  uint32 *buf;
-  int rc, rc2;
+  int rc;
  XImagePtr ximg;
  tiff_memory_source memsrc;
  Lisp_Object image;
@@ -6840,8 +6839,8 @@ tiff_load (struct frame *f, struct image *img)
  rc = fn_TIFFReadRGBAImage (tiff, width, height, buf, 0);
  /* Count the number of images in the file.  */
-  for (count = 1, rc2 = 1; rc2; count++)
+  for (count = 1; fn_TIFFSetDirectory (tiff, count); count++)
-    rc2 = fn_TIFFSetDirectory (tiff, count);
+    continue;
  if (count > 1)
    img->data.lisp_val = Fcons (Qcount,
diff --git a/src/insdel.c b/src/insdel.c
index ad3460f9a64..4bdcb4bc0b7 100644
--- a/src/insdel.c
+++ b/src/insdel.c
@@ -41,8 +41,6 @@ static void insert_from_buffer_1 (struct buffer *buf,
                                  int inherit);
 static void gap_left (EMACS_INT charpos, EMACS_INT bytepos, int newgap);
 static void gap_right (EMACS_INT charpos, EMACS_INT bytepos);
-static void adjust_markers_gap_motion (EMACS_INT from, EMACS_INT to,
-                                       EMACS_INT amount);
 static void adjust_markers_for_insert (EMACS_INT from, EMACS_INT from_byte,
                                       EMACS_INT to, EMACS_INT to_byte,
                                       int before_markers);
@@ -162,10 +160,9 @@ gap_left (EMACS_INT charpos, EMACS_INT bytepos, int newgap)
      memmove (to, from, i);
    }
-  /* Adjust markers, and buffer data structure, to put the gap at BYTEPOS.
+  /* Adjust buffer data structure, to put the gap at BYTEPOS.
-     BYTEPOS is where the loop above stopped, which may be what was specified
+     BYTEPOS is where the loop above stopped, which may be what
-     or may be where a quit was detected.  */
+     was specified or may be where a quit was detected.  */
-  adjust_markers_gap_motion (bytepos, GPT_BYTE, GAP_SIZE);
  GPT_BYTE = bytepos;
  GPT = charpos;
  if (bytepos < charpos)
@@ -217,8 +214,6 @@ gap_right (EMACS_INT charpos, EMACS_INT bytepos)
      from += i, to += i;
    }
-  adjust_markers_gap_motion (GPT_BYTE + GAP_SIZE, bytepos + GAP_SIZE,
-                             - GAP_SIZE);
  GPT = charpos;
  GPT_BYTE = bytepos;
  if (bytepos < charpos)
@@ -227,67 +222,6 @@ gap_right (EMACS_INT charpos, EMACS_INT bytepos)
  QUIT;
 }
-/* Add AMOUNT to the byte position of every marker in the current buffer
-   whose current byte position is between FROM (exclusive) and TO (inclusive).
-   Also, any markers past the outside of that interval, in the direction
-   of adjustment, are first moved back to the near end of the interval
-   and then adjusted by AMOUNT.
-   When the latter adjustment is done, if AMOUNT is negative,
-   we record the adjustment for undo.  (This case happens only for
-   deletion.)
-   The markers' character positions are not altered,
-   because gap motion does not affect character positions.  */
-int adjust_markers_test;
-static void
-adjust_markers_gap_motion (EMACS_INT from, EMACS_INT to, EMACS_INT amount)
-{
-  /* Now that a marker has a bytepos, not counting the gap,
-     nothing needs to be done here.  */
-#if 0
-  Lisp_Object marker;
-  register struct Lisp_Marker *m;
-  register EMACS_INT mpos;
-  marker = BUF_MARKERS (current_buffer);
-  while (!NILP (marker))
-    {
-      m = XMARKER (marker);
-      mpos = m->bytepos;
-      if (amount > 0)
-        {
-          if (mpos > to && mpos < to + amount)
-            {
-              if (adjust_markers_test)
-                abort ();
-              mpos = to + amount;
-            }
-        }
-      else
-        {
-          /* Here's the case where a marker is inside text being deleted.
-             AMOUNT can be negative for gap motion, too,
-             but then this range contains no markers.  */
-          if (mpos > from + amount && mpos <= from)
-            {
-              if (adjust_markers_test)
-                abort ();
-              mpos = from + amount;
-            }
-        }
-      if (mpos > from && mpos <= to)
-        mpos += amount;
-      m->bufpos = mpos;
-      marker = m->chain;
-    }
-#endif
-}
 /* Adjust all markers for a deletion
   whose range in bytes is FROM_BYTE to TO_BYTE.
   The range in charpos is FROM to TO.
@@ -2137,14 +2071,14 @@ signal_before_change (EMACS_INT start_int, EMACS_INT end_int,
  specbind (Qinhibit_modification_hooks, Qt);
-  /* If buffer is unmodified, run a special hook for that case.  */
+  /* If buffer is unmodified, run a special hook for that case.  The
+   check for Vfirst_change_hook is just a minor optimization. */
  if (SAVE_MODIFF >= MODIFF
-      && !NILP (Vfirst_change_hook)
+      && !NILP (Vfirst_change_hook))
-      && !NILP (Vrun_hooks))
    {
      PRESERVE_VALUE;
      PRESERVE_START_END;
-      call1 (Vrun_hooks, Qfirst_change_hook);
+      Frun_hooks (1, &Qfirst_change_hook);
    }
  /* Now run the before-change-functions if any.  */
diff --git a/src/intervals.c b/src/intervals.c
index 12b2789cc77..351677ad27e 100644
--- a/src/intervals.c
+++ b/src/intervals.c
@@ -586,7 +586,7 @@ split_interval_left (INTERVAL interval, EMACS_INT offset)
   Don't use this function on an interval which is the child
   of another interval!  */
-int
+static int
 interval_start_pos (INTERVAL source)
 {
  Lisp_Object parent;
@@ -2559,4 +2559,3 @@ set_intervals_multibyte (int multi_flag)
    set_intervals_multibyte_1 (BUF_INTERVALS (current_buffer), multi_flag,
                               BEG, BEG_BYTE, Z, Z_BYTE);
 }
diff --git a/src/intervals.h b/src/intervals.h
index f6c1c002ce0..d7c34012e1f 100644
--- a/src/intervals.h
+++ b/src/intervals.h
@@ -161,8 +161,13 @@ struct interval
   (INTERVAL_HAS_PARENT (i) ? INTERVAL_PARENT (i) : 0)
 /* Abort if interval I's size is negative.  */
-#define CHECK_TOTAL_LENGTH(i) \
+#define CHECK_TOTAL_LENGTH(i)          \
-  if ((int) (i)->total_length < 0) abort (); else
+  do                                   \
+    {                                  \
+      if ((int) (i)->total_length < 0) \
+        abort ();                      \
+    }                                  \
+  while (0)
 /* Reset this interval to its vanilla, or no-property state. */
 #define RESET_INTERVAL(i) \
@@ -339,4 +344,3 @@ extern Lisp_Object get_pos_property (Lisp_Object pos, Lisp_Object prop,
 extern void syms_of_textprop (void);
 #include "composite.h"
diff --git a/src/keyboard.c b/src/keyboard.c
index 63e7573fbe9..d307250b868 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -201,8 +201,8 @@ Lisp_Object unread_switch_frame;
 /* Last size recorded for a current buffer which is not a minibuffer.  */
 static EMACS_INT last_non_minibuf_size;
-/* Total number of times read_char has returned.  */
+/* Total number of times read_char has returned, modulo SIZE_MAX + 1.  */
-int num_input_events;
+size_t num_input_events;
 /* Value of num_nonmacro_input_events as of last auto save.  */
@@ -254,7 +254,6 @@ Lisp_Object Qecho_area_clear_hook;
 /* Hooks to run before and after each command.  */
 Lisp_Object Qpre_command_hook;
 Lisp_Object Qpost_command_hook;
-Lisp_Object Qcommand_hook_internal;
 Lisp_Object Qdeferred_action_function;
@@ -351,7 +350,7 @@ Lisp_Object Qmenu_bar;
 Lisp_Object recursive_edit_unwind (Lisp_Object buffer), command_loop (void);
 Lisp_Object Fthis_command_keys (void);
 Lisp_Object Qextended_command_history;
-EMACS_TIME timer_check (int do_it_now);
+EMACS_TIME timer_check (void);
 static void record_menu_key (Lisp_Object c);
 static int echo_length (void);
@@ -434,15 +433,15 @@ static void restore_getcjmp (jmp_buf);
 static Lisp_Object apply_modifiers (int, Lisp_Object);
 static void clear_event (struct input_event *);
 static Lisp_Object restore_kboard_configuration (Lisp_Object);
-static SIGTYPE interrupt_signal (int signalnum);
+static void interrupt_signal (int signalnum);
 #ifdef SIGIO
-static SIGTYPE input_available_signal (int signo);
+static void input_available_signal (int signo);
 #endif
 static void handle_interrupt (void);
 static void timer_start_idle (void);
 static void timer_stop_idle (void);
 static void timer_resume_idle (void);
-static SIGTYPE handle_user_signal (int);
+static void handle_user_signal (int);
 static char *find_user_signal_name (int);
 static int store_user_signal_events (void);
@@ -1270,7 +1269,7 @@ some_mouse_moved (void)
 /* This is the actual command reading loop,
   sans error-handling encapsulation.  */
-static int read_key_sequence (Lisp_Object *, int, Lisp_Object,
+static int read_key_sequence (Lisp_Object *, size_t, Lisp_Object,
                              int, int, int);
 void safe_run_hooks (Lisp_Object);
 static void adjust_point_for_property (EMACS_INT, int);
@@ -1492,10 +1491,7 @@ command_loop_1 (void)
      Vthis_command = cmd;
      real_this_command = cmd;
-      /* Note that the value cell will never directly contain nil
+      safe_run_hooks (Qpre_command_hook);
-         if the symbol is a local variable.  */
-      if (!NILP (Vpre_command_hook) && !NILP (Vrun_hooks))
-        safe_run_hooks (Qpre_command_hook);
      already_adjusted = 0;
@@ -1541,18 +1537,14 @@ command_loop_1 (void)
          }
      KVAR (current_kboard, Vlast_prefix_arg) = Vcurrent_prefix_arg;
-      /* Note that the value cell will never directly contain nil
+      safe_run_hooks (Qpost_command_hook);
-         if the symbol is a local variable.  */
-      if (!NILP (Vpost_command_hook) && !NILP (Vrun_hooks))
-        safe_run_hooks (Qpost_command_hook);
      /* If displaying a message, resize the echo area window to fit
         that message's size exactly.  */
      if (!NILP (echo_area_buffer[0]))
        resize_echo_area_exactly ();
-      if (!NILP (Vdeferred_action_list))
+      safe_run_hooks (Qdeferred_action_function);
-        safe_run_hooks (Qdeferred_action_function);
      /* If there is a prefix argument,
         1) We don't want Vlast_command to be ``universal-argument''
@@ -1621,7 +1613,10 @@ command_loop_1 (void)
                }
              if (current_buffer != prev_buffer || MODIFF != prev_modiff)
-                call1 (Vrun_hooks, intern ("activate-mark-hook"));
+                {
+                  Lisp_Object hook = intern ("activate-mark-hook");
+                  Frun_hooks (1, &hook);
+                }
            }
          Vsaved_region_selection = Qnil;
@@ -1819,22 +1814,63 @@ adjust_point_for_property (EMACS_INT last_pt, int modified)
 static Lisp_Object
 safe_run_hooks_1 (void)
 {
-  if (NILP (Vrun_hooks))
+  eassert (CONSP (Vinhibit_quit));
-    return Qnil;
+  return call0 (XCDR (Vinhibit_quit));
-  return call1 (Vrun_hooks, Vinhibit_quit);
 }
-/* Subroutine for safe_run_hooks: handle an error by clearing out the hook.  */
+/* Subroutine for safe_run_hooks: handle an error by clearing out the function
+   from the hook.  */
+static Lisp_Object
+safe_run_hooks_error (Lisp_Object error_data)
+{
+  Lisp_Object hook
+    = CONSP (Vinhibit_quit) ? XCAR (Vinhibit_quit) : Vinhibit_quit;
+  Lisp_Object fun = CONSP (Vinhibit_quit) ? XCDR (Vinhibit_quit) : Qnil;
+  Lisp_Object args[4];
+  args[0] = build_string ("Error in %s (%s): %s");
+  args[1] = hook;
+  args[2] = fun;
+  args[3] = error_data;
+  Fmessage (4, args);
+  if (SYMBOLP (hook))
+    {
+      Lisp_Object val;
+      int found = 0;
+      Lisp_Object newval = Qnil;
+      for (val = find_symbol_value (hook); CONSP (val); val = XCDR (val))
+        if (EQ (fun, XCAR (val)))
+          found = 1;
+        else
+          newval = Fcons (XCAR (val), newval);
+      if (found)
+        return Fset (hook, Fnreverse (newval));
+      /* Not found in the local part of the hook.  Let's look at the global
+         part.  */
+      newval = Qnil;
+      for (val = (NILP (Fdefault_boundp (hook)) ? Qnil
+                  : Fdefault_value (hook));
+           CONSP (val); val = XCDR (val))
+        if (EQ (fun, XCAR (val)))
+          found = 1;
+        else
+          newval = Fcons (XCAR (val), newval);
+      if (found)
+        return Fset_default (hook, Fnreverse (newval));
+    }
+  return Qnil;
+}
 static Lisp_Object
-safe_run_hooks_error (Lisp_Object data)
+safe_run_hook_funcall (size_t nargs, Lisp_Object *args)
 {
-  Lisp_Object args[3];
+  eassert (nargs == 1);
-  args[0] = build_string ("Error in %s: %s");
+  if (CONSP (Vinhibit_quit))
-  args[1] = Vinhibit_quit;
+    XSETCDR (Vinhibit_quit, args[0]);
-  args[2] = data;
+  else
-  Fmessage (3, args);
+    Vinhibit_quit = Fcons (Vinhibit_quit, args[0]);
-  return Fset (Vinhibit_quit, Qnil);
+  return internal_condition_case (safe_run_hooks_1, Qt, safe_run_hooks_error);
 }
 /* If we get an error while running the hook, cause the hook variable
@@ -1844,10 +1880,13 @@ safe_run_hooks_error (Lisp_Object data)
 void
 safe_run_hooks (Lisp_Object hook)
 {
+  /* FIXME: our `internal_condition_case' does not provide any way to pass data
+     to its body or to its handlers other than via globals such as
+     dynamically-bound variables ;-)  */
  int count = SPECPDL_INDEX ();
  specbind (Qinhibit_quit, hook);
-  internal_condition_case (safe_run_hooks_1, Qt, safe_run_hooks_error);
+  run_hook_with_args (1, &hook, safe_run_hook_funcall);
  unbind_to (count, Qnil);
 }
@@ -2074,16 +2113,12 @@ make_ctrl_char (int c)
   the `display' property).  POS is the position in that string under
   the mouse.
-   OK_TO_OVERWRITE_KEYSTROKE_ECHO non-zero means it's okay if the help
-   echo overwrites a keystroke echo currently displayed in the echo
-   area.
   Note: this function may only be called with HELP nil or a string
   from X code running asynchronously.  */
 void
 show_help_echo (Lisp_Object help, Lisp_Object window, Lisp_Object object,
-                Lisp_Object pos, int ok_to_overwrite_keystroke_echo)
+                Lisp_Object pos)
 {
  if (!NILP (help) && !STRINGP (help))
    {
@@ -3013,7 +3048,7 @@ read_char (int commandflag, int nmaps, Lisp_Object *maps, Lisp_Object prev_event
      htem = Fcdr (htem);
      position = Fcar (htem);
-      show_help_echo (help, window, object, position, 0);
+      show_help_echo (help, window, object, position);
      /* We stopped being idle for this event; undo that.  */
      if (!end_time)
@@ -3315,7 +3350,7 @@ static int
 readable_events (int flags)
 {
  if (flags & READABLE_EVENTS_DO_TIMERS_NOW)
-    timer_check (1);
+    timer_check ();
  /* If the buffer contains only FOCUS_IN_EVENT events, and
     READABLE_EVENTS_FILTER_EVENTS is set, report it as empty.  */
@@ -4389,14 +4424,10 @@ timer_check_2 (void)
   Returns the time to wait until the next timer fires.
   If no timer is active, return -1.
-   As long as any timer is ripe, we run it.
+   As long as any timer is ripe, we run it.  */
-   DO_IT_NOW is now ignored.  It used to mean that we should
-   run the timer directly instead of queueing a timer-event.
-   Now we always run timers directly.  */
 EMACS_TIME
-timer_check (int do_it_now)
+timer_check (void)
 {
  EMACS_TIME nexttime;
@@ -5405,7 +5436,6 @@ make_lispy_event (struct input_event *event)
                && (event->modifiers & down_modifier))
              {
                Lisp_Object items, item;
-                int hpos;
                int i;
                /* Find the menu bar item under `column'.  */
@@ -5974,10 +6004,10 @@ make_lispy_switch_frame (Lisp_Object frame)
   This doesn't use any caches.  */
 static int
-parse_modifiers_uncached (Lisp_Object symbol, int *modifier_end)
+parse_modifiers_uncached (Lisp_Object symbol, EMACS_INT *modifier_end)
 {
  Lisp_Object name;
-  int i;
+  EMACS_INT i;
  int modifiers;
  CHECK_SYMBOL (symbol);
@@ -5987,7 +6017,7 @@ parse_modifiers_uncached (Lisp_Object symbol, int *modifier_end)
  for (i = 0; i+2 <= SBYTES (name); )
    {
-      int this_mod_end = 0;
+      EMACS_INT this_mod_end = 0;
      int this_mod = 0;
      /* See if the name continues with a modifier word.
@@ -6184,7 +6214,7 @@ parse_modifiers (Lisp_Object symbol)
    return elements;
  else
    {
-      int end;
+      EMACS_INT end;
      int modifiers = parse_modifiers_uncached (symbol, &end);
      Lisp_Object unmodified;
      Lisp_Object mask;
@@ -7097,7 +7127,7 @@ process_pending_signals (void)
 #ifdef SIGIO   /* for entire page */
 /* Note SIGIO has been undef'd if FIONREAD is missing.  */
-static SIGTYPE
+static void
 input_available_signal (int signo)
 {
  /* Must preserve main program's value of errno.  */
@@ -7175,7 +7205,7 @@ add_user_signal (int sig, const char *name)
  signal (sig, handle_user_signal);
 }
-static SIGTYPE
+static void
 handle_user_signal (int sig)
 {
  int old_errno = errno;
@@ -8769,7 +8799,7 @@ access_keymap_keyremap (Lisp_Object map, Lisp_Object key, Lisp_Object prompt,
   The return value is non-zero if the remapping actually took place.  */
 static int
-keyremap_step (Lisp_Object *keybuf, int bufsize, volatile keyremap *fkey,
+keyremap_step (Lisp_Object *keybuf, size_t bufsize, volatile keyremap *fkey,
               int input, int doit, int *diff, Lisp_Object prompt)
 {
  Lisp_Object next, key;
@@ -8862,7 +8892,7 @@ keyremap_step (Lisp_Object *keybuf, int bufsize, volatile keyremap *fkey,
   from the selected window's buffer.  */
 static int
-read_key_sequence (Lisp_Object *keybuf, int bufsize, Lisp_Object prompt,
+read_key_sequence (Lisp_Object *keybuf, size_t bufsize, Lisp_Object prompt,
                   int dont_downcase_last, int can_return_switch_frame,
                   int fix_current_buffer)
 {
@@ -9380,80 +9410,84 @@ read_key_sequence (Lisp_Object *keybuf, int bufsize, Lisp_Object prompt,
                    last_real_key_start = t - 1;
                }
-              /* Key sequences beginning with mouse clicks are
+              if (last_real_key_start == 0)
-                 read using the keymaps in the buffer clicked on,
-                 not the current buffer.  If we're at the
-                 beginning of a key sequence, switch buffers.  */
-              if (last_real_key_start == 0
-                  && WINDOWP (window)
-                  && BUFFERP (XWINDOW (window)->buffer)
-                  && XBUFFER (XWINDOW (window)->buffer) != current_buffer)
                {
-                  XVECTOR (raw_keybuf)->contents[raw_keybuf_count++] = key;
+                  /* Key sequences beginning with mouse clicks are
-                  keybuf[t] = key;
+                     read using the keymaps in the buffer clicked on,
-                  mock_input = t + 1;
+                     not the current buffer.  If we're at the
+                     beginning of a key sequence, switch buffers.  */
-                  /* Arrange to go back to the original buffer once we're
+                  if (WINDOWP (window)
-                     done reading the key sequence.  Note that we can't
+                      && BUFFERP (XWINDOW (window)->buffer)
-                     use save_excursion_{save,restore} here, because they
+                      && XBUFFER (XWINDOW (window)->buffer) != current_buffer)
-                     save point as well as the current buffer; we don't
+                    {
-                     want to save point, because redisplay may change it,
+                      XVECTOR (raw_keybuf)->contents[raw_keybuf_count++] = key;
-                     to accommodate a Fset_window_start or something.  We
+                      keybuf[t] = key;
-                     don't want to do this at the top of the function,
+                      mock_input = t + 1;
-                     because we may get input from a subprocess which
-                     wants to change the selected window and stuff (say,
+                      /* Arrange to go back to the original buffer once we're
-                     emacsclient).  */
+                         done reading the key sequence.  Note that we can't
-                  record_unwind_protect (Fset_buffer, Fcurrent_buffer ());
+                         use save_excursion_{save,restore} here, because they
+                         save point as well as the current buffer; we don't
-                  if (! FRAME_LIVE_P (XFRAME (selected_frame)))
+                         want to save point, because redisplay may change it,
-                    Fkill_emacs (Qnil);
+                         to accommodate a Fset_window_start or something.  We
-                  set_buffer_internal (XBUFFER (XWINDOW (window)->buffer));
+                         don't want to do this at the top of the function,
-                  orig_local_map = get_local_map (PT, current_buffer,
+                         because we may get input from a subprocess which
-                                                  Qlocal_map);
+                         wants to change the selected window and stuff (say,
-                  orig_keymap = get_local_map (PT, current_buffer, Qkeymap);
+                         emacsclient).  */
-                  goto replay_sequence;
+                      record_unwind_protect (Fset_buffer, Fcurrent_buffer ());
-                }
+                      if (! FRAME_LIVE_P (XFRAME (selected_frame)))
+                        Fkill_emacs (Qnil);
+                      set_buffer_internal (XBUFFER (XWINDOW (window)->buffer));
+                      orig_local_map = get_local_map (PT, current_buffer,
+                                                      Qlocal_map);
+                      orig_keymap = get_local_map (PT, current_buffer,
+                                                   Qkeymap);
+                      goto replay_sequence;
+                    }
-              /* For a mouse click, get the local text-property keymap
+                  /* For a mouse click, get the local text-property keymap
-                 of the place clicked on, rather than point.  */
+                     of the place clicked on, rather than point.  */
-              if (last_real_key_start == 0
+                  if (CONSP (XCDR (key))
-                  && CONSP (XCDR (key))
+                      && ! localized_local_map)
-                  && ! localized_local_map)
+                    {
-                {
+                      Lisp_Object map_here, start, pos;
-                  Lisp_Object map_here, start, pos;
-                  localized_local_map = 1;
+                      localized_local_map = 1;
-                  start = EVENT_START (key);
+                      start = EVENT_START (key);
-                  if (CONSP (start) && POSN_INBUFFER_P (start))
+                      if (CONSP (start) && POSN_INBUFFER_P (start))
-                    {
-                      pos = POSN_BUFFER_POSN (start);
-                      if (INTEGERP (pos)
-                          && XINT (pos) >= BEGV
-                          && XINT (pos) <= ZV)
                        {
-                          map_here = get_local_map (XINT (pos),
+                          pos = POSN_BUFFER_POSN (start);
-                                                    current_buffer, Qlocal_map);
+                          if (INTEGERP (pos)
-                          if (!EQ (map_here, orig_local_map))
+                              && XINT (pos) >= BEGV
+                              && XINT (pos) <= ZV)
                            {
-                              orig_local_map = map_here;
+                              map_here = get_local_map (XINT (pos),
-                              ++localized_local_map;
+                                                        current_buffer,
-                            }
+                                                        Qlocal_map);
+                              if (!EQ (map_here, orig_local_map))
+                                {
+                                  orig_local_map = map_here;
+                                  ++localized_local_map;
+                                }
-                          map_here = get_local_map (XINT (pos),
+                              map_here = get_local_map (XINT (pos),
-                                                     current_buffer, Qkeymap);
+                                                        current_buffer,
-                          if (!EQ (map_here, orig_keymap))
+                                                        Qkeymap);
-                            {
+                              if (!EQ (map_here, orig_keymap))
-                              orig_keymap = map_here;
+                                {
-                              ++localized_local_map;
+                                  orig_keymap = map_here;
-                            }
+                                  ++localized_local_map;
+                                }
-                          if (localized_local_map > 1)
+                              if (localized_local_map > 1)
-                            {
+                                {
-                              keybuf[t] = key;
+                                  keybuf[t] = key;
-                              mock_input = t + 1;
+                                  mock_input = t + 1;
-                              goto replay_sequence;
+                                  goto replay_sequence;
+                                }
                            }
                        }
                    }
@@ -10135,11 +10169,11 @@ a special event, so ignore the prefix argument and don't clear it.  */)
  if (SYMBOLP (cmd))
    {
      tem = Fget (cmd, Qdisabled);
-      if (!NILP (tem) && !NILP (Vrun_hooks))
+      if (!NILP (tem))
        {
          tem = Fsymbol_value (Qdisabled_command_function);
          if (!NILP (tem))
-            return call1 (Vrun_hooks, Qdisabled_command_function);
+            return Frun_hooks (1, &Qdisabled_command_function);
        }
    }
@@ -10312,9 +10346,9 @@ give to the command you invoke, if it asks for an argument.  */)
          sprintf (newmessage, "You can run the command `%s' with %s",
                   SDATA (SYMBOL_NAME (function)),
                   SDATA (binding));
-          message2_nolog (newmessage,
+          message2 (newmessage,
-                          strlen (newmessage),
+                    strlen (newmessage),
-                          STRING_MULTIBYTE (binding));
+                    STRING_MULTIBYTE (binding));
          if (NUMBERP (Vsuggest_key_bindings))
            waited = sit_for (Vsuggest_key_bindings, 0, 2);
          else
@@ -10623,6 +10657,7 @@ On such systems, Emacs starts a subshell instead of suspending.  */)
  int old_height, old_width;
  int width, height;
  struct gcpro gcpro1;
+  Lisp_Object hook;
  if (tty_list && tty_list->next)
    error ("There are other tty frames open; close them before suspending Emacs");
@@ -10631,8 +10666,8 @@ On such systems, Emacs starts a subshell instead of suspending.  */)
    CHECK_STRING (stuffstring);
  /* Run the functions in suspend-hook.  */
-  if (!NILP (Vrun_hooks))
+  hook = intern ("suspend-hook");
-    call1 (Vrun_hooks, intern ("suspend-hook"));
+  Frun_hooks (1, &hook);
  GCPRO1 (stuffstring);
  get_tty_size (fileno (CURTTY ()->input), &old_width, &old_height);
@@ -10656,8 +10691,8 @@ On such systems, Emacs starts a subshell instead of suspending.  */)
    change_frame_size (SELECTED_FRAME (), height, width, 0, 0, 0);
  /* Run suspend-resume-hook.  */
-  if (!NILP (Vrun_hooks))
+  hook = intern ("suspend-resume-hook");
-    call1 (Vrun_hooks, intern ("suspend-resume-hook"));
+  Frun_hooks (1, &hook);
  UNGCPRO;
  return Qnil;
@@ -10732,7 +10767,7 @@ clear_waiting_for_input (void)
   SIGINT was generated by C-g, so we call handle_interrupt.
   Otherwise, the handler kills Emacs.  */
-static SIGTYPE
+static void
 interrupt_signal (int signalnum)        /* If we don't have an argument, some */
                                        /* compilers complain in signal calls. */
 {
@@ -11458,9 +11493,6 @@ syms_of_keyboard (void)
  Qdeferred_action_function = intern_c_string ("deferred-action-function");
  staticpro (&Qdeferred_action_function);
-  Qcommand_hook_internal = intern_c_string ("command-hook-internal");
-  staticpro (&Qcommand_hook_internal);
  Qfunction_key = intern_c_string ("function-key");
  staticpro (&Qfunction_key);
  Qmouse_click = intern_c_string ("mouse-click");
@@ -11580,12 +11612,12 @@ syms_of_keyboard (void)
  last_point_position_window = Qnil;
  {
-    const struct event_head *p;
+    int i;
+    int len = sizeof (head_table) / sizeof (head_table[0]);
-    for (p = head_table;
+    for (i = 0; i < len; i++)
-         p < head_table + (sizeof (head_table) / sizeof (head_table[0]));
-         p++)
      {
+        const struct event_head *p = &head_table[i];
        *p->var = intern_c_string (p->name);
        staticpro (p->var);
        Fput (*p->var, Qevent_kind, *p->kind);
@@ -11928,22 +11960,18 @@ Buffer modification stores t in this variable.  */);
  Qdeactivate_mark = intern_c_string ("deactivate-mark");
  staticpro (&Qdeactivate_mark);
-  DEFVAR_LISP ("command-hook-internal", Vcommand_hook_internal,
-               doc: /* Temporary storage of `pre-command-hook' or `post-command-hook'.  */);
-  Vcommand_hook_internal = Qnil;
  DEFVAR_LISP ("pre-command-hook", Vpre_command_hook,
               doc: /* Normal hook run before each command is executed.
 If an unhandled error happens in running this hook,
-the hook value is set to nil, since otherwise the error
+the function in which the error occurred is unconditionally removed, since
-might happen repeatedly and make Emacs nonfunctional.  */);
+otherwise the error might happen repeatedly and make Emacs nonfunctional.  */);
  Vpre_command_hook = Qnil;
  DEFVAR_LISP ("post-command-hook", Vpost_command_hook,
               doc: /* Normal hook run after each command is executed.
 If an unhandled error happens in running this hook,
-the hook value is set to nil, since otherwise the error
+the function in which the error occurred is unconditionally removed, since
-might happen repeatedly and make Emacs nonfunctional.  */);
+otherwise the error might happen repeatedly and make Emacs nonfunctional.  */);
  Vpost_command_hook = Qnil;
 #if 0
diff --git a/src/keyboard.h b/src/keyboard.h
index 00745a09140..72bb821b2eb 100644
--- a/src/keyboard.h
+++ b/src/keyboard.h
@@ -194,8 +194,8 @@ extern KBOARD *all_kboards;
 /* Nonzero in the single-kboard state, 0 in the any-kboard state.  */
 extern int single_kboard;
-/* Total number of times read_char has returned.  */
+/* Total number of times read_char has returned, modulo SIZE_MAX + 1.  */
-extern int num_input_events;
+extern size_t num_input_events;
 /* Nonzero means polling for input is temporarily suppressed.  */
 extern int poll_suppress_count;
@@ -485,7 +485,7 @@ extern void push_frame_kboard (struct frame *);
 extern void pop_kboard (void);
 extern void temporarily_switch_to_single_kboard (struct frame *);
 extern void record_asynch_buffer_change (void);
-extern SIGTYPE input_poll_signal (int);
+extern void input_poll_signal (int);
 extern void start_polling (void);
 extern void stop_polling (void);
 extern void set_poll_suppress_count (int);
@@ -507,7 +507,7 @@ extern void kbd_buffer_store_event_hold (struct input_event *,
 extern void kbd_buffer_unget_event (struct input_event *);
 extern void poll_for_input_1 (void);
 extern void show_help_echo (Lisp_Object, Lisp_Object, Lisp_Object,
-                            Lisp_Object, int);
+                            Lisp_Object);
 extern void gen_help_event (Lisp_Object, Lisp_Object, Lisp_Object,
                            Lisp_Object, EMACS_INT);
 extern void kbd_buffer_store_help_event (Lisp_Object, Lisp_Object);
@@ -517,7 +517,7 @@ extern void add_user_signal (int, const char *);
 extern int tty_read_avail_input (struct terminal *, int,
                                 struct input_event *);
-extern EMACS_TIME timer_check (int);
+extern EMACS_TIME timer_check (void);
 extern void mark_kboards (void);
 #ifdef WINDOWSNT
diff --git a/src/keymap.c b/src/keymap.c
index 06968a0d944..10000b935aa 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -81,8 +81,7 @@ static void describe_map (Lisp_Object, Lisp_Object,
                          int, Lisp_Object, Lisp_Object*, int, int);
 static void describe_vector (Lisp_Object, Lisp_Object, Lisp_Object,
                             void (*) (Lisp_Object, Lisp_Object), int,
-                             Lisp_Object, Lisp_Object, int *,
+                             Lisp_Object, Lisp_Object, int, int);
-                             int, int, int);
 static void silly_event_symbol_error (Lisp_Object);
 static Lisp_Object get_keyelt (Lisp_Object, int);
@@ -2388,7 +2387,7 @@ push_key_description (register unsigned int c, register char *p, int force_multi
      /* Now we are sure that C is a valid character code.  */
      if (NILP (BVAR (current_buffer, enable_multibyte_characters))
          && ! force_multibyte)
-        *p++ = multibyte_char_to_unibyte (c, Qnil);
+        *p++ = multibyte_char_to_unibyte (c);
      else
        p += CHAR_STRING (c, (unsigned char *) p);
    }
@@ -3353,7 +3352,7 @@ describe_map (Lisp_Object map, Lisp_Object prefix,
          || CHAR_TABLE_P (XCAR (tail)))
        describe_vector (XCAR (tail),
                         prefix, Qnil, elt_describer, partial, shadow, map,
-                         (int *)0, 0, 1, mention_shadow);
+                         1, mention_shadow);
      else if (CONSP (XCAR (tail)))
        {
          int this_shadowed = 0;
@@ -3506,7 +3505,7 @@ DESCRIBER is the output function used; nil means use `princ'.  */)
  specbind (Qstandard_output, Fcurrent_buffer ());
  CHECK_VECTOR_OR_CHAR_TABLE (vector);
  describe_vector (vector, Qnil, describer, describe_vector_princ, 0,
-                   Qnil, Qnil, (int *)0, 0, 0, 0);
+                   Qnil, Qnil, 0, 0);
  return unbind_to (count, Qnil);
 }
@@ -3539,9 +3538,6 @@ DESCRIBER is the output function used; nil means use `princ'.  */)
   ARGS is simply passed as the second argument to ELT_DESCRIBER.
-   INDICES and CHAR_TABLE_DEPTH are ignored.  They will be removed in
-   the near future.
   KEYMAP_P is 1 if vector is known to be a keymap, so map ESC to M-.
   ARGS is simply passed as the second argument to ELT_DESCRIBER.  */
@@ -3550,8 +3546,7 @@ static void
 describe_vector (Lisp_Object vector, Lisp_Object prefix, Lisp_Object args,
                 void (*elt_describer) (Lisp_Object, Lisp_Object),
                 int partial, Lisp_Object shadow, Lisp_Object entire_map,
-                 int *indices, int char_table_depth, int keymap_p,
+                 int keymap_p, int mention_shadow)
-                 int mention_shadow)
 {
  Lisp_Object definition;
  Lisp_Object tem2;
diff --git a/src/lisp.h b/src/lisp.h
index 9cbaf24cacf..bd70dcebbdb 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -964,7 +964,7 @@ struct Lisp_Subr
      Lisp_Object (*a7) (Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object);
      Lisp_Object (*a8) (Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object);
      Lisp_Object (*aUNEVALLED) (Lisp_Object args);
-      Lisp_Object (*aMANY) (int, Lisp_Object *);
+      Lisp_Object (*aMANY) (size_t, Lisp_Object *);
    } function;
    short min_args, max_args;
    const char *symbol_name;
@@ -1814,7 +1814,7 @@ typedef struct {
 /* Note that the weird token-substitution semantics of ANSI C makes
   this work for MANY and UNEVALLED.  */
-#define DEFUN_ARGS_MANY         (int, Lisp_Object *)
+#define DEFUN_ARGS_MANY         (size_t, Lisp_Object *)
 #define DEFUN_ARGS_UNEVALLED    (Lisp_Object)
 #define DEFUN_ARGS_0    (void)
 #define DEFUN_ARGS_1    (Lisp_Object)
@@ -2084,7 +2084,7 @@ struct gcpro
  volatile Lisp_Object *var;
  /* Number of consecutive protected variables.  */
-  int nvars;
+  size_t nvars;
 #ifdef DEBUG_GCPRO
  int level;
@@ -2283,7 +2283,7 @@ void staticpro (Lisp_Object *);
 struct window;
 struct frame;
-/* Defined in data.c */
+/* Defined in data.c.  */
 extern Lisp_Object Qnil, Qt, Qquote, Qlambda, Qsubr, Qunbound;
 extern Lisp_Object Qerror_conditions, Qerror_message, Qtop_level;
 extern Lisp_Object Qerror, Qquit, Qwrong_type_argument, Qargs_out_of_range;
@@ -2408,7 +2408,7 @@ EXFUN (Fchar_width, 1);
 EXFUN (Fstring, MANY);
 extern EMACS_INT chars_in_text (const unsigned char *, EMACS_INT);
 extern EMACS_INT multibyte_chars_in_text (const unsigned char *, EMACS_INT);
-extern int multibyte_char_to_unibyte (int, Lisp_Object);
+extern int multibyte_char_to_unibyte (int);
 extern int multibyte_char_to_unibyte_safe (int);
 extern void init_character_once (void);
 extern void syms_of_character (void);
@@ -2817,7 +2817,7 @@ extern void init_obarray (void);
 extern void init_lread (void);
 extern void syms_of_lread (void);
-/* Defined in eval.c */
+/* Defined in eval.c.  */
 extern Lisp_Object Qautoload, Qexit, Qinteractive, Qcommandp, Qdefun, Qmacro;
 extern Lisp_Object Qinhibit_quit, Qclosure;
 extern Lisp_Object Vautoload_queue;
@@ -2835,6 +2835,9 @@ EXFUN (Frun_hooks, MANY);
 EXFUN (Frun_hook_with_args, MANY);
 EXFUN (Frun_hook_with_args_until_failure, MANY);
 extern void run_hook_with_args_2 (Lisp_Object, Lisp_Object, Lisp_Object);
+extern Lisp_Object run_hook_with_args (size_t nargs, Lisp_Object *args,
+                                       Lisp_Object (*funcall)
+                                       (size_t nargs, Lisp_Object *args));
 EXFUN (Fprogn, UNEVALLED);
 EXFUN (Finteractive_p, 0);
 EXFUN (Fthrow, 2) NO_RETURN;
@@ -2867,7 +2870,7 @@ extern Lisp_Object internal_lisp_condition_case (Lisp_Object, Lisp_Object, Lisp_
 extern Lisp_Object internal_condition_case (Lisp_Object (*) (void), Lisp_Object, Lisp_Object (*) (Lisp_Object));
 extern Lisp_Object internal_condition_case_1 (Lisp_Object (*) (Lisp_Object), Lisp_Object, Lisp_Object, Lisp_Object (*) (Lisp_Object));
 extern Lisp_Object internal_condition_case_2 (Lisp_Object (*) (Lisp_Object, Lisp_Object), Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object (*) (Lisp_Object));
-extern Lisp_Object internal_condition_case_n (Lisp_Object (*) (int, Lisp_Object *), int, Lisp_Object *, Lisp_Object, Lisp_Object (*) (Lisp_Object));
+extern Lisp_Object internal_condition_case_n (Lisp_Object (*) (size_t, Lisp_Object *), size_t, Lisp_Object *, Lisp_Object, Lisp_Object (*) (Lisp_Object));
 extern void specbind (Lisp_Object, Lisp_Object);
 extern void record_unwind_protect (Lisp_Object (*) (Lisp_Object), Lisp_Object);
 extern Lisp_Object unbind_to (int, Lisp_Object);
@@ -2877,7 +2880,7 @@ extern void do_autoload (Lisp_Object, Lisp_Object);
 extern Lisp_Object un_autoload (Lisp_Object);
 EXFUN (Ffetch_bytecode, 1);
 extern void init_eval_once (void);
-extern Lisp_Object safe_call (int, Lisp_Object *);
+extern Lisp_Object safe_call (size_t, Lisp_Object *);
 extern Lisp_Object safe_call1 (Lisp_Object, Lisp_Object);
 extern Lisp_Object safe_call2 (Lisp_Object, Lisp_Object, Lisp_Object);
 extern void init_eval (void);
@@ -3188,7 +3191,7 @@ extern Lisp_Object decode_env_path (const char *, const char *);
 extern Lisp_Object empty_unibyte_string, empty_multibyte_string;
 extern Lisp_Object Qfile_name_handler_alist;
 extern void (*fatal_error_signal_hook) (void);
-extern SIGTYPE fatal_error_signal (int);
+extern void fatal_error_signal (int);
 EXFUN (Fkill_emacs, 1) NO_RETURN;
 #if HAVE_SETLOCALE
 void fixup_locale (void);
@@ -3240,7 +3243,11 @@ extern void syms_of_process (void);
 extern void setup_process_coding_systems (Lisp_Object);
 EXFUN (Fcall_process, MANY);
-extern int child_setup (int, int, int, char **, int, Lisp_Object);
+extern int child_setup (int, int, int, char **, int, Lisp_Object)
+#ifndef DOS_NT
+ NO_RETURN
+#endif
+ ;
 extern void init_callproc_1 (void);
 extern void init_callproc (void);
 extern void set_initial_environment (void);
@@ -3607,7 +3614,7 @@ extern Lisp_Object safe_alloca_unwind (Lisp_Object);
    else                                                  \
      {                                                   \
        buf = (type) xmalloc (size);                      \
-        sa_must_free++;                                   \
+        sa_must_free = 1;                                 \
        record_unwind_protect (safe_alloca_unwind,        \
                               make_save_value (buf, 0)); \
      }                                                   \
@@ -3637,7 +3644,7 @@ extern Lisp_Object safe_alloca_unwind (Lisp_Object);
        buf = (Lisp_Object *) xmalloc (size_);            \
        arg_ = make_save_value (buf, nelt);               \
        XSAVE_VALUE (arg_)->dogc = 1;                     \
-        sa_must_free++;                                   \
+        sa_must_free = 1;                                 \
        record_unwind_protect (safe_alloca_unwind, arg_); \
      }                                                   \
  } while (0)
diff --git a/src/menu.c b/src/menu.c
index 851f1ac804b..a9098deed7e 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -662,13 +662,12 @@ digest_single_submenu (int start, int end, int top_level_items)
      else if (EQ (XVECTOR (menu_items)->contents[i], Qt))
        {
          /* Create a new pane.  */
-          Lisp_Object pane_name, prefix;
+          Lisp_Object pane_name;
          const char *pane_string;
          panes_seen++;
          pane_name = XVECTOR (menu_items)->contents[i + MENU_ITEMS_PANE_NAME];
-          prefix = XVECTOR (menu_items)->contents[i + MENU_ITEMS_PANE_PREFIX];
 #ifdef HAVE_NTGUI
          if (STRINGP (pane_name))
diff --git a/src/minibuf.c b/src/minibuf.c
index 986765ae6fb..4adf665f8f4 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -649,12 +649,7 @@ read_minibuf (Lisp_Object map, Lisp_Object initial, Lisp_Object prompt,
  if (STRINGP (input_method) && !NILP (Ffboundp (Qactivate_input_method)))
    call1 (Qactivate_input_method, input_method);
-  /* Run our hook, but not if it is empty.
+  Frun_hooks (1, &Qminibuffer_setup_hook);
-     (run-hooks would do nothing if it is empty,
-     but it's important to save time here in the usual case.)  */
-  if (!NILP (Vminibuffer_setup_hook) && !EQ (Vminibuffer_setup_hook, Qunbound)
-      && !NILP (Vrun_hooks))
-    call1 (Vrun_hooks, Qminibuffer_setup_hook);
  /* Don't allow the user to undo past this point.  */
  BVAR (current_buffer, undo_list) = Qnil;
@@ -806,10 +801,7 @@ get_minibuffer (int depth)
 static Lisp_Object
 run_exit_minibuf_hook (Lisp_Object data)
 {
-  if (!NILP (Vminibuffer_exit_hook) && !EQ (Vminibuffer_exit_hook, Qunbound)
+  safe_run_hooks (Qminibuffer_exit_hook);
-      && !NILP (Vrun_hooks))
-    safe_run_hooks (Qminibuffer_exit_hook);
  return Qnil;
 }
diff --git a/src/nsmenu.m b/src/nsmenu.m
index e8d4a256906..623c933ce8e 100644
--- a/src/nsmenu.m
+++ b/src/nsmenu.m
@@ -1705,7 +1705,6 @@ void process_dialog (id window, Lisp_Object list)
 - (Lisp_Object)runDialogAt: (NSPoint)p
 {
  NSInteger ret;
-  extern EMACS_TIME timer_check (int do_it_now); /* TODO: add to a header */
  /* initiate a session that will be ended by pop_down_menu */
  popupSession = [NSApp beginModalSessionForWindow: self];
@@ -1715,7 +1714,7 @@ void process_dialog (id window, Lisp_Object list)
    {
      /* Run this for timers.el, indep of atimers; might not return.
         TODO: use return value to avoid calling every iteration. */
-      timer_check (1);
+      timer_check ();
      [NSThread sleepUntilDate: [NSDate dateWithTimeIntervalSinceNow: 0.1]];
    }
diff --git a/src/nsterm.m b/src/nsterm.m
index c7cd411c614..91f0cbba585 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -170,6 +170,7 @@ BOOL ns_in_resize = NO;
 static BOOL ns_fake_keydown = NO;
 int ns_tmp_flags; /* FIXME */
 struct nsfont_info *ns_tmp_font; /* FIXME */
+static BOOL ns_menu_bar_is_hidden = NO;
 /*static int debug_lock = 0; */
 /* event loop */
@@ -505,6 +506,118 @@ ns_resize_handle_rect (NSWindow *window)
 }
+//
+// Window constraining
+// -------------------
+//
+// To ensure that the windows are not placed under the menu bar, they
+// are typically moved by the call-back constrainFrameRect. However,
+// by overriding it, it's possible to inhibit this, leaving the window
+// in it's original position.
+//
+// It's possible to hide the menu bar. However, technically, it's only
+// possible to hide it when the application is active. To ensure that
+// this work properly, the menu bar and window constraining are
+// deferred until the application becomes active.
+//
+// Even though it's not possible to manually move a window above the
+// top of the screen, it is allowed if it's done programmatically,
+// when the menu is hidden. This allows the editable area to cover the
+// full screen height.
+//
+// Test cases
+// ----------
+//
+// Use the following extra files:
+//
+//    init.el:
+//       ;; Hide menu and place frame slightly above the top of the screen.
+//       (setq ns-auto-hide-menu-bar t)
+//       (set-frame-position (selected-frame) 0 -20)
+//
+// Test 1:
+//
+//    emacs -Q -l init.el
+//
+//    Result: No menu bar, and the title bar should be above the screen.
+//
+// Test 2:
+//
+//    emacs -Q
+//
+//    Result: Menu bar visible, frame placed immediately below the menu.
+//
+static void
+ns_constrain_all_frames (void)
+{
+  Lisp_Object tail, frame;
+  FOR_EACH_FRAME (tail, frame)
+    {
+      struct frame *f = XFRAME (frame);
+      if (FRAME_NS_P (f))
+        {
+          NSView *view = FRAME_NS_VIEW (f);
+          /* This no-op will trigger the default window placing
+           * constriant system. */
+          f->output_data.ns->dont_constrain = 0;
+          [[view window] setFrameOrigin:[[view window] frame].origin];
+        }
+    }
+}
+/* True, if the menu bar should be hidden.  */
+static BOOL
+ns_menu_bar_should_be_hidden (void)
+{
+  return !NILP (ns_auto_hide_menu_bar)
+    && [NSApp respondsToSelector:@selector(setPresentationOptions:)];
+}
+/* Show or hide the menu bar, based on user setting.  */
+static void
+ns_update_auto_hide_menu_bar (void)
+{
+  BLOCK_INPUT;
+  NSTRACE (ns_update_auto_hide_menu_bar);
+  if (NSApp != nil
+      && [NSApp isActive]
+      && [NSApp respondsToSelector:@selector(setPresentationOptions:)])
+    {
+      // Note, "setPresentationOptions" triggers an error unless the
+      // application is active.
+      BOOL menu_bar_should_be_hidden = ns_menu_bar_should_be_hidden ();
+      if (menu_bar_should_be_hidden != ns_menu_bar_is_hidden)
+        {
+          NSApplicationPresentationOptions options
+            = NSApplicationPresentationAutoHideDock;
+          if (menu_bar_should_be_hidden)
+            options |= NSApplicationPresentationAutoHideMenuBar;
+          [NSApp setPresentationOptions: options];
+          ns_menu_bar_is_hidden = menu_bar_should_be_hidden;
+          if (!ns_menu_bar_is_hidden)
+            {
+              ns_constrain_all_frames ();
+            }
+        }
+    }
+  UNBLOCK_INPUT;
+}
 static void
 ns_update_begin (struct frame *f)
 /* --------------------------------------------------------------------------
@@ -515,6 +628,8 @@ ns_update_begin (struct frame *f)
  NSView *view = FRAME_NS_VIEW (f);
  NSTRACE (ns_update_begin);
+  ns_update_auto_hide_menu_bar ();
  ns_updating_frame = f;
  [view lockFocus];
@@ -4205,7 +4320,13 @@ ns_term_shutdown (int sig)
 }
 - (void)applicationDidBecomeActive: (NSNotification *)notification
 {
+  NSTRACE (applicationDidBecomeActive);
  //ns_app_active=YES;
+  ns_update_auto_hide_menu_bar ();
+  // No constrining takes place when the application is not active.
+  ns_constrain_all_frames ();
 }
 - (void)applicationDidResignActive: (NSNotification *)notification
 {
@@ -5689,7 +5810,10 @@ ns_term_shutdown (int sig)
  /* When making the frame visible for the first time, we want to
     constrain.  Other times not.  */
  struct frame *f = ((EmacsView *)[self delegate])->emacsframe;
-  if (f->output_data.ns->dont_constrain)
+  NSTRACE (constrainFrameRect);
+  if (f->output_data.ns->dont_constrain
+      || ns_menu_bar_should_be_hidden ())
    return frameRect;
  f->output_data.ns->dont_constrain = 1;
@@ -6361,6 +6485,11 @@ allowing it to be used at a lower level for accented character entry.");
  staticpro (&last_mouse_motion_frame);
  last_mouse_motion_frame = Qnil;
+  DEFVAR_LISP ("ns-auto-hide-menu-bar", ns_auto_hide_menu_bar,
+               doc: /* Non-nil means that the menu bar is hidden, but appears when the mouse is near.
+Only works on OSX 10.6 or later.  */);
+  ns_auto_hide_menu_bar = Qnil;
  /* TODO: move to common code */
  DEFVAR_LISP ("x-toolkit-scroll-bars", Vx_toolkit_scroll_bars,
               doc: /* If not nil, Emacs uses toolkit scroll bars.  */);
diff --git a/src/print.c b/src/print.c
index b8266422473..17a896bba8d 100644
--- a/src/print.c
+++ b/src/print.c
@@ -273,7 +273,7 @@ printchar (unsigned int ch, Lisp_Object fun)
 static void
 strout (const char *ptr, EMACS_INT size, EMACS_INT size_byte,
-        Lisp_Object printcharfun, int multibyte)
+        Lisp_Object printcharfun)
 {
  if (size < 0)
    size_byte = size = strlen (ptr);
@@ -406,16 +406,13 @@ print_string (Lisp_Object string, Lisp_Object printcharfun)
          SAFE_ALLOCA (buffer, char *, nbytes);
          memcpy (buffer, SDATA (string), nbytes);
-          strout (buffer, chars, SBYTES (string),
+          strout (buffer, chars, SBYTES (string), printcharfun);
-                  printcharfun, STRING_MULTIBYTE (string));
          SAFE_FREE ();
        }
      else
        /* No need to copy, since output to print_buffer can't GC.  */
-        strout (SSDATA (string),
+        strout (SSDATA (string), chars, SBYTES (string), printcharfun);
-                chars, SBYTES (string),
-                printcharfun, STRING_MULTIBYTE (string));
    }
  else
    {
@@ -472,7 +469,7 @@ write_string (const char *data, int size)
  printcharfun = Vstandard_output;
  PRINTPREPARE;
-  strout (data, size, size, printcharfun, 0);
+  strout (data, size, size, printcharfun);
  PRINTFINISH;
 }
@@ -486,7 +483,7 @@ write_string_1 (const char *data, int size, Lisp_Object printcharfun)
  PRINTDECLARE;
  PRINTPREPARE;
-  strout (data, size, size, printcharfun, 0);
+  strout (data, size, size, printcharfun);
  PRINTFINISH;
 }
@@ -1351,7 +1348,7 @@ print_object (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag
            if (EQ (obj, being_printed[i]))
              {
                sprintf (buf, "#%d", i);
-                strout (buf, -1, -1, printcharfun, 0);
+                strout (buf, -1, -1, printcharfun);
                return;
              }
          being_printed[print_depth] = obj;
@@ -1367,7 +1364,7 @@ print_object (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag
                { /* Add a prefix #n= if OBJ has not yet been printed;
                     that is, its status field is nil.  */
                  sprintf (buf, "#%d=", -n);
-                  strout (buf, -1, -1, printcharfun, 0);
+                  strout (buf, -1, -1, printcharfun);
                  /* OBJ is going to be printed.  Remember that fact.  */
                  Fputhash (obj, make_number (- n), Vprint_number_table);
                }
@@ -1375,7 +1372,7 @@ print_object (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag
                {
                  /* Just print #n# if OBJ has already been printed.  */
                  sprintf (buf, "#%d#", n);
-                  strout (buf, -1, -1, printcharfun, 0);
+                  strout (buf, -1, -1, printcharfun);
                  return;
                }
            }
@@ -1393,7 +1390,7 @@ print_object (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag
        sprintf (buf, "%ld", (long) XINT (obj));
      else
        abort ();
-      strout (buf, -1, -1, printcharfun, 0);
+      strout (buf, -1, -1, printcharfun);
      break;
    case Lisp_Float:
@@ -1401,7 +1398,7 @@ print_object (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag
        char pigbuf[FLOAT_TO_STRING_BUFSIZE];
        float_to_string (pigbuf, XFLOAT_DATA (obj));
-        strout (pigbuf, -1, -1, printcharfun, 0);
+        strout (pigbuf, -1, -1, printcharfun);
      }
      break;
@@ -1479,7 +1476,7 @@ print_object (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag
                      sprintf (outbuf, "\\x%04x", c);
                      need_nonhex = 1;
                    }
-                  strout (outbuf, -1, -1, printcharfun, 0);
+                  strout (outbuf, -1, -1, printcharfun);
                }
              else if (! multibyte
                       && SINGLE_BYTE_CHAR_P (c) && ! ASCII_BYTE_P (c)
@@ -1491,7 +1488,7 @@ print_object (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag
                     using octal escapes.  */
                  char outbuf[5];
                  sprintf (outbuf, "\\%03o", c);
-                  strout (outbuf, -1, -1, printcharfun, 0);
+                  strout (outbuf, -1, -1, printcharfun);
                }
              else
                {
@@ -1504,7 +1501,7 @@ print_object (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag
                      if ((c >= 'a' && c <= 'f')
                          || (c >= 'A' && c <= 'F')
                          || (c >= '0' && c <= '9'))
-                        strout ("\\ ", -1, -1, printcharfun, 0);
+                        strout ("\\ ", -1, -1, printcharfun);
                    }
                  if (c == '\"' || c == '\\')
@@ -1592,7 +1589,7 @@ print_object (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag
      /* If deeper than spec'd depth, print placeholder.  */
      if (INTEGERP (Vprint_level)
          && print_depth > XINT (Vprint_level))
-        strout ("...", -1, -1, printcharfun, 0);
+        strout ("...", -1, -1, printcharfun);
      else if (print_quoted && CONSP (XCDR (obj)) && NILP (XCDR (XCDR (obj)))
               && (EQ (XCAR (obj), Qquote)))
        {
@@ -1652,7 +1649,7 @@ print_object (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag
                    if (i != 0 && EQ (obj, halftail))
                      {
                        sprintf (buf, " . #%d", i / 2);
-                        strout (buf, -1, -1, printcharfun, 0);
+                        strout (buf, -1, -1, printcharfun);
                        goto end_of_list;
                      }
                  }
@@ -1664,7 +1661,7 @@ print_object (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag
                        Lisp_Object num = Fgethash (obj, Vprint_number_table, Qnil);
                        if (INTEGERP (num))
                          {
-                            strout (" . ", 3, 3, printcharfun, 0);
+                            strout (" . ", 3, 3, printcharfun);
                            print_object (obj, printcharfun, escapeflag);
                            goto end_of_list;
                          }
@@ -1676,7 +1673,7 @@ print_object (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag
                if (print_length && i > print_length)
                  {
-                    strout ("...", 3, 3, printcharfun, 0);
+                    strout ("...", 3, 3, printcharfun);
                    goto end_of_list;
                  }
@@ -1691,7 +1688,7 @@ print_object (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag
          /* OBJ non-nil here means it's the end of a dotted list.  */
          if (!NILP (obj))
            {
-              strout (" . ", 3, 3, printcharfun, 0);
+              strout (" . ", 3, 3, printcharfun);
              print_object (obj, printcharfun, escapeflag);
            }
@@ -1705,7 +1702,7 @@ print_object (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag
        {
          if (escapeflag)
            {
-              strout ("#<process ", -1, -1, printcharfun, 0);
+              strout ("#<process ", -1, -1, printcharfun);
              print_string (XPROCESS (obj)->name, printcharfun);
              PRINTCHAR ('>');
            }
@@ -1726,7 +1723,7 @@ print_object (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag
          PRINTCHAR ('#');
          PRINTCHAR ('&');
          sprintf (buf, "%ld", (long) XBOOL_VECTOR (obj)->size);
-          strout (buf, -1, -1, printcharfun, 0);
+          strout (buf, -1, -1, printcharfun);
          PRINTCHAR ('\"');
          /* Don't print more characters than the specified maximum.
@@ -1771,18 +1768,18 @@ print_object (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag
        }
      else if (SUBRP (obj))
        {
-          strout ("#<subr ", -1, -1, printcharfun, 0);
+          strout ("#<subr ", -1, -1, printcharfun);
-          strout (XSUBR (obj)->symbol_name, -1, -1, printcharfun, 0);
+          strout (XSUBR (obj)->symbol_name, -1, -1, printcharfun);
          PRINTCHAR ('>');
        }
      else if (WINDOWP (obj))
        {
-          strout ("#<window ", -1, -1, printcharfun, 0);
+          strout ("#<window ", -1, -1, printcharfun);
          sprintf (buf, "%ld", (long) XFASTINT (XWINDOW (obj)->sequence_number));
-          strout (buf, -1, -1, printcharfun, 0);
+          strout (buf, -1, -1, printcharfun);
          if (!NILP (XWINDOW (obj)->buffer))
            {
-              strout (" on ", -1, -1, printcharfun, 0);
+              strout (" on ", -1, -1, printcharfun);
              print_string (BVAR (XBUFFER (XWINDOW (obj)->buffer), name), printcharfun);
            }
          PRINTCHAR ('>');
@@ -1790,13 +1787,13 @@ print_object (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag
      else if (TERMINALP (obj))
        {
          struct terminal *t = XTERMINAL (obj);
-          strout ("#<terminal ", -1, -1, printcharfun, 0);
+          strout ("#<terminal ", -1, -1, printcharfun);
          sprintf (buf, "%d", t->id);
-          strout (buf, -1, -1, printcharfun, 0);
+          strout (buf, -1, -1, printcharfun);
          if (t->name)
            {
-              strout (" on ", -1, -1, printcharfun, 0);
+              strout (" on ", -1, -1, printcharfun);
-              strout (t->name, -1, -1, printcharfun, 0);
+              strout (t->name, -1, -1, printcharfun);
            }
          PRINTCHAR ('>');
        }
@@ -1806,21 +1803,21 @@ print_object (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag
          int i;
          EMACS_INT real_size, size;
 #if 0
-          strout ("#<hash-table", -1, -1, printcharfun, 0);
+          strout ("#<hash-table", -1, -1, printcharfun);
          if (SYMBOLP (h->test))
            {
              PRINTCHAR (' ');
              PRINTCHAR ('\'');
-              strout (SDATA (SYMBOL_NAME (h->test)), -1, -1, printcharfun, 0);
+              strout (SDATA (SYMBOL_NAME (h->test)), -1, -1, printcharfun);
              PRINTCHAR (' ');
-              strout (SDATA (SYMBOL_NAME (h->weak)), -1, -1, printcharfun, 0);
+              strout (SDATA (SYMBOL_NAME (h->weak)), -1, -1, printcharfun);
              PRINTCHAR (' ');
              sprintf (buf, "%ld/%ld", (long) h->count,
                       (long) XVECTOR (h->next)->size);
-              strout (buf, -1, -1, printcharfun, 0);
+              strout (buf, -1, -1, printcharfun);
            }
          sprintf (buf, " 0x%lx", (unsigned long) h);
-          strout (buf, -1, -1, printcharfun, 0);
+          strout (buf, -1, -1, printcharfun);
          PRINTCHAR ('>');
 #endif
          /* Implement a readable output, e.g.:
@@ -1828,33 +1825,33 @@ print_object (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag
          /* Always print the size. */
          sprintf (buf, "#s(hash-table size %ld",
                   (long) XVECTOR (h->next)->size);
-          strout (buf, -1, -1, printcharfun, 0);
+          strout (buf, -1, -1, printcharfun);
          if (!NILP (h->test))
            {
-              strout (" test ", -1, -1, printcharfun, 0);
+              strout (" test ", -1, -1, printcharfun);
              print_object (h->test, printcharfun, escapeflag);
            }
          if (!NILP (h->weak))
            {
-              strout (" weakness ", -1, -1, printcharfun, 0);
+              strout (" weakness ", -1, -1, printcharfun);
              print_object (h->weak, printcharfun, escapeflag);
            }
          if (!NILP (h->rehash_size))
            {
-              strout (" rehash-size ", -1, -1, printcharfun, 0);
+              strout (" rehash-size ", -1, -1, printcharfun);
              print_object (h->rehash_size, printcharfun, escapeflag);
            }
          if (!NILP (h->rehash_threshold))
            {
-              strout (" rehash-threshold ", -1, -1, printcharfun, 0);
+              strout (" rehash-threshold ", -1, -1, printcharfun);
              print_object (h->rehash_threshold, printcharfun, escapeflag);
            }
-          strout (" data ", -1, -1, printcharfun, 0);
+          strout (" data ", -1, -1, printcharfun);
          /* Print the data here as a plist. */
          real_size = HASH_TABLE_SIZE (h);
@@ -1876,7 +1873,7 @@ print_object (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag
              }
          if (size < real_size)
-            strout (" ...", 4, 4, printcharfun, 0);
+            strout (" ...", 4, 4, printcharfun);
          PRINTCHAR (')');
          PRINTCHAR (')');
@@ -1885,10 +1882,10 @@ print_object (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag
      else if (BUFFERP (obj))
        {
          if (NILP (BVAR (XBUFFER (obj), name)))
-            strout ("#<killed buffer>", -1, -1, printcharfun, 0);
+            strout ("#<killed buffer>", -1, -1, printcharfun);
          else if (escapeflag)
            {
-              strout ("#<buffer ", -1, -1, printcharfun, 0);
+              strout ("#<buffer ", -1, -1, printcharfun);
              print_string (BVAR (XBUFFER (obj), name), printcharfun);
              PRINTCHAR ('>');
            }
@@ -1897,16 +1894,16 @@ print_object (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag
        }
      else if (WINDOW_CONFIGURATIONP (obj))
        {
-          strout ("#<window-configuration>", -1, -1, printcharfun, 0);
+          strout ("#<window-configuration>", -1, -1, printcharfun);
        }
      else if (FRAMEP (obj))
        {
          strout ((FRAME_LIVE_P (XFRAME (obj))
                   ? "#<frame " : "#<dead frame "),
-                  -1, -1, printcharfun, 0);
+                  -1, -1, printcharfun);
          print_string (XFRAME (obj)->name, printcharfun);
          sprintf (buf, " 0x%lx", (unsigned long) (XFRAME (obj)));
-          strout (buf, -1, -1, printcharfun, 0);
+          strout (buf, -1, -1, printcharfun);
          PRINTCHAR ('>');
        }
      else if (FONTP (obj))
@@ -1916,9 +1913,9 @@ print_object (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag
          if (! FONT_OBJECT_P (obj))
            {
              if (FONT_SPEC_P (obj))
-                strout ("#<font-spec", -1, -1, printcharfun, 0);
+                strout ("#<font-spec", -1, -1, printcharfun);
              else
-                strout ("#<font-entity", -1, -1, printcharfun, 0);
+                strout ("#<font-entity", -1, -1, printcharfun);
              for (i = 0; i < FONT_SPEC_MAX; i++)
                {
                  PRINTCHAR (' ');
@@ -1931,7 +1928,7 @@ print_object (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag
            }
          else
            {
-              strout ("#<font-object ", -1, -1, printcharfun, 0);
+              strout ("#<font-object ", -1, -1, printcharfun);
              print_object (AREF (obj, FONT_NAME_INDEX), printcharfun,
                            escapeflag);
            }
@@ -1984,7 +1981,7 @@ print_object (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag
                print_object (tem, printcharfun, escapeflag);
              }
            if (size < real_size)
-              strout (" ...", 4, 4, printcharfun, 0);
+              strout (" ...", 4, 4, printcharfun);
          }
          PRINTCHAR (']');
        }
@@ -1994,32 +1991,32 @@ print_object (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag
      switch (XMISCTYPE (obj))
        {
        case Lisp_Misc_Marker:
-          strout ("#<marker ", -1, -1, printcharfun, 0);
+          strout ("#<marker ", -1, -1, printcharfun);
          /* Do you think this is necessary?  */
          if (XMARKER (obj)->insertion_type != 0)
-            strout ("(moves after insertion) ", -1, -1, printcharfun, 0);
+            strout ("(moves after insertion) ", -1, -1, printcharfun);
          if (! XMARKER (obj)->buffer)
-            strout ("in no buffer", -1, -1, printcharfun, 0);
+            strout ("in no buffer", -1, -1, printcharfun);
          else
            {
              sprintf (buf, "at %ld", (long)marker_position (obj));
-              strout (buf, -1, -1, printcharfun, 0);
+              strout (buf, -1, -1, printcharfun);
-              strout (" in ", -1, -1, printcharfun, 0);
+              strout (" in ", -1, -1, printcharfun);
              print_string (BVAR (XMARKER (obj)->buffer, name), printcharfun);
            }
          PRINTCHAR ('>');
          break;
        case Lisp_Misc_Overlay:
-          strout ("#<overlay ", -1, -1, printcharfun, 0);
+          strout ("#<overlay ", -1, -1, printcharfun);
          if (! XMARKER (OVERLAY_START (obj))->buffer)
-            strout ("in no buffer", -1, -1, printcharfun, 0);
+            strout ("in no buffer", -1, -1, printcharfun);
          else
            {
              sprintf (buf, "from %ld to %ld in ",
                       (long)marker_position (OVERLAY_START (obj)),
                       (long)marker_position (OVERLAY_END   (obj)));
-              strout (buf, -1, -1, printcharfun, 0);
+              strout (buf, -1, -1, printcharfun);
              print_string (BVAR (XMARKER (OVERLAY_START (obj))->buffer, name),
                            printcharfun);
            }
@@ -2029,15 +2026,15 @@ print_object (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag
      /* Remaining cases shouldn't happen in normal usage, but let's print
         them anyway for the benefit of the debugger.  */
        case Lisp_Misc_Free:
-          strout ("#<misc free cell>", -1, -1, printcharfun, 0);
+          strout ("#<misc free cell>", -1, -1, printcharfun);
          break;
        case Lisp_Misc_Save_Value:
-          strout ("#<save_value ", -1, -1, printcharfun, 0);
+          strout ("#<save_value ", -1, -1, printcharfun);
          sprintf(buf, "ptr=0x%08lx int=%d",
                  (unsigned long) XSAVE_VALUE (obj)->pointer,
                  XSAVE_VALUE (obj)->integer);
-          strout (buf, -1, -1, printcharfun, 0);
+          strout (buf, -1, -1, printcharfun);
          PRINTCHAR ('>');
          break;
@@ -2051,16 +2048,16 @@ print_object (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag
      {
        /* We're in trouble if this happens!
           Probably should just abort () */
-        strout ("#<EMACS BUG: INVALID DATATYPE ", -1, -1, printcharfun, 0);
+        strout ("#<EMACS BUG: INVALID DATATYPE ", -1, -1, printcharfun);
        if (MISCP (obj))
          sprintf (buf, "(MISC 0x%04x)", (int) XMISCTYPE (obj));
        else if (VECTORLIKEP (obj))
          sprintf (buf, "(PVEC 0x%08x)", (int) XVECTOR (obj)->size);
        else
          sprintf (buf, "(0x%02x)", (int) XTYPE (obj));
-        strout (buf, -1, -1, printcharfun, 0);
+        strout (buf, -1, -1, printcharfun);
        strout (" Save your buffers immediately and please report this bug>",
-                -1, -1, printcharfun, 0);
+                -1, -1, printcharfun);
      }
    }
diff --git a/src/process.c b/src/process.c
index c9b420ab2ae..1abfbd3f2a4 100644
--- a/src/process.c
+++ b/src/process.c
@@ -159,9 +159,6 @@ extern Lisp_Object QCfilter;
 #define SERIALCONN_P(p) (EQ (XPROCESS (p)->type, Qserial))
 #define SERIALCONN1_P(p) (EQ ((p)->type, Qserial))
-/* Define first descriptor number available for subprocesses.  */
-#define FIRST_PROC_DESC 3
 #ifndef HAVE_H_ERRNO
 extern int h_errno;
 #endif
@@ -278,10 +275,6 @@ static SELECT_TYPE connect_wait_mask;
 /* Number of bits set in connect_wait_mask.  */
 static int num_pending_connects;
-#define IF_NON_BLOCKING_CONNECT(s) s
-#else  /* NON_BLOCKING_CONNECT */
-#define IF_NON_BLOCKING_CONNECT(s)
 #endif  /* NON_BLOCKING_CONNECT */
 /* The largest descriptor currently in use for a process object.  */
@@ -1250,8 +1243,8 @@ Returns nil if format of ADDRESS is invalid.  */)
 static Lisp_Object
 list_processes_1 (Lisp_Object query_only)
 {
-  register Lisp_Object tail, tem;
+  register Lisp_Object tail;
-  Lisp_Object proc, minspace, tem1;
+  Lisp_Object proc, minspace;
  register struct Lisp_Process *p;
  char tembuf[300];
  int w_proc, w_buffer, w_tty;
@@ -1453,10 +1446,10 @@ list_processes_1 (Lisp_Object query_only)
        }
      else
        {
-          tem = p->command;
+          Lisp_Object tem = p->command;
          while (1)
            {
-              tem1 = Fcar (tem);
+              Lisp_Object tem1 = Fcar (tem);
              if (NILP (tem1))
                break;
              Finsert (1, &tem1);
@@ -1519,11 +1512,11 @@ the command through a shell and redirect one of them using the shell
 syntax.
 usage: (start-process NAME BUFFER PROGRAM &rest PROGRAM-ARGS)  */)
-  (int nargs, register Lisp_Object *args)
+  (size_t nargs, register Lisp_Object *args)
 {
  Lisp_Object buffer, name, program, proc, current_dir, tem;
  register unsigned char **new_argv;
-  register int i;
+  register size_t i;
  int count = SPECPDL_INDEX ();
  buffer = args[1];
@@ -1729,7 +1722,7 @@ usage: (start-process NAME BUFFER PROGRAM &rest PROGRAM-ARGS)  */)
      new_argv = (unsigned char **) alloca ((nargs - 1) * sizeof (char *));
      new_argv[nargs - 2] = 0;
-      for (i = nargs - 3; i >= 0; i--)
+      for (i = nargs - 2; i-- != 0; )
        {
          new_argv[i] = SDATA (XCAR (tem));
          tem = XCDR (tem);
@@ -1919,8 +1912,7 @@ create_process (Lisp_Object process, char **new_argv, Lisp_Object current_dir)
    /* child_setup must clobber environ on systems with true vfork.
       Protect it from permanent change.  */
    char **save_environ = environ;
+    volatile Lisp_Object encoded_current_dir = ENCODE_FILE (current_dir);
-    current_dir = ENCODE_FILE (current_dir);
 #ifndef WINDOWSNT
    pid = vfork ();
@@ -2061,13 +2053,13 @@ create_process (Lisp_Object process, char **new_argv, Lisp_Object current_dir)
          child_setup_tty (xforkout);
 #ifdef WINDOWSNT
        pid = child_setup (xforkin, xforkout, xforkout,
-                           new_argv, 1, current_dir);
+                           new_argv, 1, encoded_current_dir);
 #else  /* not WINDOWSNT */
 #ifdef FD_CLOEXEC
        emacs_close (wait_child_setup[0]);
 #endif
        child_setup (xforkin, xforkout, xforkout,
-                     new_argv, 1, current_dir);
+                     new_argv, 1, encoded_current_dir);
 #endif /* not WINDOWSNT */
      }
    environ = save_environ;
@@ -2689,7 +2681,7 @@ Examples:
 \(serial-process-configure :port "\\\\.\\COM13" :bytesize 7)
 usage: (serial-process-configure &rest ARGS)  */)
-  (int nargs, Lisp_Object *args)
+  (size_t nargs, Lisp_Object *args)
 {
  struct Lisp_Process *p;
  Lisp_Object contact = Qnil;
@@ -2807,7 +2799,7 @@ Examples:
 \(make-serial-process :port "/dev/tty.BlueConsole-SPP-1" :speed nil)
 usage:  (make-serial-process &rest ARGS)  */)
-  (int nargs, Lisp_Object *args)
+  (size_t nargs, Lisp_Object *args)
 {
  int fd = -1;
  Lisp_Object proc, contact, port;
@@ -3085,7 +3077,7 @@ The original argument list, modified with the actual connection
 information, is available via the `process-contact' function.
 usage: (make-network-process &rest ARGS)  */)
-  (int nargs, Lisp_Object *args)
+  (size_t nargs, Lisp_Object *args)
 {
  Lisp_Object proc;
  Lisp_Object contact;
@@ -3401,9 +3393,12 @@ usage: (make-network-process &rest ARGS)  */)
  for (lres = res; lres; lres = lres->ai_next)
    {
-      int optn, optbits;
+      size_t optn;
+      int optbits;
+#ifdef WINDOWSNT
    retry_connect:
+#endif
      s = socket (lres->ai_family, lres->ai_socktype, lres->ai_protocol);
      if (s < 0)
@@ -3467,7 +3462,7 @@ usage: (make-network-process &rest ARGS)  */)
          if (EQ (service, Qt))
            {
              struct sockaddr_in sa1;
-              int len1 = sizeof (sa1);
+              socklen_t len1 = sizeof (sa1);
              if (getsockname (s, (struct sockaddr *)&sa1, &len1) == 0)
                {
                  ((struct sockaddr_in *)(lres->ai_addr))->sin_port = sa1.sin_port;
@@ -3514,7 +3509,8 @@ usage: (make-network-process &rest ARGS)  */)
          /* Unlike most other syscalls connect() cannot be called
             again.  (That would return EALREADY.)  The proper way to
             wait for completion is select(). */
-          int sc, len;
+          int sc;
+          socklen_t len;
          SELECT_TYPE fdset;
        retry_select:
          FD_ZERO (&fdset);
@@ -3587,7 +3583,7 @@ usage: (make-network-process &rest ARGS)  */)
      if (!is_server)
        {
          struct sockaddr_in sa1;
-          int len1 = sizeof (sa1);
+          socklen_t len1 = sizeof (sa1);
          if (getsockname (s, (struct sockaddr *)&sa1, &len1) == 0)
            contact = Fplist_put (contact, QClocal,
                                  conv_sockaddr_to_lisp ((struct sockaddr *)&sa1, len1));
@@ -3705,10 +3701,10 @@ usage: (make-network-process &rest ARGS)  */)
  {
    /* Setup coding systems for communicating with the network stream.  */
-    struct gcpro gcpro1;
+    struct gcpro inner_gcpro1;
    /* Qt denotes we have not yet called Ffind_operation_coding_system.  */
    Lisp_Object coding_systems = Qt;
-    Lisp_Object args[5], val;
+    Lisp_Object fargs[5], val;
    if (!NILP (tem))
      {
@@ -3731,11 +3727,11 @@ usage: (make-network-process &rest ARGS)  */)
          coding_systems = Qnil;
        else
          {
-            args[0] = Qopen_network_stream, args[1] = name,
+            fargs[0] = Qopen_network_stream, fargs[1] = name,
-              args[2] = buffer, args[3] = host, args[4] = service;
+              fargs[2] = buffer, fargs[3] = host, fargs[4] = service;
-            GCPRO1 (proc);
+            GCPRO1_VAR (proc, inner_gcpro);
-            coding_systems = Ffind_operation_coding_system (5, args);
+            coding_systems = Ffind_operation_coding_system (5, fargs);
-            UNGCPRO;
+            UNGCPRO_VAR (inner_gcpro);
          }
        if (CONSP (coding_systems))
          val = XCAR (coding_systems);
@@ -3764,11 +3760,11 @@ usage: (make-network-process &rest ARGS)  */)
              coding_systems = Qnil;
            else
              {
-                args[0] = Qopen_network_stream, args[1] = name,
+                fargs[0] = Qopen_network_stream, fargs[1] = name,
-                  args[2] = buffer, args[3] = host, args[4] = service;
+                  fargs[2] = buffer, fargs[3] = host, fargs[4] = service;
-                GCPRO1 (proc);
+                GCPRO1_VAR (proc, inner_gcpro);
-                coding_systems = Ffind_operation_coding_system (5, args);
+                coding_systems = Ffind_operation_coding_system (5, fargs);
-                UNGCPRO;
+                UNGCPRO_VAR (inner_gcpro);
              }
          }
        if (CONSP (coding_systems))
@@ -3948,7 +3944,7 @@ FLAGS is the current flags of the interface.  */)
  CHECK_STRING (ifname);
  memset (rq.ifr_name, 0, sizeof rq.ifr_name);
-  strncpy (rq.ifr_name, SDATA (ifname), sizeof (rq.ifr_name));
+  strncpy (rq.ifr_name, SSDATA (ifname), sizeof (rq.ifr_name));
  s = socket (AF_INET, SOCK_STREAM, 0);
  if (s < 0)
@@ -4192,7 +4188,7 @@ server_accept_connection (Lisp_Object server, int channel)
    struct sockaddr_un un;
 #endif
  } saddr;
-  int len = sizeof saddr;
+  socklen_t len = sizeof saddr;
  s = accept (channel, &saddr.sa, &len);
@@ -4553,7 +4549,7 @@ wait_reading_process_output (int time_limit, int microsecs, int read_kbd,
              struct buffer *old_buffer = current_buffer;
              Lisp_Object old_window = selected_window;
-              timer_delay = timer_check (1);
+              timer_delay = timer_check ();
              /* If a timer has run, this might have changed buffers
                 an alike.  Make read_key_sequence aware of that.  */
@@ -4928,8 +4924,6 @@ wait_reading_process_output (int time_limit, int microsecs, int read_kbd,
            d->func (channel, d->data, 0);
          }
-      /* Really FIRST_PROC_DESC should be 0 on Unix,
-         but this is safer in the short run.  */
      for (channel = 0; channel <= max_process_desc; channel++)
        {
          if (FD_ISSET (channel, &Available)
@@ -5059,7 +5053,7 @@ wait_reading_process_output (int time_limit, int microsecs, int read_kbd,
              /* getsockopt(,,SO_ERROR,,) is said to hang on some systems.
                 So only use it on systems where it is known to work.  */
              {
-                int xlen = sizeof (xerrno);
+                socklen_t xlen = sizeof (xerrno);
                if (getsockopt (channel, SOL_SOCKET, SO_ERROR, &xerrno, &xlen))
                  xerrno = errno;
              }
@@ -5128,9 +5122,9 @@ read_process_output_call (Lisp_Object fun_and_args)
 }
 static Lisp_Object
-read_process_output_error_handler (Lisp_Object error)
+read_process_output_error_handler (Lisp_Object error_val)
 {
-  cmd_error_internal (error, "error in process filter: ");
+  cmd_error_internal (error_val, "error in process filter: ");
  Vinhibit_quit = Qt;
  update_echo_area ();
  Fsleep_for (make_number (2), Qnil);
@@ -5171,7 +5165,7 @@ read_process_output (Lisp_Object proc, register int channel)
  /* We have a working select, so proc_buffered_char is always -1.  */
  if (DATAGRAM_CHAN_P (channel))
    {
-      int len = datagram_address[channel].len;
+      socklen_t len = datagram_address[channel].len;
      nbytes = recvfrom (channel, chars + carryover, readmax,
                         0, datagram_address[channel].sa, &len);
    }
@@ -5477,7 +5471,7 @@ read_process_output (Lisp_Object proc, register int channel)
 jmp_buf send_process_frame;
 Lisp_Object process_sent_to;
-static SIGTYPE
+static void
 send_process_trap (int ignore)
 {
  SIGNAL_THREAD_CHECK (SIGPIPE);
@@ -5504,7 +5498,7 @@ send_process (volatile Lisp_Object proc, const char *volatile buf,
  EMACS_INT rv;
  struct coding_system *coding;
  struct gcpro gcpro1;
-  SIGTYPE (*volatile old_sigpipe) (int);
+  void (*volatile old_sigpipe) (int);
  GCPRO1 (object);
@@ -5626,7 +5620,7 @@ send_process (volatile Lisp_Object proc, const char *volatile buf,
          while (this > 0)
            {
              int outfd = p->outfd;
-              old_sigpipe = (SIGTYPE (*) (int)) signal (SIGPIPE, send_process_trap);
+              old_sigpipe = (void (*) (int)) signal (SIGPIPE, send_process_trap);
 #ifdef DATAGRAM_SOCKETS
              if (DATAGRAM_CHAN_P (outfd))
                {
@@ -5925,7 +5919,7 @@ process_send_signal (Lisp_Object process, int signo, Lisp_Object current_group,
      if (sig_char && *sig_char != CDISABLE)
        {
-          send_process (proc, sig_char, 1, Qnil);
+          send_process (proc, (char *) sig_char, 1, Qnil);
          return;
        }
      /* If we can't send the signal with a character,
@@ -6386,7 +6380,7 @@ process has been transmitted to the serial port.  */)
   indirectly; if it does, that is a bug  */
 #ifdef SIGCHLD
-static SIGTYPE
+static void
 sigchld_handler (int signo)
 {
  int old_errno = errno;
@@ -6534,9 +6528,9 @@ exec_sentinel_unwind (Lisp_Object data)
 }
 static Lisp_Object
-exec_sentinel_error_handler (Lisp_Object error)
+exec_sentinel_error_handler (Lisp_Object error_val)
 {
-  cmd_error_internal (error, "error in process sentinel: ");
+  cmd_error_internal (error_val, "error in process sentinel: ");
  Vinhibit_quit = Qt;
  update_echo_area ();
  Fsleep_for (make_number (2), Qnil);
@@ -6953,7 +6947,7 @@ wait_reading_process_output (int time_limit, int microsecs, int read_kbd,
          do
            {
              int old_timers_run = timers_run;
-              timer_delay = timer_check (1);
+              timer_delay = timer_check ();
              if (timers_run != old_timers_run && do_display)
                /* We must retry, since a timer may have requeued itself
                   and that could alter the time delay.  */
diff --git a/src/region-cache.c b/src/region-cache.c
index 1f9b62da9fa..53ce0e9d802 100644
--- a/src/region-cache.c
+++ b/src/region-cache.c
@@ -290,37 +290,37 @@ move_cache_gap (struct region_cache *c, EMACS_INT pos, EMACS_INT min_size)
 }
-/* Insert a new boundary in cache C; it will have cache index INDEX,
+/* Insert a new boundary in cache C; it will have cache index I,
   and have the specified POS and VALUE.  */
 static void
-insert_cache_boundary (struct region_cache *c, EMACS_INT index, EMACS_INT pos,
+insert_cache_boundary (struct region_cache *c, EMACS_INT i, EMACS_INT pos,
                       int value)
 {
-  /* index must be a valid cache index.  */
+  /* i must be a valid cache index.  */
-  if (index < 0 || index > c->cache_len)
+  if (i < 0 || i > c->cache_len)
    abort ();
  /* We must never want to insert something before the dummy first
     boundary.  */
-  if (index == 0)
+  if (i == 0)
    abort ();
  /* We must only be inserting things in order.  */
-  if (! (BOUNDARY_POS (c, index-1) < pos
+  if (! (BOUNDARY_POS (c, i - 1) < pos
-         && (index == c->cache_len
+         && (i == c->cache_len
-             || pos < BOUNDARY_POS (c, index))))
+             || pos < BOUNDARY_POS (c, i))))
    abort ();
  /* The value must be different from the ones around it.  However, we
     temporarily create boundaries that establish the same value as
     the subsequent boundary, so we're not going to flag that case.  */
-  if (BOUNDARY_VALUE (c, index-1) == value)
+  if (BOUNDARY_VALUE (c, i - 1) == value)
    abort ();
-  move_cache_gap (c, index, 1);
+  move_cache_gap (c, i, 1);
-  c->boundaries[index].pos = pos - c->buffer_beg;
+  c->boundaries[i].pos = pos - c->buffer_beg;
-  c->boundaries[index].value = value;
+  c->boundaries[i].value = value;
  c->gap_start++;
  c->gap_len--;
  c->cache_len++;
@@ -808,4 +808,3 @@ pp_cache (struct region_cache *c)
      fprintf (stderr, "%ld : %d\n", (long)pos, BOUNDARY_VALUE (c, i));
    }
 }
diff --git a/src/region-cache.h b/src/region-cache.h
index 0da159285e4..8e4336c2885 100644
--- a/src/region-cache.h
+++ b/src/region-cache.h
@@ -111,3 +111,5 @@ extern int region_cache_backward (struct buffer *BUF,
                                  EMACS_INT POS,
                                  EMACS_INT *NEXT);
+/* For debugging.  */
+void pp_cache (struct region_cache *);
diff --git a/src/s/template.h b/src/s/template.h
index ee5afa81de4..4e0400e99e3 100644
--- a/src/s/template.h
+++ b/src/s/template.h
@@ -77,15 +77,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
   a file that someone else has modified in his Emacs.  */
 #define CLASH_DETECTION
-/* Define this if your operating system declares signal handlers to
-   have a type other than the usual.  `The usual' is `void' for ANSI C
-   systems (i.e. when the __STDC__ macro is defined), and `int' for
-   pre-ANSI systems.  If you're using GCC on an older system, __STDC__
-   will be defined, but the system's include files will still say that
-   signal returns int or whatever; in situations like that, define
-   this to be what the system's include files want.  */
-/* #define SIGTYPE int */
 /* If the character used to separate elements of the executable path
   is not ':', #define this to be the appropriate character constant.  */
 /* #define SEPCHAR ':' */
diff --git a/src/s/usg5-4-common.h b/src/s/usg5-4-common.h
index aeedd7f4b15..236f71e3007 100644
--- a/src/s/usg5-4-common.h
+++ b/src/s/usg5-4-common.h
@@ -38,9 +38,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* The docs for system V/386 suggest v.3 has sigpause, so let's try it.  */
 #define HAVE_SYSV_SIGPAUSE
-/* On USG systems signal handlers return void.  */
-#define SIGTYPE void
 /* Get FIONREAD from <sys/filio.h>.  Get <sys/ttold.h> to get struct tchars.
   But get <termio.h> first to make sure ttold.h doesn't interfere.
   And don't try to use SIGIO yet.  */
diff --git a/src/scroll.c b/src/scroll.c
index 33af18d2090..fcec596daa3 100644
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -239,14 +239,16 @@ calculate_scrolling (FRAME_PTR frame,
   of lines.  */
 static void
-do_scrolling (struct frame *frame, struct glyph_matrix *current_matrix, struct matrix_elt *matrix, int window_size, int unchanged_at_top)
+do_scrolling (struct frame *frame, struct glyph_matrix *current_matrix,
+              struct matrix_elt *matrix, int window_size,
+              int unchanged_at_top)
 {
  struct matrix_elt *p;
  int i, j, k;
  /* Set to 1 if we have set a terminal window with
-     set_terminal_window.  */
+     set_terminal_window.  It's unsigned to work around GCC bug 48228.  */
-  int terminal_window_p = 0;
+  unsigned int terminal_window_p = 0;
  /* A queue for line insertions to be done.  */
  struct queue { int count, pos; };
@@ -831,7 +833,9 @@ scrolling_1 (FRAME_PTR frame, int window_size, int unchanged_at_top,
   such a line will have little weight.  */
 int
-scrolling_max_lines_saved (int start, int end, int *oldhash, int *newhash, int *cost)
+scrolling_max_lines_saved (int start, int end,
+                           int *oldhash, int *newhash,
+                           int *cost)
 {
  struct { int hash; int count; } lines[01000];
  register int i, h;
@@ -920,7 +924,8 @@ scroll_cost (FRAME_PTR frame, int from, int to, int amount)
   overhead and multiply factor values */
 static void
-line_ins_del (FRAME_PTR frame, int ov1, int pf1, int ovn, int pfn, register int *ov, register int *mf)
+line_ins_del (FRAME_PTR frame, int ov1, int pf1, int ovn, int pfn,
+              register int *ov, register int *mf)
 {
  register EMACS_INT i;
  register EMACS_INT frame_lines = FRAME_LINES (frame);
diff --git a/src/search.c b/src/search.c
index bf93a7fe442..682fa185bbb 100644
--- a/src/search.c
+++ b/src/search.c
@@ -95,10 +95,9 @@ static void save_search_regs (void);
 static EMACS_INT simple_search (EMACS_INT, unsigned char *, EMACS_INT,
                                EMACS_INT, Lisp_Object, EMACS_INT, EMACS_INT,
                                EMACS_INT, EMACS_INT);
-static EMACS_INT boyer_moore (EMACS_INT, unsigned char *, EMACS_INT, EMACS_INT,
+static EMACS_INT boyer_moore (EMACS_INT, unsigned char *, EMACS_INT,
-                              Lisp_Object, Lisp_Object,
+                              Lisp_Object, Lisp_Object, EMACS_INT,
-                              EMACS_INT, EMACS_INT,
+                              EMACS_INT, int);
-                              EMACS_INT, EMACS_INT, int);
 static EMACS_INT search_buffer (Lisp_Object, EMACS_INT, EMACS_INT,
                                EMACS_INT, EMACS_INT, EMACS_INT, int,
                                Lisp_Object, Lisp_Object, int);
@@ -1416,15 +1415,14 @@ search_buffer (Lisp_Object string, EMACS_INT pos, EMACS_INT pos_byte,
        }
      len_byte = pat - patbuf;
-      len = raw_pattern_size;
      pat = base_pat = patbuf;
      if (boyer_moore_ok)
-        return boyer_moore (n, pat, len, len_byte, trt, inverse_trt,
+        return boyer_moore (n, pat, len_byte, trt, inverse_trt,
-                            pos, pos_byte, lim, lim_byte,
+                            pos_byte, lim_byte,
                            char_base);
      else
-        return simple_search (n, pat, len, len_byte, trt,
+        return simple_search (n, pat, raw_pattern_size, len_byte, trt,
                              pos, pos_byte, lim, lim_byte);
    }
 }
@@ -1636,8 +1634,8 @@ simple_search (EMACS_INT n, unsigned char *pat,
 }
 /* Do Boyer-Moore search N times for the string BASE_PAT,
-   whose length is LEN/LEN_BYTE,
+   whose length is LEN_BYTE,
-   from buffer position POS/POS_BYTE until LIM/LIM_BYTE.
+   from buffer position POS_BYTE until LIM_BYTE.
   DIRECTION says which direction we search in.
   TRT and INVERSE_TRT are translation tables.
   Characters in PAT are already translated by TRT.
@@ -1652,10 +1650,10 @@ simple_search (EMACS_INT n, unsigned char *pat,
 static EMACS_INT
 boyer_moore (EMACS_INT n, unsigned char *base_pat,
-             EMACS_INT len, EMACS_INT len_byte,
+             EMACS_INT len_byte,
             Lisp_Object trt, Lisp_Object inverse_trt,
-             EMACS_INT pos, EMACS_INT pos_byte,
+             EMACS_INT pos_byte, EMACS_INT lim_byte,
-             EMACS_INT lim, EMACS_INT lim_byte, int char_base)
+             int char_base)
 {
  int direction = ((n > 0) ? 1 : -1);
  register EMACS_INT dirlen;
@@ -1776,8 +1774,8 @@ boyer_moore (EMACS_INT n, unsigned char *base_pat,
            stride_for_teases = BM_tab[j];
          BM_tab[j] = dirlen - i;
-          /* A translation table is accompanied by its inverse -- see */
+          /* A translation table is accompanied by its inverse -- see
-          /* comment following downcase_table for details */
+             comment following downcase_table for details.  */
          if (ch >= 0)
            {
              int starting_ch = ch;
@@ -2636,11 +2634,8 @@ since only regular expressions have distinguished subexpressions.  */)
      EMACS_INT substed_alloc_size, substed_len;
      int buf_multibyte = !NILP (BVAR (current_buffer, enable_multibyte_characters));
      int str_multibyte = STRING_MULTIBYTE (newtext);
-      Lisp_Object rev_tbl;
      int really_changed = 0;
-      rev_tbl = Qnil;
      substed_alloc_size = length * 2 + 100;
      substed = (unsigned char *) xmalloc (substed_alloc_size + 1);
      substed_len = 0;
@@ -2660,7 +2655,7 @@ since only regular expressions have distinguished subexpressions.  */)
            {
              FETCH_STRING_CHAR_ADVANCE_NO_CHECK (c, newtext, pos, pos_byte);
              if (!buf_multibyte)
-                c = multibyte_char_to_unibyte (c, rev_tbl);
+                c = multibyte_char_to_unibyte (c);
            }
          else
            {
@@ -2683,7 +2678,7 @@ since only regular expressions have distinguished subexpressions.  */)
                  FETCH_STRING_CHAR_ADVANCE_NO_CHECK (c, newtext,
                                                      pos, pos_byte);
                  if (!buf_multibyte && !ASCII_CHAR_P (c))
-                    c = multibyte_char_to_unibyte (c, rev_tbl);
+                    c = multibyte_char_to_unibyte (c);
                }
              else
                {
diff --git a/src/sound.c b/src/sound.c
index 3a1668e4903..a2fe7ccc8ce 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -595,12 +595,12 @@ wav_play (struct sound *s, struct sound_device *sd)
     files I found so far.  If someone feels inclined to implement the
     whole RIFF-WAVE spec, please do.  */
  if (STRINGP (s->data))
-    sd->write (sd, SDATA (s->data) + sizeof *header,
+    sd->write (sd, SSDATA (s->data) + sizeof *header,
               SBYTES (s->data) - sizeof *header);
  else
    {
      char *buffer;
-      int nbytes;
+      int nbytes = 0;
      int blksize = sd->period_size ? sd->period_size (sd) : 2048;
      int data_left = header->data_length;
@@ -686,7 +686,7 @@ au_play (struct sound *s, struct sound_device *sd)
  sd->configure (sd);
  if (STRINGP (s->data))
-    sd->write (sd, SDATA (s->data) + header->data_offset,
+    sd->write (sd, SSDATA (s->data) + header->data_offset,
               SBYTES (s->data) - header->data_offset);
  else
    {
@@ -1104,7 +1104,6 @@ alsa_close (struct sound_device *sd)
 static void
 alsa_choose_format (struct sound_device *sd, struct sound *s)
 {
-  struct alsa_params *p = (struct alsa_params *) sd->data;
  if (s->type == RIFF)
    {
      struct wav_header *h = (struct wav_header *) s->header;
@@ -1410,7 +1409,7 @@ Internal use only, use `play-sound' instead.  */)
    {
      int len = SCHARS (attrs[SOUND_DEVICE]);
      current_sound_device->file = (char *) alloca (len + 1);
-      strcpy (current_sound_device->file, SDATA (attrs[SOUND_DEVICE]));
+      strcpy (current_sound_device->file, SSDATA (attrs[SOUND_DEVICE]));
    }
  if (INTEGERP (attrs[SOUND_VOLUME]))
@@ -1498,4 +1497,3 @@ init_sound (void)
 }
 #endif /* HAVE_SOUND */
diff --git a/src/syntax.c b/src/syntax.c
index c1442c396c1..0a1525b54ea 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -3265,9 +3265,9 @@ do { prev_from = from;				\
    = (curlevel == levelstart) ? -1 : (curlevel - 1)->last;
  state.location = from;
  state.levelstarts = Qnil;
-  while (--curlevel >= levelstart)
+  while (curlevel > levelstart)
-      state.levelstarts = Fcons (make_number (curlevel->last),
+    state.levelstarts = Fcons (make_number ((--curlevel)->last),
-                                 state.levelstarts);
+                               state.levelstarts);
  immediate_quit = 0;
  *stateptr = state;
diff --git a/src/sysdep.c b/src/sysdep.c
index 6ef3d88c5c8..1bb400421f0 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -449,7 +449,7 @@ child_setup_tty (int out)
 struct save_signal
 {
  int code;
-  SIGTYPE (*handler) (int);
+  void (*handler) (int);
 };
 static void save_signal_handlers (struct save_signal *);
@@ -488,7 +488,8 @@ sys_subshell (void)
  int pid;
  struct save_signal saved_handlers[5];
  Lisp_Object dir;
-  unsigned char * IF_LINT (volatile) str = 0;
+  unsigned char *volatile str_volatile = 0;
+  unsigned char *str;
  int len;
  saved_handlers[0].code = SIGINT;
@@ -512,7 +513,7 @@ sys_subshell (void)
    goto xyzzy;
  dir = expand_and_dir_to_file (Funhandled_file_name_directory (dir), Qnil);
-  str = (unsigned char *) alloca (SCHARS (dir) + 2);
+  str_volatile = str = (unsigned char *) alloca (SCHARS (dir) + 2);
  len = SCHARS (dir);
  memcpy (str, SDATA (dir), len);
  if (str[len - 1] != '/') str[len++] = '/';
@@ -544,6 +545,7 @@ sys_subshell (void)
        sh = "sh";
      /* Use our buffer's default directory for the subshell.  */
+      str = str_volatile;
      if (str && chdir ((char *) str) != 0)
        {
 #ifndef DOS_NT
@@ -606,7 +608,7 @@ save_signal_handlers (struct save_signal *saved_handlers)
  while (saved_handlers->code)
    {
      saved_handlers->handler
-        = (SIGTYPE (*) (int)) signal (saved_handlers->code, SIG_IGN);
+        = (void (*) (int)) signal (saved_handlers->code, SIG_IGN);
      saved_handlers++;
    }
 }
diff --git a/src/syssignal.h b/src/syssignal.h
index 7b4070322d6..03768168e20 100644
--- a/src/syssignal.h
+++ b/src/syssignal.h
@@ -69,7 +69,7 @@ extern sigset_t sys_sigmask ();
 /* Whether this is what all systems want or not, this is what
   appears to be assumed in the source, for example data.c:arith_error.  */
-typedef RETSIGTYPE (*signal_handler_t) (int);
+typedef void (*signal_handler_t) (int);
 signal_handler_t sys_signal (int signal_number, signal_handler_t action);
 sigset_t sys_sigblock   (sigset_t new_mask);
diff --git a/src/term.c b/src/term.c
index e84bbe125f8..fc7726298c5 100644
--- a/src/term.c
+++ b/src/term.c
@@ -1952,7 +1952,7 @@ produce_glyphless_glyph (struct it *it, int for_no_font, Lisp_Object acronym)
  it->pixel_width = len;
  it->nglyphs = len;
-  if (len > 0 && it->glyph_row)
+  if (it->glyph_row)
    append_glyphless_glyph (it, face_id, str);
 }
@@ -2500,13 +2500,10 @@ A suspended tty may be resumed by calling `resume-tty' on it.  */)
      /* First run `suspend-tty-functions' and then clean up the tty
         state because `suspend-tty-functions' might need to change
         the tty state.  */
-      if (!NILP (Vrun_hooks))
+      Lisp_Object args[2];
-        {
+      args[0] = intern ("suspend-tty-functions");
-          Lisp_Object args[2];
+      XSETTERMINAL (args[1], t);
-          args[0] = intern ("suspend-tty-functions");
+      Frun_hook_with_args (2, args);
-          XSETTERMINAL (args[1], t);
-          Frun_hook_with_args (2, args);
-        }
      reset_sys_modes (t->display_info.tty);
      delete_keyboard_wait_descriptor (fileno (f));
@@ -2596,14 +2593,13 @@ frame's terminal). */)
      init_sys_modes (t->display_info.tty);
-      /* Run `resume-tty-functions'.  */
+      {
-      if (!NILP (Vrun_hooks))
+        /* Run `resume-tty-functions'.  */
-        {
+        Lisp_Object args[2];
-          Lisp_Object args[2];
+        args[0] = intern ("resume-tty-functions");
-          args[0] = intern ("resume-tty-functions");
+        XSETTERMINAL (args[1], t);
-          XSETTERMINAL (args[1], t);
+        Frun_hook_with_args (2, args);
-          Frun_hook_with_args (2, args);
+      }
-        }
    }
  set_tty_hooks (t);
diff --git a/src/terminfo.c b/src/terminfo.c
index 905a8edacc7..c0418984efa 100644
--- a/src/terminfo.c
+++ b/src/terminfo.c
@@ -17,6 +17,8 @@ You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <config.h>
+#include "tparam.h"
 #include <setjmp.h>
 #include "lisp.h"
@@ -33,18 +35,19 @@ char *UP, *BC, PC;
   format is different too.
 */
+extern char *tparm (const char *str, ...);
 char *
-tparam (char *string, char *outstring,
+tparam (const char *string, char *outstring, int len,
-        int len, int arg1, int arg2, int arg3, int arg4,
+        int arg1, int arg2, int arg3, int arg4)
-        int arg5, int arg6, int arg7, int arg8, int arg9)
 {
  char *temp;
-  extern char *tparm (char *str, ...);
-  temp = tparm (string, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
+  /* Emacs always should pass a null OUTSTRING and zero LEN.  */
-  if (outstring == 0)
+  if (outstring || len)
-    outstring = ((char *) (xmalloc ((strlen (temp)) + 1)));
+    abort ();
-  strcpy (outstring, temp);
-  return outstring;
-}
+  temp = tparm (string, arg1, arg2, arg3, arg4);
+  return xstrdup (temp);
+}
diff --git a/src/textprop.c b/src/textprop.c
index 5db6033670b..cd89efeb38d 100644
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -974,37 +974,6 @@ past position LIMIT; return LIMIT if nothing is found before LIMIT.  */)
    return make_number (next->position);
 }
-/* Return 1 if there's a change in some property between BEG and END.  */
-int
-property_change_between_p (EMACS_INT beg, EMACS_INT end)
-{
-  register INTERVAL i, next;
-  Lisp_Object object, pos;
-  XSETBUFFER (object, current_buffer);
-  XSETFASTINT (pos, beg);
-  i = validate_interval_range (object, &pos, &pos, soft);
-  if (NULL_INTERVAL_P (i))
-    return 0;
-  next = next_interval (i);
-  while (! NULL_INTERVAL_P (next) && intervals_equal (i, next))
-    {
-      next = next_interval (next);
-      if (NULL_INTERVAL_P (next))
-        return 0;
-      if (next->position >= end)
-        return 0;
-    }
-  if (NULL_INTERVAL_P (next))
-    return 0;
-  return 1;
-}
 DEFUN ("next-single-property-change", Fnext_single_property_change,
       Snext_single_property_change, 2, 4, 0,
       doc: /* Return the position of next property change for a specific property.
@@ -2331,4 +2300,3 @@ inherits it if NONSTICKINESS is nil.  The `front-sticky' and
 /*  defsubr (&Serase_text_properties); */
 /*  defsubr (&Scopy_text_properties); */
 }
diff --git a/src/tparam.h b/src/tparam.h
index 3cd3e6053cc..dc4cdfaa28c 100644
--- a/src/tparam.h
+++ b/src/tparam.h
@@ -29,3 +29,7 @@ char *tgetstr (const char *, char **);
 char *tgoto (const char *, int, int);
 char *tparam (const char *, char *, int, int, int, int, int);
+extern char PC;
+extern char *BC;
+extern char *UP;
diff --git a/src/unexelf.c b/src/unexelf.c
index b58c78501b8..8b45894f853 100644
--- a/src/unexelf.c
+++ b/src/unexelf.c
@@ -651,7 +651,9 @@ unexec (const char *new_name, const char *old_name)
  int n, nn;
  int old_bss_index, old_sbss_index, old_plt_index;
  int old_data_index, new_data2_index;
+#if defined _SYSTYPE_SYSV || defined __sgi
  int old_mdebug_index;
+#endif
  struct stat stat_buf;
  int old_file_size;
@@ -695,8 +697,10 @@ unexec (const char *new_name, const char *old_name)
  /* Find the mdebug section, if any.  */
+#if defined _SYSTYPE_SYSV || defined __sgi
  old_mdebug_index = find_section (".mdebug", old_section_names,
                                   old_name, old_file_h, old_section_h, 1);
+#endif
  /* Find the old .bss section.  Figure out parameters of the new
     data2 and bss sections.  */
diff --git a/src/unexw32.c b/src/unexw32.c
index cd8211d6bee..e03fa6c9b9a 100644
--- a/src/unexw32.c
+++ b/src/unexw32.c
@@ -341,7 +341,6 @@ get_section_info (file_data *p_infile)
 {
  PIMAGE_DOS_HEADER dos_header;
  PIMAGE_NT_HEADERS nt_header;
-  PIMAGE_SECTION_HEADER section;
  int overlap;
  dos_header = (PIMAGE_DOS_HEADER) p_infile->file_base;
diff --git a/src/w32.c b/src/w32.c
index 721cea07d20..da403671115 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -1505,6 +1505,7 @@ w32_get_resource (char *key, LPDWORD lpdwtype)
 }
 char *get_emacs_configuration (void);
 void
 init_environment (char ** argv)
 {
@@ -1591,25 +1592,25 @@ init_environment (char ** argv)
       If not, then we can try to default to the appdata directory under the
       user's profile, which is more likely to be writable.   */
    if (stat ("C:/.emacs", &ignored) < 0)
-    {
+      {
-      HRESULT profile_result;
+        HRESULT profile_result;
-      /* Dynamically load ShGetFolderPath, as it won't exist on versions
+        /* Dynamically load ShGetFolderPath, as it won't exist on versions
-         of Windows 95 and NT4 that have not been updated to include
+           of Windows 95 and NT4 that have not been updated to include
-         MSIE 5.  */
+           MSIE 5.  */
-      ShGetFolderPath_fn get_folder_path;
+        ShGetFolderPath_fn get_folder_path;
-      get_folder_path = (ShGetFolderPath_fn)
+        get_folder_path = (ShGetFolderPath_fn)
-        GetProcAddress (GetModuleHandle ("shell32.dll"), "SHGetFolderPathA");
+          GetProcAddress (GetModuleHandle ("shell32.dll"), "SHGetFolderPathA");
-      if (get_folder_path != NULL)
+        if (get_folder_path != NULL)
-        {
+          {
-          profile_result = get_folder_path (NULL, CSIDL_APPDATA, NULL,
+            profile_result = get_folder_path (NULL, CSIDL_APPDATA, NULL,
-                                            0, default_home);
+                                              0, default_home);
-          /* If we can't get the appdata dir, revert to old behavior.  */
+            /* If we can't get the appdata dir, revert to old behavior.  */
-          if (profile_result == S_OK)
+            if (profile_result == S_OK)
-            env_vars[0].def_value = default_home;
+              env_vars[0].def_value = default_home;
-        }
+          }
-    }
+      }
  /* Get default locale info and use it for LANG.  */
  if (GetLocaleInfo (LOCALE_USER_DEFAULT,
@@ -2082,42 +2083,42 @@ GetCachedVolumeInformation (char * root_dir)
  info = lookup_volume_info (root_dir);
  if (info == NULL || ! VOLINFO_STILL_VALID (root_dir, info))
-  {
+    {
-    char  name[ 256 ];
+      char  name[ 256 ];
-    DWORD serialnum;
+      DWORD serialnum;
-    DWORD maxcomp;
+      DWORD maxcomp;
-    DWORD flags;
+      DWORD flags;
-    char  type[ 256 ];
+      char  type[ 256 ];
-    /* Info is not cached, or is stale. */
+      /* Info is not cached, or is stale. */
-    if (!GetVolumeInformation (root_dir,
+      if (!GetVolumeInformation (root_dir,
-                               name, sizeof (name),
+                                 name, sizeof (name),
-                               &serialnum,
+                                 &serialnum,
-                               &maxcomp,
+                                 &maxcomp,
-                               &flags,
+                                 &flags,
-                               type, sizeof (type)))
+                                 type, sizeof (type)))
-      return NULL;
+        return NULL;
-    /* Cache the volume information for future use, overwriting existing
+      /* Cache the volume information for future use, overwriting existing
-       entry if present.  */
+         entry if present.  */
-    if (info == NULL)
+      if (info == NULL)
-      {
+        {
-        info = (volume_info_data *) xmalloc (sizeof (volume_info_data));
+          info = (volume_info_data *) xmalloc (sizeof (volume_info_data));
-        add_volume_info (root_dir, info);
+          add_volume_info (root_dir, info);
-      }
+        }
-    else
+      else
-      {
+        {
-        xfree (info->name);
+          xfree (info->name);
-        xfree (info->type);
+          xfree (info->type);
-      }
+        }
-    info->name = xstrdup (name);
+      info->name = xstrdup (name);
-    info->serialnum = serialnum;
+      info->serialnum = serialnum;
-    info->maxcomp = maxcomp;
+      info->maxcomp = maxcomp;
-    info->flags = flags;
+      info->flags = flags;
-    info->type = xstrdup (type);
+      info->type = xstrdup (type);
-    info->timestamp = GetTickCount ();
+      info->timestamp = GetTickCount ();
-  }
+    }
  return info;
 }
@@ -2376,8 +2377,8 @@ readdir (DIR *dirp)
  if (wnet_enum_handle != INVALID_HANDLE_VALUE)
    {
      if (!read_unc_volume (wnet_enum_handle,
-                              dir_find_data.cFileName,
+                            dir_find_data.cFileName,
-                              MAX_PATH))
+                            MAX_PATH))
        return NULL;
    }
  /* If we aren't dir_finding, do a find-first, otherwise do a find-next. */
@@ -2487,7 +2488,7 @@ read_unc_volume (HANDLE henum, char *readbuf, int size)
  count = 1;
  buffer = alloca (bufsize);
-  result = WNetEnumResource (wnet_enum_handle, &count, buffer, &bufsize);
+  result = WNetEnumResource (henum, &count, buffer, &bufsize);
  if (result != NO_ERROR)
    return NULL;
@@ -3250,8 +3251,6 @@ int
 stat (const char * path, struct stat * buf)
 {
  char *name, *r;
-  char drive_root[4];
-  UINT devtype;
  WIN32_FIND_DATA wfd;
  HANDLE fh;
  unsigned __int64 fake_inode;
@@ -4043,7 +4042,6 @@ system_process_attributes (Lisp_Object pid)
  TOKEN_PRIMARY_GROUP group_token;
  unsigned euid;
  unsigned egid;
-  DWORD sess;
  PROCESS_MEMORY_COUNTERS mem;
  PROCESS_MEMORY_COUNTERS_EX mem_ex;
  DWORD minrss, maxrss;
@@ -4520,75 +4518,75 @@ struct {
  int errnum;
  char * msg;
 } _wsa_errlist[] = {
-  WSAEINTR                , "Interrupted function call",
+  {WSAEINTR                , "Interrupted function call"},
-  WSAEBADF                , "Bad file descriptor",
+  {WSAEBADF                , "Bad file descriptor"},
-  WSAEACCES               , "Permission denied",
+  {WSAEACCES               , "Permission denied"},
-  WSAEFAULT               , "Bad address",
+  {WSAEFAULT               , "Bad address"},
-  WSAEINVAL               , "Invalid argument",
+  {WSAEINVAL               , "Invalid argument"},
-  WSAEMFILE               , "Too many open files",
+  {WSAEMFILE               , "Too many open files"},
-  WSAEWOULDBLOCK          , "Resource temporarily unavailable",
+  {WSAEWOULDBLOCK          , "Resource temporarily unavailable"},
-  WSAEINPROGRESS          , "Operation now in progress",
+  {WSAEINPROGRESS          , "Operation now in progress"},
-  WSAEALREADY             , "Operation already in progress",
+  {WSAEALREADY             , "Operation already in progress"},
-  WSAENOTSOCK             , "Socket operation on non-socket",
+  {WSAENOTSOCK             , "Socket operation on non-socket"},
-  WSAEDESTADDRREQ         , "Destination address required",
+  {WSAEDESTADDRREQ         , "Destination address required"},
-  WSAEMSGSIZE             , "Message too long",
+  {WSAEMSGSIZE             , "Message too long"},
-  WSAEPROTOTYPE           , "Protocol wrong type for socket",
+  {WSAEPROTOTYPE           , "Protocol wrong type for socket"},
-  WSAENOPROTOOPT          , "Bad protocol option",
+  {WSAENOPROTOOPT          , "Bad protocol option"},
-  WSAEPROTONOSUPPORT      , "Protocol not supported",
+  {WSAEPROTONOSUPPORT      , "Protocol not supported"},
-  WSAESOCKTNOSUPPORT      , "Socket type not supported",
+  {WSAESOCKTNOSUPPORT      , "Socket type not supported"},
-  WSAEOPNOTSUPP           , "Operation not supported",
+  {WSAEOPNOTSUPP           , "Operation not supported"},
-  WSAEPFNOSUPPORT         , "Protocol family not supported",
+  {WSAEPFNOSUPPORT         , "Protocol family not supported"},
-  WSAEAFNOSUPPORT         , "Address family not supported by protocol family",
+  {WSAEAFNOSUPPORT         , "Address family not supported by protocol family"},
-  WSAEADDRINUSE           , "Address already in use",
+  {WSAEADDRINUSE           , "Address already in use"},
-  WSAEADDRNOTAVAIL        , "Cannot assign requested address",
+  {WSAEADDRNOTAVAIL        , "Cannot assign requested address"},
-  WSAENETDOWN             , "Network is down",
+  {WSAENETDOWN             , "Network is down"},
-  WSAENETUNREACH          , "Network is unreachable",
+  {WSAENETUNREACH          , "Network is unreachable"},
-  WSAENETRESET            , "Network dropped connection on reset",
+  {WSAENETRESET            , "Network dropped connection on reset"},
-  WSAECONNABORTED         , "Software caused connection abort",
+  {WSAECONNABORTED         , "Software caused connection abort"},
-  WSAECONNRESET           , "Connection reset by peer",
+  {WSAECONNRESET           , "Connection reset by peer"},
-  WSAENOBUFS              , "No buffer space available",
+  {WSAENOBUFS              , "No buffer space available"},
-  WSAEISCONN              , "Socket is already connected",
+  {WSAEISCONN              , "Socket is already connected"},
-  WSAENOTCONN             , "Socket is not connected",
+  {WSAENOTCONN             , "Socket is not connected"},
-  WSAESHUTDOWN            , "Cannot send after socket shutdown",
+  {WSAESHUTDOWN            , "Cannot send after socket shutdown"},
-  WSAETOOMANYREFS         , "Too many references",          /* not sure */
+  {WSAETOOMANYREFS         , "Too many references"},        /* not sure */
-  WSAETIMEDOUT            , "Connection timed out",
+  {WSAETIMEDOUT            , "Connection timed out"},
-  WSAECONNREFUSED         , "Connection refused",
+  {WSAECONNREFUSED         , "Connection refused"},
-  WSAELOOP                , "Network loop",                 /* not sure */
+  {WSAELOOP                , "Network loop"},               /* not sure */
-  WSAENAMETOOLONG         , "Name is too long",
+  {WSAENAMETOOLONG         , "Name is too long"},
-  WSAEHOSTDOWN            , "Host is down",
+  {WSAEHOSTDOWN            , "Host is down"},
-  WSAEHOSTUNREACH         , "No route to host",
+  {WSAEHOSTUNREACH         , "No route to host"},
-  WSAENOTEMPTY            , "Buffer not empty",             /* not sure */
+  {WSAENOTEMPTY            , "Buffer not empty"},           /* not sure */
-  WSAEPROCLIM             , "Too many processes",
+  {WSAEPROCLIM             , "Too many processes"},
-  WSAEUSERS               , "Too many users",               /* not sure */
+  {WSAEUSERS               , "Too many users"},             /* not sure */
-  WSAEDQUOT               , "Double quote in host name",    /* really not sure */
+  {WSAEDQUOT               , "Double quote in host name"},  /* really not sure */
-  WSAESTALE               , "Data is stale",                /* not sure */
+  {WSAESTALE               , "Data is stale"},              /* not sure */
-  WSAEREMOTE              , "Remote error",                 /* not sure */
+  {WSAEREMOTE              , "Remote error"},               /* not sure */
-  WSASYSNOTREADY          , "Network subsystem is unavailable",
+  {WSASYSNOTREADY          , "Network subsystem is unavailable"},
-  WSAVERNOTSUPPORTED      , "WINSOCK.DLL version out of range",
+  {WSAVERNOTSUPPORTED      , "WINSOCK.DLL version out of range"},
-  WSANOTINITIALISED       , "Winsock not initialized successfully",
+  {WSANOTINITIALISED       , "Winsock not initialized successfully"},
-  WSAEDISCON              , "Graceful shutdown in progress",
+  {WSAEDISCON              , "Graceful shutdown in progress"},
 #ifdef WSAENOMORE
-  WSAENOMORE              , "No more operations allowed",   /* not sure */
+  {WSAENOMORE              , "No more operations allowed"}, /* not sure */
-  WSAECANCELLED           , "Operation cancelled",          /* not sure */
+  {WSAECANCELLED           , "Operation cancelled"},        /* not sure */
-  WSAEINVALIDPROCTABLE    , "Invalid procedure table from service provider",
+  {WSAEINVALIDPROCTABLE    , "Invalid procedure table from service provider"},
-  WSAEINVALIDPROVIDER     , "Invalid service provider version number",
+  {WSAEINVALIDPROVIDER     , "Invalid service provider version number"},
-  WSAEPROVIDERFAILEDINIT  , "Unable to initialize a service provider",
+  {WSAEPROVIDERFAILEDINIT  , "Unable to initialize a service provider"},
-  WSASYSCALLFAILURE       , "System call failure",
+  {WSASYSCALLFAILURE       , "System call failure"},
-  WSASERVICE_NOT_FOUND    , "Service not found",            /* not sure */
+  {WSASERVICE_NOT_FOUND    , "Service not found"},          /* not sure */
-  WSATYPE_NOT_FOUND       , "Class type not found",
+  {WSATYPE_NOT_FOUND       , "Class type not found"},
-  WSA_E_NO_MORE           , "No more resources available",  /* really not sure */
+  {WSA_E_NO_MORE           , "No more resources available"}, /* really not sure */
-  WSA_E_CANCELLED         , "Operation already cancelled",  /* really not sure */
+  {WSA_E_CANCELLED         , "Operation already cancelled"}, /* really not sure */
-  WSAEREFUSED             , "Operation refused",            /* not sure */
+  {WSAEREFUSED             , "Operation refused"},          /* not sure */
 #endif
-  WSAHOST_NOT_FOUND       , "Host not found",
+  {WSAHOST_NOT_FOUND       , "Host not found"},
-  WSATRY_AGAIN            , "Authoritative host not found during name lookup",
+  {WSATRY_AGAIN            , "Authoritative host not found during name lookup"},
-  WSANO_RECOVERY          , "Non-recoverable error during name lookup",
+  {WSANO_RECOVERY          , "Non-recoverable error during name lookup"},
-  WSANO_DATA              , "Valid name, no data record of requested type",
+  {WSANO_DATA              , "Valid name, no data record of requested type"},
-  -1, NULL
+  {-1, NULL}
 };
 char *
@@ -5408,7 +5406,6 @@ sys_read (int fd, char * buffer, unsigned int count)
            {
              HANDLE hnd = fd_info[fd].hnd;
              OVERLAPPED *ovl = &fd_info[fd].cp->ovl_read;
-              DWORD err = 0;
              int rc = 0;
              COMMTIMEOUTS ct;
diff --git a/src/w32fns.c b/src/w32fns.c
index 0c899cdceff..821cc671646 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -183,7 +183,7 @@ unsigned int msh_mousewheel = 0;
 #define MENU_FREE_DELAY 1000
 static unsigned menu_free_timer = 0;
-#ifdef GLYPH_DEBUG
+#if GLYPH_DEBUG
 int image_cache_refcount, dpyinfo_refcount;
 #endif
@@ -1527,7 +1527,6 @@ void
 x_set_menu_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval)
 {
  int nlines;
-  int olines = FRAME_MENU_BAR_LINES (f);
  /* Right now, menu bars don't work properly in minibuf-only frames;
     most of the commands try to apply themselves to the minibuffer
@@ -2863,7 +2862,6 @@ w32_wnd_proc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
                         base character (ie. translating the base key plus
                         shift modifier).  */
                      int add;
-                      int isdead = 0;
                      KEY_EVENT_RECORD key;
                      key.bKeyDown = TRUE;
@@ -2951,7 +2949,7 @@ w32_wnd_proc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
          HIMC context = get_ime_context_fn (hwnd);
          wmsg.dwModifiers = w32_get_key_modifiers (wParam, lParam);
          /* Get buffer size.  */
-          size = get_composition_string_fn (context, GCS_RESULTSTR, buffer, 0);
+          size = get_composition_string_fn (context, GCS_RESULTSTR, NULL, 0);
          buffer = alloca (size);
          size = get_composition_string_fn (context, GCS_RESULTSTR,
                                            buffer, size);
@@ -3981,7 +3979,7 @@ unwind_create_frame (Lisp_Object frame)
  /* If frame is ``official'', nothing to do.  */
  if (!CONSP (Vframe_list) || !EQ (XCAR (Vframe_list), frame))
    {
-#ifdef GLYPH_DEBUG
+#if GLYPH_DEBUG
      struct w32_display_info *dpyinfo = FRAME_W32_DISPLAY_INFO (f);
 #endif
@@ -4522,8 +4520,6 @@ DISPLAY should be either a frame or a display name (a string).
 If omitted or nil, that stands for the selected frame's display.  */)
  (Lisp_Object display)
 {
-  struct w32_display_info *dpyinfo = check_x_display_info (display);
  return make_number (1);
 }
@@ -4820,7 +4816,6 @@ If DISPLAY is nil, that stands for the selected frame's display.  */)
  (Lisp_Object display)
 {
  struct w32_display_info *dpyinfo = check_x_display_info (display);
-  int i;
  if (dpyinfo->reference_count > 0)
    error ("Display still has frames on it");
@@ -5173,7 +5168,7 @@ x_create_tip_frame (struct w32_display_info *dpyinfo,
                    Lisp_Object parms, Lisp_Object text)
 {
  struct frame *f;
-  Lisp_Object frame, tem;
+  Lisp_Object frame;
  Lisp_Object name;
  long window_prompting = 0;
  int width, height;
diff --git a/src/w32font.c b/src/w32font.c
index 40ff0782b88..d86107bc6d5 100644
--- a/src/w32font.c
+++ b/src/w32font.c
@@ -533,6 +533,7 @@ w32font_draw (struct glyph_string *s, int from, int to,
 {
  UINT options;
  HRGN orig_clip = NULL;
+  int len = to - from;
  struct w32font_info *w32font = (struct w32font_info *) s->font;
  options = w32font->glyph_idx;
@@ -581,14 +582,14 @@ w32font_draw (struct glyph_string *s, int from, int to,
  if (s->padding_p)
    {
-      int len = to - from, i;
+      int i;
      for (i = 0; i < len; i++)
        ExtTextOutW (s->hdc, x + i, y, options, NULL,
                     s->char2b + from + i, 1, NULL);
    }
  else
-    ExtTextOutW (s->hdc, x, y, options, NULL, s->char2b + from, to - from, NULL);
+    ExtTextOutW (s->hdc, x, y, options, NULL, s->char2b + from, len, NULL);
  /* Restore clip region.  */
  if (s->num_clips > 0)
@@ -596,6 +597,8 @@ w32font_draw (struct glyph_string *s, int from, int to,
  if (orig_clip)
    DeleteObject (orig_clip);
+  return len;
 }
 /* w32 implementation of free_entity for font backend.
@@ -774,7 +777,7 @@ int
 w32font_open_internal (FRAME_PTR f, Lisp_Object font_entity,
                       int pixel_size, Lisp_Object font_object)
 {
-  int len, size, i;
+  int len, size;
  LOGFONT logfont;
  HDC dc;
  HFONT hfont, old_font;
@@ -2418,6 +2421,7 @@ struct font_driver w32font_driver =
    NULL, /* check */
    NULL, /* get_variation_glyphs */
    w32font_filter_properties,
+    NULL, /* cached_font_ok */
  };
diff --git a/src/w32inevt.c b/src/w32inevt.c
index c4858dea908..465f5ccb70f 100644
--- a/src/w32inevt.c
+++ b/src/w32inevt.c
@@ -677,7 +677,6 @@ w32_console_read_socket (struct terminal *terminal,
                         int expected,
                         struct input_event *hold_quit)
 {
-  BOOL no_events = TRUE;
  int nev, ret = 0, add;
  int isdead;
diff --git a/src/w32menu.c b/src/w32menu.c
index a2e62f24f6a..f092ff87bf2 100644
--- a/src/w32menu.c
+++ b/src/w32menu.c
@@ -1320,7 +1320,6 @@ utf8to16 (unsigned char * src, int len, WCHAR * dest)
 {
  while (len > 0)
    {
-      int utf16;
      if (*src < 0x80)
        {
          *dest = (WCHAR) *src;
@@ -1546,8 +1545,6 @@ add_menu_item (HMENU menu, widget_value *wv, HMENU item)
 static int
 fill_in_menu (HMENU menu, widget_value *wv)
 {
-  int items_added = 0;
  for ( ; wv != NULL; wv = wv->next)
    {
      if (wv->contents)
@@ -1619,7 +1616,7 @@ w32_menu_display_help (HWND owner, HMENU menu, UINT item, UINT flags)
      else
        /* X version has a loop through frames here, which doesn't
           appear to do anything, unless it has some side effect.  */
-        show_help_echo (help, Qnil, Qnil, Qnil, 1);
+        show_help_echo (help, Qnil, Qnil, Qnil);
    }
 }
diff --git a/src/w32term.c b/src/w32term.c
index f31c4e90e77..f6a6ba3e82f 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -160,7 +160,6 @@ int last_scroll_bar_drag_pos;
 /* Where the mouse was last time we reported a mouse event.  */
 static RECT last_mouse_glyph;
 static FRAME_PTR last_mouse_glyph_frame;
-static Lisp_Object last_mouse_press_frame;
 /* The scroll bar in which the last motion event occurred.
@@ -1069,16 +1068,12 @@ x_set_glyph_string_clipping (struct glyph_string *s)
    w32_set_clip_rectangle (s->hdc, r);
  else if (n > 1)
    {
-      HRGN full_clip, clip1, clip2;
+      HRGN clip1 = CreateRectRgnIndirect (r);
-      clip1 = CreateRectRgnIndirect (r);
+      HRGN clip2 = CreateRectRgnIndirect (r + 1);
-      clip2 = CreateRectRgnIndirect (r + 1);
+      if (CombineRgn (clip1, clip1, clip2, RGN_OR) != ERROR)
-      if (CombineRgn (full_clip, clip1, clip2, RGN_OR) != ERROR)
+        SelectClipRgn (s->hdc, clip1);
-        {
-          SelectClipRgn (s->hdc, full_clip);
-        }
      DeleteObject (clip1);
      DeleteObject (clip2);
-      DeleteObject (full_clip);
    }
    s->num_clips = n;
 }
@@ -1294,7 +1289,6 @@ x_draw_composite_glyph_string_foreground (struct glyph_string *s)
  else if (! s->first_glyph->u.cmp.automatic)
    {
      int y = s->ybase;
-      int width = 0;
      HFONT old_font;
      old_font = SelectObject (s->hdc, FONT_HANDLE (font));
@@ -4842,7 +4836,6 @@ w32_read_socket (struct terminal *terminal, int expected,
 static void
 w32_clip_to_row (struct window *w, struct glyph_row *row, int area, HDC hdc)
 {
-  struct frame *f = XFRAME (WINDOW_FRAME (w));
  RECT clip_rect;
  int window_x, window_y, window_width;
@@ -6089,7 +6082,6 @@ static void
 x_delete_terminal (struct terminal *terminal)
 {
  struct w32_display_info *dpyinfo = terminal->display_info.w32;
-  int i;
  /* Protect against recursive calls.  delete_frame in
     delete_terminal calls us back when it deletes our last frame.  */
diff --git a/src/w32uniscribe.c b/src/w32uniscribe.c
index 39d1ee5c851..f6347bb88f7 100644
--- a/src/w32uniscribe.c
+++ b/src/w32uniscribe.c
@@ -320,7 +320,7 @@ uniscribe_shape (Lisp_Object lgstring)
            }
          if (SUCCEEDED (result))
            {
-              int j, nclusters, from, to;
+              int j, from, to;
              from = 0;
              to = from;
@@ -629,8 +629,6 @@ add_opentype_font_name_to_list (ENUMLOGFONTEX *logical_font,
    STR[4] = '\0';                                           \
  } while (0)
-static char* NOTHING = "    ";
 #define SNAME(VAL) SDATA (SYMBOL_NAME (VAL))
 /* Check if font supports the otf script/language/features specified.
@@ -646,7 +644,6 @@ uniscribe_check_otf (LOGFONT *font, Lisp_Object otf_spec)
  struct frame * f;
  HDC context;
  HFONT check_font, old_font;
-  DWORD table;
  int i, retval = 0;
  struct gcpro gcpro1;
@@ -936,7 +933,11 @@ struct font_driver uniscribe_font_driver =
    NULL, /* otf_drive - use shape instead.  */
    NULL, /* start_for_frame */
    NULL, /* end_for_frame */
-    uniscribe_shape
+    uniscribe_shape,
+    NULL, /* check */
+    NULL, /* get_variation_glyphs */
+    NULL, /* filter_properties */
+    NULL, /* cached_font_ok */
  };
 /* Note that this should be called at every startup, not just when dumping,
diff --git a/src/window.c b/src/window.c
index f35815d757c..4bd533c22ac 100644
--- a/src/window.c
+++ b/src/window.c
@@ -2978,14 +2978,10 @@ shrink_windows (int total, int size, int nchildren, int shrinkable,
  while (total_shrink > total_removed)
    {
      int nonzero_sizes = 0;
-      int nonzero_idx = -1;
      for (i = 0; i < nchildren; ++i)
        if (new_sizes[i] > 0)
-          {
+          ++nonzero_sizes;
-            ++nonzero_sizes;
-            nonzero_idx = i;
-          }
      for (i = 0; i < nchildren; ++i)
        if (new_sizes[i] > min_sizes[i])
@@ -3689,27 +3685,23 @@ temp_output_buffer_show (register Lisp_Object buf)
      /* Run temp-buffer-show-hook, with the chosen window selected
         and its buffer current.  */
+      {
-      if (!NILP (Vrun_hooks)
+        int count = SPECPDL_INDEX ();
-          && !NILP (Fboundp (Qtemp_buffer_show_hook))
+        Lisp_Object prev_window, prev_buffer;
-          && !NILP (Fsymbol_value (Qtemp_buffer_show_hook)))
+        prev_window = selected_window;
-        {
+        XSETBUFFER (prev_buffer, old);
-          int count = SPECPDL_INDEX ();
-          Lisp_Object prev_window, prev_buffer;
+        /* Select the window that was chosen, for running the hook.
-          prev_window = selected_window;
+           Note: Both Fselect_window and select_window_norecord may
-          XSETBUFFER (prev_buffer, old);
+           set-buffer to the buffer displayed in the window,
+           so we need to save the current buffer.  --stef  */
-          /* Select the window that was chosen, for running the hook.
+        record_unwind_protect (Fset_buffer, prev_buffer);
-             Note: Both Fselect_window and select_window_norecord may
+        record_unwind_protect (select_window_norecord, prev_window);
-             set-buffer to the buffer displayed in the window,
+        Fselect_window (window, Qt);
-             so we need to save the current buffer.  --stef  */
+        Fset_buffer (w->buffer);
-          record_unwind_protect (Fset_buffer, prev_buffer);
+        Frun_hooks (1, &Qtemp_buffer_show_hook);
-          record_unwind_protect (select_window_norecord, prev_window);
+        unbind_to (count, Qnil);
-          Fselect_window (window, Qt);
+      }
-          Fset_buffer (w->buffer);
-          call1 (Vrun_hooks, Qtemp_buffer_show_hook);
-          unbind_to (count, Qnil);
-        }
    }
 }
diff --git a/src/xdisp.c b/src/xdisp.c
index a7955f41e0c..bbbf37b68ac 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -754,7 +754,7 @@ static void setup_for_ellipsis (struct it *, int);
 static void mark_window_display_accurate_1 (struct window *, int);
 static int single_display_spec_string_p (Lisp_Object, Lisp_Object);
 static int display_prop_string_p (Lisp_Object, Lisp_Object);
-static int cursor_row_p (struct window *, struct glyph_row *);
+static int cursor_row_p (struct glyph_row *);
 static int redisplay_mode_lines (Lisp_Object, int);
 static char *decode_mode_spec_coding (Lisp_Object, char *, int);
@@ -802,8 +802,8 @@ static int cursor_row_fully_visible_p (struct window *, int, int);
 static int try_scrolling (Lisp_Object, int, EMACS_INT, EMACS_INT, int, int);
 static int try_cursor_movement (Lisp_Object, struct text_pos, int *);
 static int trailing_whitespace_p (EMACS_INT);
-static int message_log_check_duplicate (EMACS_INT, EMACS_INT,
+static unsigned long int message_log_check_duplicate (EMACS_INT, EMACS_INT,
-                                        EMACS_INT, EMACS_INT);
+                                                      EMACS_INT, EMACS_INT);
 static void push_it (struct it *);
 static void pop_it (struct it *);
 static void sync_frame_with_window_matrix_rows (struct window *);
@@ -823,8 +823,7 @@ static int display_mode_lines (struct window *);
 static int display_mode_line (struct window *, enum face_id, Lisp_Object);
 static int display_mode_element (struct it *, int, int, int, Lisp_Object, Lisp_Object, int);
 static int store_mode_line_string (const char *, Lisp_Object, int, int, int, Lisp_Object);
-static const char *decode_mode_spec (struct window *, int, int, int,
+static const char *decode_mode_spec (struct window *, int, int, Lisp_Object *);
-                                     Lisp_Object *);
 static void display_menu_bar (struct window *);
 static int display_count_lines (EMACS_INT, EMACS_INT, EMACS_INT, int,
                                EMACS_INT *);
@@ -2181,7 +2180,7 @@ safe_eval_handler (Lisp_Object arg)
   redisplay during the evaluation.  */
 Lisp_Object
-safe_call (int nargs, Lisp_Object *args)
+safe_call (size_t nargs, Lisp_Object *args)
 {
  Lisp_Object val;
@@ -3164,6 +3163,9 @@ handle_fontified_prop (struct it *it)
    {
      int count = SPECPDL_INDEX ();
      Lisp_Object val;
+      struct buffer *obuf = current_buffer;
+      int begv = BEGV, zv = ZV;
+      int old_clip_changed = current_buffer->clip_changed;
      val = Vfontification_functions;
      specbind (Qfontification_functions, Qnil);
@@ -3209,6 +3211,23 @@ handle_fontified_prop (struct it *it)
      unbind_to (count, Qnil);
+      /* Fontification functions routinely call `save-restriction'.
+         Normally, this tags clip_changed, which can confuse redisplay
+         (see discussion in Bug#6671).  Since we don't perform any
+         special handling of fontification changes in the case where
+         `save-restriction' isn't called, there's no point doing so in
+         this case either.  So, if the buffer's restrictions are
+         actually left unchanged, reset clip_changed.  */
+      if (obuf == current_buffer)
+        {
+          if (begv == BEGV && zv == ZV)
+            current_buffer->clip_changed = old_clip_changed;
+        }
+      /* There isn't much we can reasonably do to protect against
+         misbehaving fontification, but here's a fig leaf.  */
+      else if (!NILP (BVAR (obuf, name)))
+        set_buffer_internal_1 (obuf);
      /* The fontification code may have added/removed text.
         It could do even a lot worse, but let's at least protect against
         the most obvious case where only the text past `pos' gets changed',
@@ -4400,20 +4419,18 @@ display_prop_string_p (Lisp_Object prop, Lisp_Object string)
  return 0;
 }
-/* Look for STRING in overlays and text properties in W's buffer,
+/* Look for STRING in overlays and text properties in the current
-   between character positions FROM and TO (excluding TO).
+   buffer, between character positions FROM and TO (excluding TO).
   BACK_P non-zero means look back (in this case, TO is supposed to be
   less than FROM).
   Value is the first character position where STRING was found, or
   zero if it wasn't found before hitting TO.
-   W's buffer must be current.
   This function may only use code that doesn't eval because it is
   called asynchronously from note_mouse_highlight.  */
 static EMACS_INT
-string_buffer_position_lim (struct window *w, Lisp_Object string,
+string_buffer_position_lim (Lisp_Object string,
                            EMACS_INT from, EMACS_INT to, int back_p)
 {
  Lisp_Object limit, prop, pos;
@@ -4451,27 +4468,25 @@ string_buffer_position_lim (struct window *w, Lisp_Object string,
  return found ? XINT (pos) : 0;
 }
-/* Determine which buffer position in W's buffer STRING comes from.
+/* Determine which buffer position in current buffer STRING comes from.
   AROUND_CHARPOS is an approximate position where it could come from.
   Value is the buffer position or 0 if it couldn't be determined.
-   W's buffer must be current.
   This function is necessary because we don't record buffer positions
   in glyphs generated from strings (to keep struct glyph small).
   This function may only use code that doesn't eval because it is
   called asynchronously from note_mouse_highlight.  */
-EMACS_INT
+static EMACS_INT
-string_buffer_position (struct window *w, Lisp_Object string, EMACS_INT around_charpos)
+string_buffer_position (Lisp_Object string, EMACS_INT around_charpos)
 {
  const int MAX_DISTANCE = 1000;
-  EMACS_INT found = string_buffer_position_lim (w, string, around_charpos,
+  EMACS_INT found = string_buffer_position_lim (string, around_charpos,
                                                around_charpos + MAX_DISTANCE,
                                                0);
  if (!found)
-    found = string_buffer_position_lim (w, string, around_charpos,
+    found = string_buffer_position_lim (string, around_charpos,
                                        around_charpos - MAX_DISTANCE, 1);
  return found;
 }
@@ -7947,7 +7962,7 @@ message_dolog (const char *m, EMACS_INT nbytes, int nlflag, int multibyte)
              c = string_char_and_length (msg + i, &char_bytes);
              work[0] = (ASCII_CHAR_P (c)
                         ? c
-                         : multibyte_char_to_unibyte (c, Qnil));
+                         : multibyte_char_to_unibyte (c));
              insert_1_both (work, 1, 1, 1, 0, 0);
            }
        }
@@ -7973,7 +7988,7 @@ message_dolog (const char *m, EMACS_INT nbytes, int nlflag, int multibyte)
      if (nlflag)
        {
          EMACS_INT this_bol, this_bol_byte, prev_bol, prev_bol_byte;
-          int dups;
+          unsigned long int dups;
          insert_1 ("\n", 1, 1, 0, 0);
          scan_newline (Z, Z_BYTE, BEG, BEG_BYTE, -2, 0);
@@ -8001,7 +8016,7 @@ message_dolog (const char *m, EMACS_INT nbytes, int nlflag, int multibyte)
                      /* If you change this format, don't forget to also
                         change message_log_check_duplicate.  */
-                      sprintf (dupstr, " [%d times]", dups);
+                      sprintf (dupstr, " [%lu times]", dups);
                      duplen = strlen (dupstr);
                      TEMP_SET_PT_BOTH (Z - 1, Z_BYTE - 1);
                      insert_1 (dupstr, duplen, 1, 0, 1);
@@ -8063,7 +8078,7 @@ message_dolog (const char *m, EMACS_INT nbytes, int nlflag, int multibyte)
   Return 0 if different, 1 if the new one should just replace it, or a
   value N > 1 if we should also append " [N times]".  */
-static int
+static unsigned long int
 message_log_check_duplicate (EMACS_INT prev_bol, EMACS_INT prev_bol_byte,
                             EMACS_INT this_bol, EMACS_INT this_bol_byte)
 {
@@ -8085,10 +8100,9 @@ message_log_check_duplicate (EMACS_INT prev_bol, EMACS_INT prev_bol_byte,
    return 2;
  if (*p1++ == ' ' && *p1++ == '[')
    {
-      int n = 0;
+      char *pend;
-      while (*p1 >= '0' && *p1 <= '9')
+      unsigned long int n = strtoul ((char *) p1, &pend, 10);
-        n = n * 10 + *p1++ - '0';
+      if (strncmp (pend, " times]\n", 8) == 0)
-      if (strncmp ((char *) p1, " times]\n", 8) == 0)
        return n+1;
    }
  return 0;
@@ -9209,7 +9223,7 @@ set_message_1 (EMACS_INT a1, Lisp_Object a2, EMACS_INT nbytes, EMACS_INT multiby
              c = string_char_and_length (msg + i, &n);
              work[0] = (ASCII_CHAR_P (c)
                         ? c
-                         : multibyte_char_to_unibyte (c, Qnil));
+                         : multibyte_char_to_unibyte (c));
              insert_1_both (work, 1, 1, 1, 0, 0);
            }
        }
@@ -12712,7 +12726,7 @@ set_cursor_from_row (struct window *w, struct glyph_row *row,
                  EMACS_INT tem;
                  str = glyph->object;
-                  tem = string_buffer_position_lim (w, str, pos, pos_after, 0);
+                  tem = string_buffer_position_lim (str, pos, pos_after, 0);
                  if (tem == 0  /* from overlay */
                      || pos <= tem)
                    {
@@ -13438,7 +13452,7 @@ try_cursor_movement (Lisp_Object window, struct text_pos startp, int *scroll_ste
                     && row < w->current_matrix->rows
                                + w->current_matrix->nrows - 1
                     && MATRIX_ROW_START_CHARPOS (row+1) == PT
-                     && !cursor_row_p (w, row))
+                     && !cursor_row_p (row))
                ++row;
              /* If within the scroll margin, scroll.  Note that
@@ -13490,7 +13504,7 @@ try_cursor_movement (Lisp_Object window, struct text_pos startp, int *scroll_ste
                 skip forward over overlay strings.  */
              while (MATRIX_ROW_BOTTOM_Y (row) < last_y
                     && MATRIX_ROW_END_CHARPOS (row) == PT
-                     && !cursor_row_p (w, row))
+                     && !cursor_row_p (row))
                ++row;
              /* If within the scroll margin, scroll.  */
@@ -13586,7 +13600,7 @@ try_cursor_movement (Lisp_Object window, struct text_pos startp, int *scroll_ste
                {
                  if (MATRIX_ROW_START_CHARPOS (row) <= PT
                      && PT <= MATRIX_ROW_END_CHARPOS (row)
-                      && cursor_row_p (w, row))
+                      && cursor_row_p (row))
                    rv |= set_cursor_from_row (w, row, w->current_matrix,
                                               0, 0, 0, 0);
                  /* As soon as we've found the first suitable row
@@ -13625,7 +13639,7 @@ try_cursor_movement (Lisp_Object window, struct text_pos startp, int *scroll_ste
                }
              while (MATRIX_ROW_BOTTOM_Y (row) < last_y
                     && MATRIX_ROW_START_CHARPOS (row) == PT
-                     && cursor_row_p (w, row));
+                     && cursor_row_p (row));
            }
        }
    }
@@ -14157,7 +14171,6 @@ redisplay_window (Lisp_Object window, int just_this_one_p)
       || temp_scroll_step
       || NUMBERP (BVAR (current_buffer, scroll_up_aggressively))
       || NUMBERP (BVAR (current_buffer, scroll_down_aggressively)))
-      && !current_buffer->clip_changed
      && CHARPOS (startp) >= BEGV
      && CHARPOS (startp) <= ZV)
    {
@@ -14625,8 +14638,6 @@ try_window_reusing_current_matrix (struct window *w)
  if (CHARPOS (new_start) <= CHARPOS (start))
    {
-      int first_row_y;
      /* Don't use this method if the display starts with an ellipsis
         displayed for invisible text.  It's not easy to handle that case
         below, and it's certainly not worth the effort since this is
@@ -14641,7 +14652,6 @@ try_window_reusing_current_matrix (struct window *w)
         text.  Note that it.vpos == 0 if or if not there is a
         header-line; it's not the same as the MATRIX_ROW_VPOS!  */
      start_display (&it, w, new_start);
-      first_row_y = it.current_y;
      w->cursor.vpos = -1;
      last_text_row = last_reused_text_row = NULL;
@@ -16370,7 +16380,7 @@ With ARG, turn tracing on if and only if ARG is positive.  */)
 DEFUN ("trace-to-stderr", Ftrace_to_stderr, Strace_to_stderr, 1, MANY, "",
       doc: /* Like `format', but print result to stderr.
 usage: (trace-to-stderr STRING &rest OBJECTS)  */)
-  (int nargs, Lisp_Object *args)
+  (size_t nargs, Lisp_Object *args)
 {
  Lisp_Object s = Fformat (nargs, args);
  fprintf (stderr, "%s", SDATA (s));
@@ -16953,11 +16963,11 @@ highlight_trailing_whitespace (struct frame *f, struct glyph_row *row)
 }
-/* Value is non-zero if glyph row ROW in window W should be
+/* Value is non-zero if glyph row ROW should be
   used to hold the cursor.  */
 static int
-cursor_row_p (struct window *w, struct glyph_row *row)
+cursor_row_p (struct glyph_row *row)
 {
  int result = 1;
@@ -17870,7 +17880,7 @@ display_line (struct it *it)
           && !MATRIX_ROW (it->w->desired_matrix, cvpos)->ends_at_zv_p))
      && PT >= MATRIX_ROW_START_CHARPOS (row)
      && PT <= MATRIX_ROW_END_CHARPOS (row)
-      && cursor_row_p (it->w, row))
+      && cursor_row_p (row))
    set_cursor_from_row (it->w, row, it->w->desired_matrix, 0, 0, 0, 0);
  /* Highlight trailing whitespace.  */
@@ -18522,7 +18532,7 @@ display_mode_element (struct it *it, int depth, int field_width, int precision,
                    charpos = (STRING_MULTIBYTE (elt)
                               ? string_byte_to_char (elt, bytepos)
                               : bytepos);
-                    spec = decode_mode_spec (it->w, c, field, prec, &string);
+                    spec = decode_mode_spec (it->w, c, field, &string);
                    multibyte = STRINGP (string) && STRING_MULTIBYTE (string);
                    switch (mode_line_target)
@@ -19007,7 +19017,7 @@ pint2str (register char *buf, register int width, register EMACS_INT d)
 static const char power_letter[] =
  {
-    0,   /* not used */
+    0,   /* no letter */
    'k', /* kilo */
    'M', /* mega */
    'G', /* giga */
@@ -19089,8 +19099,7 @@ pint2hrstr (char *buf, int width, int d)
  p = psuffix = buf + max (width, length);
  /* Print EXPONENT. */
-  if (exponent)
+  *psuffix++ = power_letter[exponent];
-    *psuffix++ = power_letter[exponent];
  *psuffix = '\0';
  /* Print TENTHS. */
@@ -19194,9 +19203,8 @@ decode_mode_spec_coding (Lisp_Object coding_system, register char *buf, int eol_
 }
 /* Return a string for the output of a mode line %-spec for window W,
-   generated by character C.  PRECISION >= 0 means don't return a
+   generated by character C.  FIELD_WIDTH > 0 means pad the string
-   string longer than that value.  FIELD_WIDTH > 0 means pad the
+   returned with spaces to that value.  Return a Lisp string in
-   string returned with spaces to that value.  Return a Lisp string in
   *STRING if the resulting string is taken from that Lisp string.
   Note we operate on the current buffer for most purposes,
@@ -19206,7 +19214,7 @@ static char lots_of_dashes[] = "------------------------------------------------
 static const char *
 decode_mode_spec (struct window *w, register int c, int field_width,
-                  int precision, Lisp_Object *string)
+                  Lisp_Object *string)
 {
  Lisp_Object obj;
  struct frame *f = XFRAME (WINDOW_FRAME (w));
@@ -22740,7 +22748,6 @@ x_produce_glyphs (struct it *it)
              int ch = COMPOSITION_GLYPH (cmp, i);
              int face_id;
              struct face *this_face;
-              int this_boff;
              if (ch == '\t')
                ch = ' ';
@@ -22752,9 +22759,6 @@ x_produce_glyphs (struct it *it)
                pcm = NULL;
              else
                {
-                  this_boff = font->baseline_offset;
-                  if (font->vertical_centering)
-                    this_boff = VCENTER_BASELINE_OFFSET (font, it->f) - boff;
                  get_char_face_and_encoding (it->f, ch, face_id,
                                              &char2b, it->multibyte_p, 0);
                  pcm = get_per_char_metric (it->f, font, &char2b);
@@ -24307,7 +24311,7 @@ mouse_face_from_buffer_pos (Lisp_Object window,
             END_CHARPOS, or if they come from an overlay.  */
          if (EQ (glyph->object, before_string))
            {
-              pos = string_buffer_position (w, before_string,
+              pos = string_buffer_position (before_string,
                                            start_charpos);
              /* If pos == 0, it means before_string came from an
                 overlay, not from a buffer position.  */
@@ -24316,7 +24320,7 @@ mouse_face_from_buffer_pos (Lisp_Object window,
            }
          else if (EQ (glyph->object, after_string))
            {
-              pos = string_buffer_position (w, after_string, end_charpos);
+              pos = string_buffer_position (after_string, end_charpos);
              if (!pos || (pos >= start_charpos && pos < end_charpos))
                break;
            }
@@ -24358,7 +24362,7 @@ mouse_face_from_buffer_pos (Lisp_Object window,
             END_CHARPOS, or if they come from an overlay.  */
          if (EQ (glyph->object, before_string))
            {
-              pos = string_buffer_position (w, before_string, start_charpos);
+              pos = string_buffer_position (before_string, start_charpos);
              /* If pos == 0, it means before_string came from an
                 overlay, not from a buffer position.  */
              if (!pos || (pos >= start_charpos && pos < end_charpos))
@@ -24366,7 +24370,7 @@ mouse_face_from_buffer_pos (Lisp_Object window,
            }
          else if (EQ (glyph->object, after_string))
            {
-              pos = string_buffer_position (w, after_string, end_charpos);
+              pos = string_buffer_position (after_string, end_charpos);
              if (!pos || (pos >= start_charpos && pos < end_charpos))
                break;
            }
@@ -24424,13 +24428,13 @@ mouse_face_from_buffer_pos (Lisp_Object window,
             END_CHARPOS, or if they come from an overlay.  */
          if (EQ (end->object, before_string))
            {
-              pos = string_buffer_position (w, before_string, start_charpos);
+              pos = string_buffer_position (before_string, start_charpos);
              if (!pos || (pos >= start_charpos && pos < end_charpos))
                break;
            }
          else if (EQ (end->object, after_string))
            {
-              pos = string_buffer_position (w, after_string, end_charpos);
+              pos = string_buffer_position (after_string, end_charpos);
              if (!pos || (pos >= start_charpos && pos < end_charpos))
                break;
            }
@@ -24474,13 +24478,13 @@ mouse_face_from_buffer_pos (Lisp_Object window,
             END_CHARPOS, or if they come from an overlay.  */
          if (EQ (end->object, before_string))
            {
-              pos = string_buffer_position (w, before_string, start_charpos);
+              pos = string_buffer_position (before_string, start_charpos);
              if (!pos || (pos >= start_charpos && pos < end_charpos))
                break;
            }
          else if (EQ (end->object, after_string))
            {
-              pos = string_buffer_position (w, after_string, end_charpos);
+              pos = string_buffer_position (after_string, end_charpos);
              if (!pos || (pos >= start_charpos && pos < end_charpos))
                break;
            }
@@ -24957,10 +24961,9 @@ note_mode_line_or_margin_highlight (Lisp_Object window, int x, int y,
              CONSP (hotspot))
          && (hotspot = XCDR (hotspot), CONSP (hotspot)))
        {
-          Lisp_Object area_id, plist;
+          Lisp_Object plist;
-          area_id = XCAR (hotspot);
+          /* Could check XCAR (hotspot) to see if we enter/leave this hot-spot.
-          /* Could check AREA_ID to see if we enter/leave this hot-spot.
             If so, we could look for mouse-enter, mouse-leave
             properties in PLIST (and do something...).  */
          hotspot = XCDR (hotspot);
@@ -25295,10 +25298,10 @@ note_mouse_highlight (struct frame *f, int x, int y)
                      CONSP (hotspot))
                  && (hotspot = XCDR (hotspot), CONSP (hotspot)))
                {
-                  Lisp_Object area_id, plist;
+                  Lisp_Object plist;
-                  area_id = XCAR (hotspot);
+                  /* Could check XCAR (hotspot) to see if we enter/leave
-                  /* Could check AREA_ID to see if we enter/leave this hot-spot.
+                     this hot-spot.
                     If so, we could look for mouse-enter, mouse-leave
                     properties in PLIST (and do something...).  */
                  hotspot = XCDR (hotspot);
@@ -25464,7 +25467,7 @@ note_mouse_highlight (struct frame *f, int x, int y)
                     check if the text under it has one.  */
                  struct glyph_row *r = MATRIX_ROW (w->current_matrix, vpos);
                  EMACS_INT start = MATRIX_ROW_START_CHARPOS (r);
-                  pos = string_buffer_position (w, object, start);
+                  pos = string_buffer_position (object, start);
                  if (pos > 0)
                    {
                      mouse_face = get_char_property_and_overlay
@@ -25574,7 +25577,7 @@ note_mouse_highlight (struct frame *f, int x, int y)
                    struct glyph_row *r
                      = MATRIX_ROW (w->current_matrix, vpos);
                    EMACS_INT start = MATRIX_ROW_START_CHARPOS (r);
-                    EMACS_INT p = string_buffer_position (w, obj, start);
+                    EMACS_INT p = string_buffer_position (obj, start);
                    if (p > 0)
                      {
                        help = Fget_char_property (make_number (p),
@@ -25630,7 +25633,7 @@ note_mouse_highlight (struct frame *f, int x, int y)
                      struct glyph_row *r
                        = MATRIX_ROW (w->current_matrix, vpos);
                      EMACS_INT start = MATRIX_ROW_START_CHARPOS (r);
-                      EMACS_INT p = string_buffer_position (w, obj, start);
+                      EMACS_INT p = string_buffer_position (obj, start);
                      if (p > 0)
                        pointer = Fget_char_property (make_number (p),
                                                      Qpointer, w->buffer);
diff --git a/src/xfont.c b/src/xfont.c
index f8aace3663c..3e0fcd2cd75 100644
--- a/src/xfont.c
+++ b/src/xfont.c
@@ -629,7 +629,7 @@ xfont_list_family (Lisp_Object frame)
  char **names;
  int num_fonts, i;
  Lisp_Object list;
-  char *last_family;
+  char *last_family IF_LINT (= 0);
  int last_len;
  BLOCK_INPUT;
diff --git a/src/xftfont.c b/src/xftfont.c
index 695527c4236..c27a4fcf91a 100644
--- a/src/xftfont.c
+++ b/src/xftfont.c
@@ -280,7 +280,7 @@ xftfont_open (FRAME_PTR f, Lisp_Object entity, int pixel_size)
 {
  FcResult result;
  Display *display = FRAME_X_DISPLAY (f);
-  Lisp_Object val, filename, index, font_object;
+  Lisp_Object val, filename, idx, font_object;
  FcPattern *pat = NULL, *match;
  struct xftfont_info *xftfont_info = NULL;
  struct font *font;
@@ -298,7 +298,7 @@ xftfont_open (FRAME_PTR f, Lisp_Object entity, int pixel_size)
    return Qnil;
  val = XCDR (val);
  filename = XCAR (val);
-  index = XCDR (val);
+  idx = XCDR (val);
  size = XINT (AREF (entity, FONT_SIZE_INDEX));
  if (size == 0)
    size = pixel_size;
@@ -335,7 +335,7 @@ xftfont_open (FRAME_PTR f, Lisp_Object entity, int pixel_size)
  xftfont_add_rendering_parameters (pat, entity);
  FcPatternAddString (pat, FC_FILE, (FcChar8 *) SDATA (filename));
-  FcPatternAddInteger (pat, FC_INDEX, XINT (index));
+  FcPatternAddInteger (pat, FC_INDEX, XINT (idx));
  BLOCK_INPUT;
@@ -409,9 +409,9 @@ xftfont_open (FRAME_PTR f, Lisp_Object entity, int pixel_size)
    spacing = FC_PROPORTIONAL;
  if (! ascii_printable[0])
    {
-      int i;
+      int ch;
-      for (i = 0; i < 95; i++)
+      for (ch = 0; ch < 95; ch++)
-        ascii_printable[i] = ' ' + i;
+        ascii_printable[ch] = ' ' + ch;
    }
  BLOCK_INPUT;
  if (spacing != FC_PROPORTIONAL
@@ -672,7 +672,8 @@ xftfont_draw (struct glyph_string *s, int from, int to, int x, int y, int with_b
  return len;
 }
-Lisp_Object
+#if defined HAVE_M17N_FLT && defined HAVE_LIBOTF
+static Lisp_Object
 xftfont_shape (Lisp_Object lgstring)
 {
  struct font *font;
@@ -688,6 +689,7 @@ xftfont_shape (Lisp_Object lgstring)
  XftUnlockFace (xftfont_info->xftfont);
  return val;
 }
+#endif
 static int
 xftfont_end_for_frame (FRAME_PTR f)
diff --git a/src/xmenu.c b/src/xmenu.c
index eab7bb03f20..8ecef00c88e 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -383,7 +383,7 @@ x_menu_wait_for_event (void *data)
 #endif
         )
    {
-      EMACS_TIME next_time = timer_check (1), *ntp;
+      EMACS_TIME next_time = timer_check (), *ntp;
      long secs = EMACS_SECS (next_time);
      long usecs = EMACS_USECS (next_time);
      SELECT_TYPE read_fds;
@@ -712,7 +712,7 @@ show_help_event (FRAME_PTR f, xt_or_gtk_widget widget, Lisp_Object help)
            break;
        }
 #endif
-      show_help_echo (help, Qnil, Qnil, Qnil, 1);
+      show_help_echo (help, Qnil, Qnil, Qnil);
    }
 }
@@ -922,7 +922,7 @@ set_frame_menubar (FRAME_PTR f, int first_time, int deep_p)
 #endif
  Lisp_Object items;
  widget_value *wv, *first_wv, *prev_wv = 0;
-  int i, last_i = 0;
+  EMACS_UINT i, last_i = 0;
  int *submenu_start, *submenu_end;
  int *submenu_top_level_items, *submenu_n_panes;
@@ -2201,7 +2201,7 @@ menu_help_callback (char *help_string, int pane, int item)
                       Fcons (pane_name,
                              Fcons (make_number (pane), Qnil)));
  show_help_echo (help_string ? build_string (help_string) : Qnil,
-                  Qnil, menu_object, make_number (item), 1);
+                  Qnil, menu_object, make_number (item));
 }
 static Lisp_Object
diff --git a/src/xml.c b/src/xml.c
index 12ef14e6b9f..d8e6f8c3faa 100644
--- a/src/xml.c
+++ b/src/xml.c
@@ -28,7 +28,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "lisp.h"
 #include "buffer.h"
-Lisp_Object make_dom (xmlNode *node)
+static Lisp_Object
+make_dom (xmlNode *node)
 {
  if (node->type == XML_ELEMENT_NODE)
    {
diff --git a/src/xselect.c b/src/xselect.c
index 5254fa96838..451b2a0b13f 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -2190,7 +2190,8 @@ and t is the same as `SECONDARY'.  */)
 ***********************************************************************/
 /* Check that lisp values are of correct type for x_fill_property_data.
   That is, number, string or a cons with two numbers (low and high 16
-   bit parts of a 32 bit number).  */
+   bit parts of a 32 bit number).  Return the number of items in DATA,
+   or -1 if there is an error.  */
 int
 x_check_property_data (Lisp_Object data)
@@ -2198,15 +2199,16 @@ x_check_property_data (Lisp_Object data)
  Lisp_Object iter;
  int size = 0;
-  for (iter = data; CONSP (iter) && size != -1; iter = XCDR (iter), ++size)
+  for (iter = data; CONSP (iter); iter = XCDR (iter))
    {
      Lisp_Object o = XCAR (iter);
      if (! NUMBERP (o) && ! STRINGP (o) && ! CONSP (o))
-        size = -1;
+        return -1;
      else if (CONSP (o) &&
               (! NUMBERP (XCAR (o)) || ! NUMBERP (XCDR (o))))
-        size = -1;
+        return -1;
+      size++;
    }
  return size;
diff --git a/src/xterm.c b/src/xterm.c
index fd7ffd68e62..dc1fd3cbbd1 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -349,7 +349,7 @@ static int handle_one_xevent (struct x_display_info *, XEvent *,
                              int *, struct input_event *);
 /* Don't declare this NO_RETURN because we want no
   interference with debugging failing X calls.  */
-static SIGTYPE x_connection_closed (Display *, const char *);
+static void x_connection_closed (Display *, const char *);
 /* Flush display of frame F, or of all frames if F is null.  */
@@ -2928,10 +2928,14 @@ x_clear_frame (struct frame *f)
  /* We don't set the output cursor here because there will always
     follow an explicit cursor_to.  */
  BLOCK_INPUT;
-  XClearWindow (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f));
-  /* We have to clear the scroll bars, too.  If we have changed
+  /* The following calls have been commented out because they do not
-     colors or something like that, then they should be notified.  */
+     seem to accomplish anything, apart from causing flickering during
+     window resize.  */
+  /* XClearWindow (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f)); */
+  /* We have to clear the scroll bars.  If we have changed colors or
+     something like that, then they should be notified.  */
  x_scroll_bar_clear (f);
 #if defined (USE_GTK) && defined (USE_TOOLKIT_SCROLL_BARS)
@@ -7646,7 +7650,7 @@ x_trace_wire (void)
   SIGPIPE will fail, causing Xlib to invoke the X IO error handler,
   which will do the appropriate cleanup for us.  */
-static SIGTYPE
+static void
 x_connection_signal (int signalnum)     /* If we don't have an argument, */
                                /* some compilers complain in signal calls.  */
 {
@@ -7669,7 +7673,7 @@ static char *error_msg;
 /* Handle the loss of connection to display DPY.  ERROR_MESSAGE is
   the text of an error message that lead to the connection loss.  */
-static SIGTYPE
+static void
 x_connection_closed (Display *dpy, const char *error_message)
 {
  struct x_display_info *dpyinfo = x_display_info_for_display (dpy);
@@ -9117,7 +9121,7 @@ x_make_frame_visible (struct frame *f)
       unknown reason, the call to XtMapWidget is completely ignored.
       Mapping the widget a second time works.  */
-    if (!FRAME_VISIBLE_P (f) && --retry_count > 0)
+    if (!FRAME_VISIBLE_P (f) && --retry_count != 0)
      goto retry;
  }
 }
@@ -9722,7 +9726,7 @@ same_x_server (const char *name1, const char *name2)
  for (; *name1 != '\0' && *name1 == *name2; name1++, name2++)
    {
      if (*name1 == ':')
-        seen_colon++;
+        seen_colon = 1;
      if (seen_colon && *name1 == '.')
        return 1;
    }
author	Stefan Monnier	2011-03-31 00:24:03 -0400
committer	Stefan Monnier	2011-03-31 00:24:03 -0400
commit	40d83b412f584cc02e68d4eac8fd5e6eb769e2fe (patch)
tree	b56f27a7e6d75a8c1fd27b00179a27b5efea0a32
parent	f488fb6528738131ef41859e1f04125f2e50efce (diff)
parent	44f230aa043ebb222aa0876b44d70484d5dd38db (diff)
download	emacs-40d83b412f584cc02e68d4eac8fd5e6eb769e2fe.tar.gz emacs-40d83b412f584cc02e68d4eac8fd5e6eb769e2fe.zip