From 805318e13086c01dd65dae86145441711a434581 Mon Sep 17 00:00:00 2001 From: Martin Rudalics Date: Tue, 5 Aug 2014 10:25:28 +0200 Subject: [PATCH] Don't redeem scroll bars that have been turned off. * w32term.c (w32_redeem_scroll_bar): * xterm.c (XTredeem_scroll_bar): Revert part of last change by not redeeming scroll bars that have been turned off. --- src/ChangeLog | 6 ++++++ src/w32term.c | 4 ++-- src/xterm.c | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index d08cf69af8e..a5560f09e0f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2014-08-05 Martin Rudalics + + * w32term.c (w32_redeem_scroll_bar): + * xterm.c (XTredeem_scroll_bar): Revert part of last change by + not redeeming scroll bars that have been turned off. + 2014-08-05 Dmitry Antipov * keyboard.c (safe_run_hooks): Follow the convenient style to bind diff --git a/src/w32term.c b/src/w32term.c index 0ded4398949..dfda29fb903 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -4041,7 +4041,7 @@ w32_redeem_scroll_bar (struct window *w) if (NILP (w->vertical_scroll_bar) && NILP (w->horizontal_scroll_bar)) emacs_abort (); - if (!NILP (w->vertical_scroll_bar)) + if (!NILP (w->vertical_scroll_bar) && WINDOW_HAS_VERTICAL_SCROLL_BAR (w)) { bar = XSCROLL_BAR (w->vertical_scroll_bar); /* Unlink it from the condemned list. */ @@ -4076,7 +4076,7 @@ w32_redeem_scroll_bar (struct window *w) } horizontal: - if (!NILP (w->horizontal_scroll_bar)) + if (!NILP (w->horizontal_scroll_bar) && WINDOW_HAS_HORIZONTAL_SCROLL_BAR (w)) { bar = XSCROLL_BAR (w->horizontal_scroll_bar); /* Unlink it from the condemned list. */ diff --git a/src/xterm.c b/src/xterm.c index b106c51c01c..4ec38cfc5c6 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -5948,7 +5948,7 @@ XTredeem_scroll_bar (struct window *w) if (NILP (w->vertical_scroll_bar) && NILP (w->horizontal_scroll_bar)) emacs_abort (); - if (!NILP (w->vertical_scroll_bar)) + if (!NILP (w->vertical_scroll_bar) && WINDOW_HAS_VERTICAL_SCROLL_BAR (w)) { bar = XSCROLL_BAR (w->vertical_scroll_bar); /* Unlink it from the condemned list. */ @@ -5983,7 +5983,7 @@ XTredeem_scroll_bar (struct window *w) } horizontal: - if (!NILP (w->horizontal_scroll_bar)) + if (!NILP (w->horizontal_scroll_bar) && WINDOW_HAS_HORIZONTAL_SCROLL_BAR (w)) { bar = XSCROLL_BAR (w->horizontal_scroll_bar); /* Unlink it from the condemned list. */ -- 2.39.5