From c6dfd63b0ec04911f5a768d754b30663c7516db7 Mon Sep 17 00:00:00 2001 From: Artur Malabarba Date: Thu, 13 Nov 2014 02:51:30 +0000 Subject: Some more fixups from the merge --- sx-question-list.el | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'sx-question-list.el') diff --git a/sx-question-list.el b/sx-question-list.el index 726c58d..79b07be 100644 --- a/sx-question-list.el +++ b/sx-question-list.el @@ -277,8 +277,8 @@ focus the relevant window." (when (sx-question--read-p data) (cl-decf sx-question-list--unread-count) (sx-question--mark-read data)) - (unless (window-live-p sx-question--window) - (setq sx-question--window + (unless (window-live-p sx-question-mode--window) + (setq sx-question-mode--window (condition-case er (split-window-below sx-question-list-height) (error @@ -288,11 +288,11 @@ focus the relevant window." (car (cdr-safe er))) nil (error (cdr er))))))) - (sx-question-mode--display data sx-question--window) + (sx-question-mode--display data sx-question-mode--window) (when focus - (if sx-question--window - (select-window sx-question--window) - (switch-to-buffer sx-question--buffer)))) + (if sx-question-mode--window + (select-window sx-question-mode--window) + (switch-to-buffer sx-question-mode--buffer)))) (defvar sx-question-list--buffer nil "Buffer where the list of questions is displayed.") -- cgit v1.2.3