2 files changed, 7 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3d608bb860b..f7bf7832488 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2010-07-13  Karl Fogel  <kfogel@red-bean.com>
+
+        * bookmark.el (bookmark-show-annotation): Ensure annotations show,
+        e.g. in Info bookmarks, by using `switch-to-buffer-other-window'.
+        Patch by Thierry Volpiatto (Bug#6444).
+
 2010-07-13  Chong Yidong  <cyd@stupidchicken.com>
 
         * frame.el (make-frame): Fix typo in 2010-06-30 change (Bug#6625).
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index d91c3ca46ee..b0d06f4e555 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -1741,7 +1741,7 @@ if an annotation exists."
             ;; (insert (concat "Annotation for bookmark '" bookmark "':\n\n"))
             (insert annotation)
             (goto-char (point-min))
-            (pop-to-buffer old-buf))))))
+            (switch-to-buffer-other-window old-buf))))))
 
 
 (defun bookmark-show-all-annotations ()