aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2014-11-17 13:55:02 -0500
committerGlenn Morris2014-11-17 13:55:02 -0500
commit5813f93cab1a81eba6eef735add5ca7cb1d15e8e (patch)
tree38abd6a1cf5bb2e9e6a017882dc6688d424d72f6
parent0eaf98e85afd670332454a089ad982190f86e05f (diff)
downloademacs-5813f93cab1a81eba6eef735add5ca7cb1d15e8e.tar.gz
emacs-5813f93cab1a81eba6eef735add5ca7cb1d15e8e.zip
* test/automated/occur-tests.el (occur-tests): Update for output change
re control-chars.
-rw-r--r--test/ChangeLog1
-rw-r--r--test/automated/occur-tests.el12
2 files changed, 7 insertions, 6 deletions
diff --git a/test/ChangeLog b/test/ChangeLog
index 42fcd8e934a..fb004103cf8 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -2,6 +2,7 @@
2 2
3 * automated/occur-tests.el (occur-test-case, occur-test-create): 3 * automated/occur-tests.el (occur-test-case, occur-test-create):
4 In case of failure, show the actual string, rather than just nil. 4 In case of failure, show the actual string, rather than just nil.
5 (occur-tests): Update for apparent change in output re control-chars.
5 6
62014-11-17 Ulf Jasper <ulf.jasper@web.de> 72014-11-17 Ulf Jasper <ulf.jasper@web.de>
7 8
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
52a 52a
53a 53a
54" "\ 54" "\
552 matches for \"a^Ja\" in buffer: *test-occur* 552 matches for \"a\na\" in buffer: *test-occur*
56 1:a 56 1:a
57 :a 57 :a
58 3:a 58 3:a
@@ -68,7 +68,7 @@ c
68a 68a
69b 69b
70" "\ 70" "\
712 matches for \"a^Jb\" in buffer: *test-occur* 712 matches for \"a\nb\" in buffer: *test-occur*
72 1:a 72 1:a
73 :b 73 :b
74 4:a 74 4:a
@@ -82,7 +82,7 @@ c
82a 82a
83 83
84" "\ 84" "\
852 matches for \"a^J\" in buffer: *test-occur* 852 matches for \"a\n\" in buffer: *test-occur*
86 1:a 86 1:a
87 : 87 :
88 4:a 88 4:a
@@ -97,7 +97,7 @@ d
97ex 97ex
98fx 98fx
99" "\ 99" "\
1002 matches for \"x^J.x^J\" in buffer: *test-occur* 1002 matches for \"x\n.x\n\" in buffer: *test-occur*
101 1:ax 101 1:ax
102 :bx 102 :bx
103 :c 103 :c
@@ -232,7 +232,7 @@ i
232jx 232jx
233kx 233kx
234" "\ 234" "\
2353 matches for \"x^J.x\" in buffer: *test-occur* 2353 matches for \"x\n.x\" in buffer: *test-occur*
236 1:ax 236 1:ax
237 :bx 237 :bx
238 :c 238 :c
@@ -256,7 +256,7 @@ f
256gx 256gx
257hx 257hx
258" "\ 258" "\
2592 matches for \"x^J.x\" in buffer: *test-occur* 2592 matches for \"x\n.x\" in buffer: *test-occur*
260 1:ax 260 1:ax
261 :bx 261 :bx
262 :c 262 :c