merge from trunk

3 files changed, 18 insertions, 2 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index 21b22425fb6..85119db69f2 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,9 @@
+2013-09-15  Glenn Morris  <rgm@gnu.org>
+
+        * automated/eshell.el (eshell-test/for-name-shadow-loop):
+        New test.  (Bug#15372)
+        (eshell-test/for-loop, eshell-test/for-name-loop): Doc fix.
+
 2013-09-13  Glenn Morris  <rgm@gnu.org>
 
         * automated/eshell.el (with-temp-eshell):
diff --git a/test/automated/eshell.el b/test/automated/eshell.el
index b9eb31660f1..6f7a35371a6 100644
--- a/test/automated/eshell.el
+++ b/test/automated/eshell.el
@@ -75,17 +75,23 @@
   (should (equal (eshell-test-command-result "(+ 1 2)") 3)))
 
 (ert-deftest eshell-test/for-loop ()
-  "Test `eshell-command-result' with an elisp command."
+  "Test `eshell-command-result' with a for loop.."
   (let ((process-environment (cons "foo" process-environment)))
     (should (equal (eshell-test-command-result
                     "for foo in 5 { echo $foo }") 5))))
 
 (ert-deftest eshell-test/for-name-loop () ;Bug#15231
-  "Test `eshell-command-result' with an elisp command."
+  "Test `eshell-command-result' with a for loop using `name'."
   (let ((process-environment (cons "name" process-environment)))
     (should (equal (eshell-test-command-result
                     "for name in 3 { echo $name }") 3))))
 
+(ert-deftest eshell-test/for-name-shadow-loop () ; bug#15372
+  "Test `eshell-command-result' with a for loop using an env-var."
+  (let ((process-environment (cons "name=env-value" process-environment)))
+    (should (equal (eshell-test-command-result
+                    "for name in 3 { echo $name }") 3))))
+
 (ert-deftest eshell-test/lisp-command-args ()
   "Test `eshell-command-result' with elisp and trailing args.
 Test that trailing arguments outside the S-expression are
diff --git a/test/indent/ruby.rb b/test/indent/ruby.rb
index af1bbb9d8ab..6c9b9775b48 100644
--- a/test/indent/ruby.rb
+++ b/test/indent/ruby.rb
@@ -71,3 +71,7 @@ end
 if something == :==
   do_something
 end
+
+# Bug#15369
+MSG = 'Separate every 3 digits in the integer portion of a number' \
+  'with underscores(_).'