upstream

4 files changed, 26 insertions, 13 deletions

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\\)\\)\\)"