Merge from emacs-24; up to 2014-06-06T02:22:[email protected]

3 files changed, 31 insertions, 0 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index 716e42ed95..b90f47631b 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-21  Fabián Ezequiel Gallina  <[email protected]>
+
+	* automated/python-tests.el (python-util-strip-string-1): New test.
+
 2014-06-15  Michael Albinus  <[email protected]>
 
 	Sync with Tramp 2.2.10.
diff --git a/test/automated/python-tests.el b/test/automated/python-tests.el
index de963a670b..f580e946b8 100644
--- a/test/automated/python-tests.el
+++ b/test/automated/python-tests.el
@@ -2706,6 +2706,15 @@ def foo(a, b, c):
         (equal (symbol-value (car ccons)) (cdr ccons)))))
     (kill-buffer buffer)))
 
+(ert-deftest python-util-strip-string-1 ()
+  (should (string= (python-util-strip-string "\t\r\n    str") "str"))
+  (should (string= (python-util-strip-string "str \n\r") "str"))
+  (should (string= (python-util-strip-string "\t\r\n    str \n\r ") "str"))
+  (should
+   (string= (python-util-strip-string "\n str \nin \tg \n\r") "str \nin \tg"))
+  (should (string= (python-util-strip-string "\n \t \n\r ") ""))
+  (should (string= (python-util-strip-string "") "")))
+
 
 ;;; Electricity
 
diff --git a/test/indent/shell.sh b/test/indent/shell.sh
index fdf736e06b..8e831bb8f1 100755
--- a/test/indent/shell.sh
+++ b/test/indent/shell.sh
@@ -23,6 +23,24 @@ case $X in
         ;;
 esac
 
+{				# bug#17621
+    foo1 &&
+	foo2 &&
+        bar
+
+    foo1 &&     \
+        foo2 && \
+        bar
+}
+
+for foo in bar; do              #  bug#17721
+    [ -e $foo ] && {
+        echo t
+    } && {
+	echo r
+    }
+done
+
 echo -n $(( 5 << 2 ))
 # This should not be treated as a heredoc (bug#12770).
 2