[Emacs-diffs] trunk r116446: frameset.el (frameset--jump-to-register): Check that buffer is live (bug#16749).

[Juanma Barranquero]

------------------------------------------------------------
revno: 116446
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/16749
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Sat 2014-02-15 05:16:46 +0100
message:
  frameset.el (frameset--jump-to-register): Check that buffer is live 
(bug#16749).
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/frameset.el               frameset.el-20130802043218-tfwraxv1c2zlibpw-1

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-02-15 03:58:38 +0000
+++ b/lisp/ChangeLog    2014-02-15 04:16:46 +0000
@@ -1,3 +1,8 @@
+2014-02-15  Juanma Barranquero  <address@hidden>
+
+       * frameset.el (frameset--jump-to-register): Check that buffer is live
+       (bug#16749).
+
 2014-02-15  Glenn Morris  <address@hidden>
 
        * info.el (info-initialize): Revert 2014-01-10 change.

=== modified file 'lisp/frameset.el'
--- a/lisp/frameset.el  2014-02-11 20:48:23 +0000
+++ b/lisp/frameset.el  2014-02-15 04:16:46 +0000
@@ -1213,15 +1213,14 @@
                      :filters frameset-session-filter-alist
                      :reuse-frames (if delete t :keep))
     (mapc #'iconify-frame iconify-list)
-    (let ((frame (frameset-frame-with-id (aref data 1))))
+    (let ((frame (frameset-frame-with-id (aref data 1)))
+         buffer window)
       (when frame
        (select-frame-set-input-focus frame)
-       (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))))))))
+       (when (and (buffer-live-p (setq buffer (marker-buffer (aref data 2))))
+                  (window-live-p (setq window (get-buffer-window buffer 
frame))))
+         (set-frame-selected-window frame window)
+         (with-current-buffer buffer (goto-char (aref data 2))))))))
 
 ;;;###autoload
 (defun frameset-to-register (register)