1 files changed, 2 insertions, 1 deletions

diff --git a/src/window.c b/src/window.c
index 1198b05a84a..e064aa440f0 100644
--- a/src/window.c
+++ b/src/window.c
@@ -620,7 +620,8 @@ DEFUN ("set-window-point", Fset_window_point, Sset_window_point, 2, 2, 0,
   register struct window *w = decode_window (window);
 
   CHECK_NUMBER_COERCE_MARKER (pos, 1);
-  if (w == XWINDOW (selected_window))
+  if (w == XWINDOW (selected_window)
+      && XBUFFER (w->buffer) == current_buffer)
     Fgoto_char (pos);
   else
     set_marker_restricted (w->pointm, pos, w->buffer);