* src/xdisp.c (handle_invisible_prop): Fix ellipses at overlay string ends.

* test/redisplay-testsuite.el (test-redisplay): Use switch-to-buffer.

Fixes: debbugs:3874

2 files changed, 5 insertions, 1 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index cd7e9fd7ccc..c3183406ea2 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,7 @@
+2012-08-19  Chong Yidong  <cyd@gnu.org>
+
+        * redisplay-testsuite.el (test-redisplay): Use switch-to-buffer.
+
 2012-08-18  Chong Yidong  <cyd@gnu.org>
 
         * redisplay-testsuite.el (test-redisplay-4): New test (Bug#3874).
diff --git a/test/redisplay-testsuite.el b/test/redisplay-testsuite.el
index 99924daa3d9..39f81a13c60 100644
--- a/test/redisplay-testsuite.el
+++ b/test/redisplay-testsuite.el
@@ -260,7 +260,7 @@ static unsigned char x_bits[] = {0xff, 0x81, 0xbd, 0xa5, 0xa5, 0xbd, 0x81, 0xff
   (let ((buf (get-buffer "*Redisplay Test*")))
     (if buf
         (kill-buffer buf))
-    (pop-to-buffer (get-buffer-create "*Redisplay Test*"))
+    (switch-to-buffer (get-buffer-create "*Redisplay Test*"))
     (erase-buffer)
     (setq buffer-invisibility-spec
           '(test-redisplay--simple-invis