[Emacs-diffs] trunk r117648: Don't redeem scroll bars that have been turned off.

[Martin Rudalics]

------------------------------------------------------------
revno: 117648
revision-id: address@hidden
parent: address@hidden
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Tue 2014-08-05 10:25:28 +0200
message:
  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.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/w32term.c                  w32term.c-20091113204419-o5vbwnq5f7feedwu-950
  src/xterm.c                    xterm.c-20091113204419-o5vbwnq5f7feedwu-244

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-08-05 05:43:35 +0000
+++ b/src/ChangeLog     2014-08-05 08:25:28 +0000
@@ -1,3 +1,9 @@
+2014-08-05  Martin Rudalics  <address@hidden>
+
+       * 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  <address@hidden>
 
        * keyboard.c (safe_run_hooks): Follow the convenient style to bind

=== modified file 'src/w32term.c'
--- a/src/w32term.c     2014-08-04 16:47:27 +0000
+++ b/src/w32term.c     2014-08-05 08:25:28 +0000
@@ -4041,7 +4041,7 @@
   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 @@
     }
 
  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.  */

=== modified file 'src/xterm.c'
--- a/src/xterm.c       2014-08-04 16:47:27 +0000
+++ b/src/xterm.c       2014-08-05 08:25:28 +0000
@@ -5948,7 +5948,7 @@
   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 @@
     }
 
  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.  */