[Emacs-diffs] trunk r116410: lisp/frameset.el (frameset--jump-to-register): Fix bug#16696.

[Juanma Barranquero]

------------------------------------------------------------
revno: 116410
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/16696
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Tue 2014-02-11 21:48:23 +0100
message:
  lisp/frameset.el (frameset--jump-to-register): Fix bug#16696.
  Select the required window and buffer before restoring position.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/frameset.el               frameset.el-20130802043218-tfwraxv1c2zlibpw-1

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-02-11 11:16:38 +0000
+++ b/lisp/ChangeLog    2014-02-11 20:48:23 +0000
@@ -1,3 +1,8 @@
+2014-02-11  Juanma Barranquero  <address@hidden>
+
+       * frameset.el (frameset--jump-to-register): Select the required
+       window and buffer before restoring position (bug#16696).
+
 2014-02-11  Lars Ingebrigtsen  <address@hidden>
 
        * dired.el (dired-get-marked-files): Clarify doc (bug#11534).

=== modified file 'lisp/frameset.el'
--- a/lisp/frameset.el  2014-02-03 07:56:44 +0000
+++ b/lisp/frameset.el  2014-02-11 20:48:23 +0000
@@ -522,7 +522,6 @@
 Frame parameters not on this alist are passed intact, as if they were
 defined with ACTION = nil.")
 
-
 (defvar frameset--target-display nil
   ;; Either (minibuffer . VALUE) or nil.
   ;; This refers to the current frame config being processed inside
@@ -1217,7 +1216,12 @@
     (let ((frame (frameset-frame-with-id (aref data 1))))
       (when frame
        (select-frame-set-input-focus frame)
-       (goto-char (aref data 2))))))
+       (let* ((position (aref data 2))
+              (buffer (marker-buffer position))
+              (window (get-buffer-window buffer frame)))
+         (when (and window (window-live-p window))
+           (set-frame-selected-window frame window)
+           (with-current-buffer buffer (goto-char position))))))))
 
 ;;;###autoload
 (defun frameset-to-register (register)