upstream

15 files changed, 163 insertions, 63 deletions

diff --git a/ChangeLog b/ChangeLog
index 56326b34ddb..f95549d66a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2012-05-21  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Make merging from gnulib a script, not a makefile action.
+        Putting it in a makefile has some problems with reflection, as
+        merging from gnulib updates 'configure', which can update the makefile.
+        Putting it in a standalone script breaks this loop.
+        * Makefile.in (gnulib_srcdir, $(gnulib_srcdir), DOS_gnulib_comp.m4)
+        (GNULIB_MODULES, GNULIB_TOOL_FLAGS, sync-from-gnulib):
+        Remove, moving the actions to the script admin/merge-gnulib.
+
+2012-05-21  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (install-arch-indep, install-doc, install-info)
+        (uninstall): Scrap superfluous subshells.
+
 2012-05-19  Ulrich Mueller  <ulm@gentoo.org>
 
         * Makefile.in (install-etc): Respect DESTDIR.  (Bug#11518)
diff --git a/Makefile.in b/Makefile.in
index ec74a2ec8a9..f978f19e974 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -309,43 +309,6 @@ src:	lib-src FRC
 # and `leim'.
 lisp leim: src
 
-# Maintainers can put a copy of gnulib into $(gnulib_srcdir).
-gnulib_srcdir = ../gnulib
-$(gnulib_srcdir):
-        git clone git://git.savannah.gnu.org/gnulib.git $@
-
-# A shorter name that satisfies MS-DOS 8+3 constraints.
-DOS_gnulib_comp.m4 = gl-comp.m4
-
-# Update modules from gnulib, for maintainers, who should have it in
-# $(gnulib_srcdir) (relative to $(srcdir) and should have build tools
-# as per $(gnulib_srcdir)/DEPENDENCIES.
-GNULIB_MODULES = \
-  alloca-opt \
-  careadlinkat crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr \
-  dup2 \
-  filemode getloadavg getopt-gnu ignore-value intprops lstat \
-  manywarnings mktime pthread_sigmask readlink \
-  socklen stdarg stdio strftime strtoimax strtoumax symlink sys_stat \
-  warnings
-GNULIB_TOOL_FLAGS = \
- --avoid=msvc-inval --avoid=msvc-nothrow \
- --avoid=raise --avoid=threadlib \
- --conditional-dependencies --import --no-changelog --no-vc-files \
- --makefile-name=gnulib.mk
-sync-from-gnulib: $(gnulib_srcdir)
-        -cd $(srcdir)/m4 && cp $(DOS_gnulib_comp.m4) gnulib-comp.m4
-        cd $(srcdir) && \
-          $(gnulib_srcdir)/gnulib-tool $(GNULIB_TOOL_FLAGS) $(GNULIB_MODULES)
-        cd $(srcdir)/m4 && rm gnulib-cache.m4 warn-on-use.m4
-        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/move-if-change \
-          $(srcdir)/build-aux
-        cd $(srcdir) && autoreconf -i -I m4
-.PHONY: sync-from-gnulib
-
 # These targets should be "${SUBDIR} without `src'".
 lib lib-src lisp leim: Makefile FRC
         cd $@ && $(MAKE) all $(MFLAGS)                         \
@@ -529,7 +492,7 @@ install-arch-indep: install-leim install-info install-man ${INSTALL_ARCH_INDEP_E
           [ -d $${dir} ] || exit 1 ; \
           dest=$$1 ; shift ; \
           [ -d $${dest} ] && \
-            [ `(cd $${dest} && /bin/pwd)` = `(cd $${dir} && /bin/pwd)` ] && \
+            [ `cd $${dest} && /bin/pwd` = `cd $${dir} && /bin/pwd` ] && \
             continue ; \
           rm -rf $${dest} ; \
           umask 022; ${MKDIR_P} $${dest} ; \
@@ -578,7 +541,7 @@ install-arch-indep: install-leim install-info install-man ${INSTALL_ARCH_INDEP_E
 install-doc: install-arch-indep
         -unset CDPATH; \
         umask 022; ${MKDIR_P} $(DESTDIR)${docdir} ; \
-        if [ `(cd ./etc; /bin/pwd)` != `(cd $(DESTDIR)${docdir}; /bin/pwd)` ]; \
+        if [ `cd ./etc; /bin/pwd` != `cd $(DESTDIR)${docdir}; /bin/pwd` ]; \
         then \
            fullversion=`./src/emacs --version | sed -n '1 s/GNU Emacs *//p'`; \
            if [ -f "./etc/DOC-$${fullversion}" ]; \
@@ -597,7 +560,7 @@ install-info: info
         umask 022; ${MKDIR_P} $(DESTDIR)${infodir}
         -unset CDPATH; \
         thisdir=`/bin/pwd`; \
-        [ `(cd ${srcdir}/info && /bin/pwd)` = `(cd $(DESTDIR)${infodir} && /bin/pwd)` ] || \
+        [ `cd ${srcdir}/info && /bin/pwd` = `cd $(DESTDIR)${infodir} && /bin/pwd` ] || \
           (cd $(DESTDIR)${infodir};  \
            [ -f dir ] || \
              (cd $${thisdir}; \
@@ -670,8 +633,8 @@ uninstall:
         -unset CDPATH; \
         for dir in $(DESTDIR)${lispdir} $(DESTDIR)${etcdir} ; do        \
           if [ -d $${dir} ]; then                       \
-            case `(cd $${dir} ; /bin/pwd)` in           \
-              `(cd ${srcdir} ; /bin/pwd)`* ) ;;         \
+            case `cd $${dir} ; /bin/pwd` in             \
+              `cd ${srcdir} ; /bin/pwd`* ) ;;           \
               * ) rm -rf $${dir} ;;                     \
             esac ;                                      \
             case $${dir} in                             \
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 55504b3d6f8..86069da7f0b 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-21  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Make merging from gnulib a script, not a makefile action.
+        * merge-gnulib: New script, with actions moved here from
+        ../Makefile.in.
+
 2012-05-19  Paul Eggert  <eggert@cs.ucla.edu>
 
         * CPP-DEFINES (HAVE_GETDOMAINNAME): Remove.
diff --git a/admin/merge-gnulib b/admin/merge-gnulib
new file mode 100755
index 00000000000..57b71ee4a74
--- /dev/null
+++ b/admin/merge-gnulib
@@ -0,0 +1,88 @@
+#! /bin/sh
+# Merge gnulib sources into Emacs sources.
+# Typical usage:
+#
+#       admin/merge-gnulib
+
+# Copyright 2012 Free Software Foundation, Inc.
+
+# 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/>.
+
+# written by Paul Eggert
+
+GNULIB_URL=git://git.savannah.gnu.org/gnulib.git
+
+GNULIB_MODULES='
+  alloca-opt
+  careadlinkat crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512
+  dtoastr dup2
+  filemode getloadavg getopt-gnu ignore-value intprops lstat
+  manywarnings mktime pthread_sigmask readlink
+  socklen stdarg stdio strftime strtoimax strtoumax symlink sys_stat
+  warnings
+'
+
+GNULIB_TOOL_FLAGS='
+  --avoid=msvc-inval --avoid=msvc-nothrow
+  --avoid=raise --avoid=threadlib
+  --conditional-dependencies --import --no-changelog --no-vc-files
+  --makefile-name=gnulib.mk
+'
+
+# The source directory, with a trailing '/'.
+# If empty, the source directory is the working directory.
+src=$2
+case $src in
+  */ | '') ;;
+  *) src=$src/ ;;
+esac
+
+# Gnulib's source directory.
+gnulib_srcdir=${1-$src../gnulib}
+
+case $gnulib_srcdir in
+  -*) src=- ;;
+esac
+case $src in
+  -*)
+    echo >&2 "$0: usage: $0 [GNULIB_SRCDIR [SRCDIR]]
+
+    SRCDIR is the Emacs source directory (default: working directory).
+    GNULIB_SRCDIR is the Gnulib source directory (default: SRCDIR/../gnulib)."
+    exit 1 ;;
+esac
+
+test -x "$src"autogen.sh || {
+  echo >&2 "$0: '${src:-.}' is not an Emacs source directory."
+  exit 1
+}
+
+test -d "$gnulib_srcdir" ||
+git clone -- "$GNULIB_URL" "$gnulib_srcdir" ||
+exit
+
+test -x "$gnulib_srcdir"/gnulib-tool || {
+  echo >&2 "$0: '$gnulib_srcdir' is not a Gnulib source directory."
+  exit 1
+}
+
+cp -- "$src"m4/gl-comp.m4 "$src"m4/gnulib-comp.m4 &&
+"$gnulib_srcdir"/gnulib-tool --dir="$src" $GNULIB_TOOL_FLAGS $GNULIB_MODULES &&
+rm -- "$src"m4/gnulib-cache.m4 "$src"m4/warn-on-use.m4 &&
+mv -- "$src"m4/gnulib-comp.m4 "$src"m4/gl-comp.m4 &&
+cp -- "$gnulib_srcdir"/build-aux/texinfo.tex "$src"doc/misc &&
+cp -- "$gnulib_srcdir"/build-aux/move-if-change "$src"build-aux &&
+autoreconf -i -I m4 -- ${src:+"$src"}
diff --git a/leim/ChangeLog b/leim/ChangeLog
index 560e1d53da6..b2fa25b2d2e 100644
--- a/leim/ChangeLog
+++ b/leim/ChangeLog
@@ -1,3 +1,7 @@
+2012-05-21  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (leim-list.el, install): Scrap superfluous subshells.
+
 2012-05-12  Glenn Morris  <rgm@gnu.org>
 
         * Makefile.in (MKDIR_P): New, set by configure.
