Merge from mainline.

2 files changed, 13 insertions, 2 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index da7ef59e8e6..90ba61f7850 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,14 @@
+2010-03-10  Chong Yidong  <cyd@stupidchicken.com>
+
+        * Branch for 23.2.
+
+2010-03-10  Miles Bader  <miles@gnu.org>
+
+        * quick-install-emacs: Use more portable shell syntax.
+
+        * quick-install-emacs: (AVOID): Be more picky about files we avoid
+        installing.
+
 2010-02-14  Juanma Barranquero  <lekktu@gmail.com>
 
         * quick-install-emacs (PRUNED): Fix typo in message.
diff --git a/admin/quick-install-emacs b/admin/quick-install-emacs
index 2fda74b0832..b912ed4e3ff 100755
--- a/admin/quick-install-emacs
+++ b/admin/quick-install-emacs
@@ -31,7 +31,7 @@
 PUBLIC_LIBSRC_BINARIES='b2m emacsclient etags ctags ebrowse'
 PUBLIC_LIBSRC_SCRIPTS='grep-changelog rcs-checkin'
 
-AVOID="CVS -DIC README COPYING ChangeLog ~ [.]orig$ [.]rej$ Makefile makefile stamp-subdir [.]cvsignore [.]arch-ids [{]arch[}] [.][cho]$ make-docfile testfile test-distrib"
+AVOID="CVS -DIC README COPYING ChangeLog ~ [.]orig$ [.]rej$ Makefile$ Makefile.in$ Makefile.c$ makefile$ makefile.w32-in$ stamp-subdir [.]cvsignore [.]arch-ids [{]arch[}] [.][cho]$ make-docfile testfile test-distrib"
 
 # Prune old binaries lying around in the source tree
 PRUNE=no
@@ -120,7 +120,7 @@ Written by Miles Bader <miles@gnu.org>
 EOF
       exit 0
       ;;
-    -[^-]?*)
+    -[!-]?*)
       # split concatenated single-letter options apart
       FIRST="$1"; shift
       set -- `echo $FIRST | sed 's/-\(.\)\(.*\)/-\1 -\2/'` "$@"