Re: Several problems

[martin rudalics <rudalics@gmx.at>]

 > the horizontal scroll bar code crashing on me
 > whenever I restore the desktop (which involves restoring the window
 > configuration).
 >
 > _That_ crash would have been
 >
 > (gdb) bt
 > #0  0xb7fdd424 in __kernel_vsyscall ()
 > #1  0xb69460c6 in raise (sig=sig@entry=6)
 >      at ../nptl/sysdeps/unix/sysv/linux/pt-raise.c:37
 > #2  0x08124299 in terminate_due_to_signal (sig=sig@entry=6,
 >      backtrace_limit=backtrace_limit@entry=40) at ../../emacs/src/emacs.c:387
 > #3  0x0813cef7 in emacs_abort () at ../../emacs/src/sysdep.c:2198
 > #4  0x080f3e38 in XTredeem_scroll_bar (w=0x8752f30)
 >      at ../../emacs/src/xterm.c:5948
 > #5  0x0809dd4a in redisplay_window (window=window@entry=141897525,
 >      just_this_one_p=just_this_one_p@entry=false)
 >      at ../../emacs/src/xdisp.c:16839
 > #6  0x080a16be in redisplay_window_0 (window=141897525)
 >      at ../../emacs/src/xdisp.c:14250
[...]
 >
 > My Emacs is configured to use GTK but --without-toolkit-scroll-bars.
 > For now I've rewound my Emacs version to before the horizontal
 > scroll-bar commit since I would not be able to get any work done
 > otherwise.

As a first attempt could you please try the patch below?


=== modified file 'src/window.h'
--- src/window.h	2014-07-27 13:21:30 +0000
+++ src/window.h	2014-07-28 12:19:52 +0000
@@ -787,7 +787,7 @@

  /* Say whether horizontal scroll bars are currently enabled for window
     W.  Horizontal scrollbars exist for toolkit versions only.  */
-#if defined (USE_X_TOOLKIT) || defined (USE_GTK) || defined (HAVE_NTGUI)
+#if defined (USE_X_TOOLKIT) || (defined (USE_GTK) && defined (USE_TOOLKIT_SCROLL_BARS)) || defined (HAVE_NTGUI)
  #define WINDOW_HAS_HORIZONTAL_SCROLL_BAR(W)			\
    ((WINDOW_PSEUDO_P (W) || MINI_NON_ONLY_WINDOW_P (W))		\
     ? false							\


I'm afraid that desktop still won't work satisfactorily due to other
issues but maybe the crash gets fixed this way.

Thanks, martin