diff --git a/leim/Makefile.in b/leim/Makefile.in
index 646102eee71..2e488197b2a 100644
--- a/leim/Makefile.in
+++ b/leim/Makefile.in
@@ -157,7 +157,7 @@ changed.misc: ${SUBDIRS} ${MISC_SOURCES}
 
 leim-list.el: ${SUBDIRS} ${TIT_MISC} ${srcdir}/leim-ext.el
         rm -f leim-list.el
-        if [ x`(cd ${srcdir} && /bin/pwd)` = x`(/bin/pwd)` ] ; then \
+        if [ x`cd ${srcdir} && /bin/pwd` = x`/bin/pwd` ] ; then \
           ${RUN_EMACS} -l ${buildlisppath}/international/quail \
             --eval "(update-leim-list-file \".\")" ; \
         else \
@@ -191,11 +191,11 @@ compile-main: ${TIT_MISC}
 
 install: all
         umask 022; ${MKDIR_P} ${LEIM_INSTALLDIR}
-        if [ x`(cd ${LEIM_INSTALLDIR} && /bin/pwd)` != x`(/bin/pwd)` ] ; then \
+        if [ x`cd ${LEIM_INSTALLDIR} && /bin/pwd` != x`/bin/pwd` ] ; then \
           rm -f ${LEIM_INSTALLDIR}/leim-list.el; \
           rm -rf ${LEIM_INSTALLDIR}/quail ${LEIM_INSTALLDIR}/ja-dic ; \
           echo "Copying leim files to ${LEIM_INSTALLDIR} ..." ; \
