From 285f1858c328e250c78ec422a311a4b7fcc3d633 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Sat, 15 Feb 2014 05:16:46 +0100 Subject: [PATCH] frameset.el (frameset--jump-to-register): Check that buffer is live (bug#16749). --- lisp/ChangeLog | 5 +++++ lisp/frameset.el | 13 ++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9f8b55771bb..307f84c4116 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-02-15 Juanma Barranquero + + * frameset.el (frameset--jump-to-register): Check that buffer is live + (bug#16749). + 2014-02-15 Glenn Morris * info.el (info-initialize): Revert 2014-01-10 change. diff --git a/lisp/frameset.el b/lisp/frameset.el index aa8bb196fff..7fd027e9a53 100644 --- a/lisp/frameset.el +++ b/lisp/frameset.el @@ -1213,15 +1213,14 @@ Called from `jump-to-register'. Internal use only." :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) -- 2.39.2