Commit 805318e1 authored by Martin Rudalics's avatar Martin Rudalics

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.
parent 38c4a53e
2014-08-05 Martin Rudalics <rudalics@gmx.at>
* 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 <dmantipov@yandex.ru>
* keyboard.c (safe_run_hooks): Follow the convenient style to bind
......
......@@ -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. */
......
......@@ -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. */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment