From: Glenn Morris <rgm@gnu.org>
Date: Mon, 17 Nov 2014 18:55:02 +0000 (-0500)
Subject: * test/automated/occur-tests.el (occur-tests): Update for output change
X-Git-Tag: emacs-25.0.90~2635^2~437^2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5813f93cab1a81eba6eef735add5ca7cb1d15e8e;p=emacs.git

* test/automated/occur-tests.el (occur-tests): Update for output change
re control-chars.
---

diff --git a/test/ChangeLog b/test/ChangeLog
index 42fcd8e934a..fb004103cf8 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -2,6 +2,7 @@
 
 	* automated/occur-tests.el (occur-test-case, occur-test-create):
 	In case of failure, show the actual string, rather than just nil.
+	(occur-tests): Update for apparent change in output re control-chars.
 
 2014-11-17  Ulf Jasper  <ulf.jasper@web.de>
 
diff --git a/test/automated/occur-tests.el b/test/automated/occur-tests.el
index c00b71dd05f..5b90dab494c 100644
--- a/test/automated/occur-tests.el
+++ b/test/automated/occur-tests.el
@@ -52,7 +52,7 @@ a
 a
 a
 " "\
-2 matches for \"a^Ja\" in buffer:  *test-occur*
+2 matches for \"a\na\" in buffer:  *test-occur*
       1:a
        :a
       3:a
@@ -68,7 +68,7 @@ c
 a
 b
 " "\
-2 matches for \"a^Jb\" in buffer:  *test-occur*
+2 matches for \"a\nb\" in buffer:  *test-occur*
       1:a
        :b
       4:a
@@ -82,7 +82,7 @@ c
 a
 
 " "\
-2 matches for \"a^J\" in buffer:  *test-occur*
+2 matches for \"a\n\" in buffer:  *test-occur*
       1:a
        :
       4:a
@@ -97,7 +97,7 @@ d
 ex
 fx
 " "\
-2 matches for \"x^J.x^J\" in buffer:  *test-occur*
+2 matches for \"x\n.x\n\" in buffer:  *test-occur*
       1:ax
        :bx
        :c
@@ -232,7 +232,7 @@ i
 jx
 kx
 " "\
-3 matches for \"x^J.x\" in buffer:  *test-occur*
+3 matches for \"x\n.x\" in buffer:  *test-occur*
       1:ax
        :bx
        :c
@@ -256,7 +256,7 @@ f
 gx
 hx
 " "\
-2 matches for \"x^J.x\" in buffer:  *test-occur*
+2 matches for \"x\n.x\" in buffer:  *test-occur*
       1:ax
        :bx
        :c