Merge from mainline.
tree0ce045f1059d3e763e2428d237f3f3834aa8668f
-rw-r--r-- 1146 .bzrignore
-rw-r--r-- 557 .dir-locals.el
-rw-r--r-- 108 .gitignore
-rw-r--r-- 949 BUGS
-rw-r--r-- 35147 COPYING
-rw-r--r-- 269826 ChangeLog
-rw-r--r-- 34142 INSTALL
-rw-r--r-- 2798 INSTALL.BZR
-rw-r--r-- 36644 Makefile.in
-rw-r--r-- 5291 README
-rw-r--r-- 36307 aclocal.m4
drwxr-xr-x - admin
-rw-r--r-- 1223 arg-nonnull.h
-rwxr-xr-x 277 autogen.sh
-rw-r--r-- 11762 c++defs.h
-rwxr-xr-x 3769 compile
-rw-r--r-- 11890 config.bat
-rwxr-xr-x 45120 config.guess
-rwxr-xr-x 35079 config.sub
-rwxr-xr-x 518216 configure
-rw-r--r-- 123954 configure.in
-rwxr-xr-x 18615 depcomp
drwxr-xr-x - doc
drwxr-xr-x - etc
drwxr-xr-x - info
-rwxr-xr-x 13781 install-sh
drwxr-xr-x - leim
drwxr-xr-x - lib-src
drwxr-xr-x - lib
drwxr-xr-x - lisp
drwxr-xr-x - lwlib
drwxr-xr-x - m4
-rwxr-xr-x 17384 make-dist
-rwxr-xr-x 11419 missing
-rwxr-xr-x 3538 mkinstalldirs
-rwxr-xr-x 2390 move-if-change
drwxr-xr-x - msdos
drwxr-xr-x - nextstep
drwxr-xr-x - nt
drwxr-xr-x - oldXMenu
drwxr-xr-x - src
drwxr-xr-x - test
-rwxr-xr-x 1721 update-subdirs
-rw-r--r-- 269 vpath.sed
-rw-r--r-- 5141 warn-on-use.h