Merge from trunk.

4 files changed, 16 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index 4162152ccd0..75d0ef6a5e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-09-26  Glenn Morris  <rgm@gnu.org>
+
+        * make-dist: Add lib/makefile.w32-in.
+
 2011-09-24  Glenn Morris  <rgm@gnu.org>
 
         * configure.in (CRT_DIR): Fix netbsd/openbsd handling.
diff --git a/autogen/configure b/autogen/configure
index 1f304212838..adf315b6338 100755
--- a/autogen/configure
+++ b/autogen/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for emacs 24.0.50.
+# Generated by GNU Autoconf 2.65 for emacs 24.0.90.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -549,8 +549,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='emacs'
 PACKAGE_TARNAME='emacs'
-PACKAGE_VERSION='24.0.50'
-PACKAGE_STRING='emacs 24.0.50'
+PACKAGE_VERSION='24.0.90'
+PACKAGE_STRING='emacs 24.0.90'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1870,7 +1870,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures emacs 24.0.50 to adapt to many kinds of systems.
+\`configure' configures emacs 24.0.90 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1944,7 +1944,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of emacs 24.0.50:";;
+     short | recursive ) echo "Configuration of emacs 24.0.90:";;
    esac
   cat <<\_ACEOF
 
@@ -2107,7 +2107,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-emacs configure 24.0.50
+emacs configure 24.0.90
 generated by GNU Autoconf 2.65
 
 Copyright (C) 2009 Free Software Foundation, Inc.
@@ -2829,7 +2829,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by emacs $as_me 24.0.50, which was
+It was created by emacs $as_me 24.0.90, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
@@ -3662,7 +3662,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='emacs'
- VERSION='24.0.50'
+ VERSION='24.0.90'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -23100,7 +23100,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by emacs $as_me 24.0.50, which was
+This file was extended by emacs $as_me 24.0.90, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -23166,7 +23166,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-emacs config.status 24.0.50
+emacs config.status 24.0.90
 configured by $0, generated by GNU Autoconf 2.65,
   with options \\"\$ac_cs_config\\"
 
diff --git a/etc/NEWS b/etc/NEWS
index a5e7de93d7d..f6901e3b88f 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -454,7 +454,7 @@ isearch-yank-kill.
 
 ** The default value of `backup-by-copying-when-mismatch' is now t.
 
-** The command `just-one-space' (C-SPC), if given a negative argument,
+** The command `just-one-space' (M-SPC), if given a negative argument,
 also deletes newlines around point.
 
 ** Deletion changes
diff --git a/make-dist b/make-dist
index c15fecfd111..2dbb35cdc5b 100755
--- a/make-dist
+++ b/make-dist
@@ -383,7 +383,7 @@ echo "Making links to \`lib'"
 (snippet_h=`(cd build-aux/snippet && ls *.h)`
  cd lib
  ln [a-zA-Z]*.[ch] ../${tempdir}/lib
- ln gnulib.mk Makefile.am Makefile.in ../${tempdir}/lib
+ ln gnulib.mk Makefile.am Makefile.in makefile.w32-in ../${tempdir}/lib
  cd ../${tempdir}/lib
  script='/[*]/d; s/\.in\.h$/.h/'
  rm -f `(echo "$snippet_h"; ls *.in.h) | sed "$script"`)