-          if [ x`(cd ${srcdir} && /bin/pwd)` = x`(/bin/pwd)` ] ; then \
+          if [ x`cd ${srcdir} && /bin/pwd` = x`/bin/pwd` ] ; then \
             tar -chf - leim-list.el quail ja-dic \
                 | (cd ${LEIM_INSTALLDIR}; umask 0; tar -xvf - && cat > /dev/null) ;\
           else \
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index d0e9e5c525a..1b4cd548a99 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-21  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (insrcdir, $(DESTDIR)${archlibdir}):
+        Scrap superfluous subshells.
+
 2012-05-18  Glenn Morris  <rgm@gnu.org>
 
         * Makefile.in (install): Ensure $bindir exists.
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index fd423212c9f..4e47e2e0bc6 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -190,7 +190,7 @@ $(EXE_FILES): ../lib/libgnu.a
 ## These targets copy the scripts into the build directory so that
 ## they can be run from there in an uninstalled Emacs.
 ## Nothing to do if pwd = srcdir.
-insrcdir=[ "`/bin/pwd`" = "`(cd $(srcdir) && /bin/pwd)`" ]
+insrcdir=[ "`/bin/pwd`" = "`cd $(srcdir) && /bin/pwd`" ]
 
 stamp-rcs2log: $(srcdir)/rcs2log
         $(insrcdir) || cp -p $(srcdir)/rcs2log rcs2log
