procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't redeem scroll bars that have been turned off.

Browse source 
* 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.
This commit is contained in:
Martin Rudalics 2014-08-05 10:25:28 +02:00
parent 38c4a53e42
commit 805318e130
3 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ChangeLog
View file

@ -1,3 +1,9 @@
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

4
src/w32term.c
View file

@ -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. */

4
src/xterm.c
View file

@ -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. */