@@ -237,7 +237,7 @@ $(DESTDIR)${archlibdir}: all
         @echo
         @echo "Installing utilities run internally by Emacs."
         umask 022; ${MKDIR_P} $(DESTDIR)${archlibdir}
-        if [ `(cd $(DESTDIR)${archlibdir} && /bin/pwd)` != `/bin/pwd` ]; then \
+        if [ `cd $(DESTDIR)${archlibdir} && /bin/pwd` != `/bin/pwd` ]; then \
           for file in ${UTILITIES}; do \
             $(INSTALL_PROGRAM) $(INSTALL_STRIP) $$file $(DESTDIR)${archlibdir}/$$file ; \
           done ; \
@@ -249,8 +249,8 @@ $(DESTDIR)${archlibdir}: all
           chown ${gameuser} $(DESTDIR)${gamedir}; \
           chmod u=rwx,g=rwx,o=rx $(DESTDIR)${gamedir}; \
         fi
-        if [ `(cd $(DESTDIR)${archlibdir} && /bin/pwd)` \
-             != `(cd ${srcdir} && /bin/pwd)` ]; then \
+        if [ `cd $(DESTDIR)${archlibdir} && /bin/pwd` \
+             != `cd ${srcdir} && /bin/pwd` ]; then \
           for file in ${SCRIPTS}; do \
             $(INSTALL_SCRIPT) ${srcdir}/$$file $(DESTDIR)${archlibdir}/$$file; \
           done ; \
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b311fc4fcaa..c7775422417 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,16 @@
+2012-05-21  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * hi-lock.el (hi-lock-face-defaults): Move obsolete before definition.
+
+        * progmodes/compile.el (compilation-error-regexp-alist-alist):
+        Simplify Maven regexp, and make sure the file can't start with a space
+        (bug#11517).
+
+2012-05-21  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (setwins, setwins_almost, setwins_for_subdirs):
+        Scrap superfluous subshells.
+
 2012-05-19  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * emacs-lisp/bytecomp.el (byte-compile-root-dir): New var.
@@ -7,10 +20,11 @@
 
         * calc/calc.el (calc-ensure-consistent-units): New variable.
 
-        * calc/calc-units.el (math-consistent-units-p, math-check-unit-consistency):
-        New functions.
-        (calc-quick-units, calc-convert-units): Use `math-check-unit-consistency' when
-        `calc-ensure-consistent-units' is non-nil.
+        * calc/calc-units.el (math-consistent-units-p)
+        (math-check-unit-consistency): New functions.
+        (calc-quick-units, calc-convert-units):
+        Use `math-check-unit-consistency' when `calc-ensure-consistent-units'
+        is non-nil.
         (calc-extract-units): Fix typo.
 
 2012-05-18  Stefan Monnier  <monnier@iro.umontreal.ca>
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index d2c4e615577..ff211589f49 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -106,7 +106,7 @@ COMPILE_FIRST = \
 emacs = EMACSLOADPATH=$(lisp) LC_ALL=C $(EMACS) $(EMACSOPT)
 
 # Common command to find subdirectories
-setwins=subdirs=`(find . -type d -print)`; \
+setwins=subdirs=`find . -type d -print`; \
         for file in $$subdirs; do \
            case $$file in */.* | */.*/* | */=* ) ;; \
                 *) wins="$$wins $$file" ;; \
@@ -114,7 +114,7 @@ setwins=subdirs=`(find . -type d -print)`; \
         done
 
 # Find all subdirectories except `obsolete' and `term'.
-setwins_almost=subdirs=`(find . -type d -print)`; \
+setwins_almost=subdirs=`find . -type d -print`; \
         for file in $$subdirs; do \
            case $$file in */.* | */.*/* | */=* | */obsolete | */term ) ;; \
                 *) wins="$$wins $$file" ;; \
@@ -122,7 +122,7 @@ setwins_almost=subdirs=`(find . -type d -print)`; \
         done
 
 # Find all subdirectories in which we might want to create subdirs.el
-setwins_for_subdirs=subdirs=`(find . -type d -print)`; \
+setwins_for_subdirs=subdirs=`find . -type d -print`; \
         for file in $$subdirs; do \
            case $$file in */.* | */.*/* | */=* | */cedet* ) ;; \
                 *) wins="$$wins $$file" ;; \
diff --git a/lisp/hi-lock.el b/lisp/hi-lock.el
index 32a041e6c09..2c2d08e19cc 100644
--- a/lisp/hi-lock.el
+++ b/lisp/hi-lock.el
@@ -204,16 +204,15 @@ patterns."
 (defvar hi-lock-interactive-patterns nil
   "Patterns provided to hi-lock by user.  Should not be changed.")
 
+(define-obsolete-variable-alias 'hi-lock-face-history
+                                'hi-lock-face-defaults "23.1")
 (defvar hi-lock-face-defaults
   '("hi-yellow" "hi-pink" "hi-green" "hi-blue" "hi-black-b"
     "hi-blue-b" "hi-red-b" "hi-green-b" "hi-black-hb")
   "Default faces for hi-lock interactive functions.")
 
-;(dolist (f hi-lock-face-defaults) (unless (facep f) (error "%s not a face" f)))
-
-(define-obsolete-variable-alias 'hi-lock-face-history
-                                'hi-lock-face-defaults
-                                "23.1")
+;;(dolist (f hi-lock-face-defaults)
+;;  (unless (facep f) (error "%s not a face" f)))
 
 (define-obsolete-variable-alias 'hi-lock-regexp-history
                                 'regexp-history
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index fe1b63f3048..45986591499 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -209,7 +209,7 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1))
     ;; due to matching filenames via \\(.*?\\).  This might be faster.
     (maven
      ;; Maven is a popular free software build tool for Java.
-     "\\([0-9]*[^0-9\n]\\(?:[^\n :]\\| [^-/\n]\\|:[^ \n]\\)*?\\):\\[\\([0-9]+\\),\\([0-9]+\\)\\] " 1 2 3)
+     "\\([^ \n]\\(?:[^\n :]\\| [^-/\n]\\|:[^ \n]\\)*?\\):\\[\\([0-9]+\\),\\([0-9]+\\)\\] " 1 2 3)
 
     (jikes-line
      "^ *\\([0-9]+\\)\\.[ \t]+.*\n +\\(<-*>\n\\*\\*\\* \\(?:Error\\|Warnin\\(g\\)\\)\\)"
diff --git a/test/ChangeLog b/test/ChangeLog
index f05c94152a3..ba6162ca241 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,7 @@
+2012-05-21  Glenn Morris  <rgm@gnu.org>
+
+        * automated/Makefile.in (setwins): Scrap superfluous subshell.
+
 2012-05-15  Teodor Zlatanov  <tzz@lifelogs.com>
 
         * automated/url-util-tests.el: New file to test
diff --git a/test/automated/Makefile.in b/test/automated/Makefile.in
index c07d5a1897d..4f2e8a59e49 100644
--- a/test/automated/Makefile.in
+++ b/test/automated/Makefile.in
@@ -48,7 +48,7 @@ BYTE_COMPILE_EXTRA_FLAGS =
 emacs = EMACSLOADPATH=$(lispsrc):$(test) LC_ALL=C $(EMACS) $(EMACSOPT)
 
 # Common command to find subdirectories
-setwins=subdirs=`(find . -type d -print)`; \
+setwins=subdirs=`find . -type d -print`; \
         for file in $$subdirs; do \
            case $$file in */.* | */.*/* | */=* ) ;; \
                 *) wins="$$wins $$file" ;; \
diff --git a/test/automated/compile-tests.el b/test/automated/compile-tests.el
index ad36c4296b4..ecd0e8856f7 100644
--- a/test/automated/compile-tests.el
+++ b/test/automated/compile-tests.el
@@ -199,6 +199,8 @@
     ;; maven
     ("FooBar.java:[111,53] no interface expected here"
      1 53 111 "FooBar.java")
+    ("  [ERROR] /Users/cinsk/hello.java:[651,96] ';' expected"
+     15 96 651 "/Users/cinsk/hello.java") ;Bug#11517.
     ;; mips-1 mips-2
     ("TrimMask (255) in solomon.c may be indistinguishable from TrimMasks (93) in solomo.c due to truncation"
      11 nil 255 "solomon.c")