*** empty log message ***

diff --git a/Changes b/Changes
index d3a1139d6026edfe7f4a167033180acf70af139e..b1fc9dee9150bfef81f1870932d2eb125754a6fd 100644 (file)
--- a/Changes
+++ b/Changes
@@ -5,7 +5,6 @@ TODO: overlays collide with the way the out-of-focus cursor is being drawn
 TODO: simplify selection_request and make it callable from perl.
 TODO: split perl documentation and urxvt.pm into separate files
 TODO: harmonize --disable-options into position-dependent options.
-TODO: after requesting the selection and getting a timeout, no further requests will be sent.
 TODO: "slow" rendering mode for bidi and scripts
 TODO: read property sequence is broken with respect to utf-8 etc.
 WISH: anyevent mouse notification / manage MotionMask better.

diff --git a/src/xdefaults.C b/src/xdefaults.C
index 888c5f75663300e7fcac1f79079682ec3f46f2e4..6b64bb2b38c3a3305d0947ae4dc907ff9ee0e890 100644 (file)
--- a/src/xdefaults.C
+++ b/src/xdefaults.C
@@ -323,33 +323,6 @@ static const char optionsstring[] = "options: "
 #if defined(USE_XIM)
                                     "XIM,"
 #endif
-                                    "scrollbars="
-#if !defined(HAVE_SCROLLBARS)
-                                    "NONE"
-#else
-# if defined(PLAIN_SCROLLBAR)
-                                    "plain"
-#  if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
-                                    "+"
-#  endif
-# endif
-# if defined(RXVT_SCROLLBAR)
-                                    "rxvt"
-#  if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
-                                    "+"
-#  endif
-# endif
-# if defined(NEXT_SCROLLBAR)
-                                    "NeXT"
-#  if defined(XTERM_SCROLLBAR)
-                                    "+"
-#  endif
-# endif
-# if defined(XTERM_SCROLLBAR)
-                                    "xterm"
-# endif
-#endif
-                                    ","
 #if defined(NO_BACKSPACE_KEY)
                                     "no_backspace,"
 #endif
@@ -383,7 +356,32 @@ static const char optionsstring[] = "options: "
 #if defined(NO_RESOURCES)
                                     "NoResources,"
 #endif
-                                    "v" VERSION
+                                    "scrollbars="
+#if !defined(HAVE_SCROLLBARS)
+                                    "NONE"
+#else
+# if defined(PLAIN_SCROLLBAR)
+                                    "plain"
+#  if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
+                                    "+"
+#  endif
+# endif
+# if defined(RXVT_SCROLLBAR)
+                                    "rxvt"
+#  if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
+                                    "+"
+#  endif
+# endif
+# if defined(NEXT_SCROLLBAR)
+                                    "NeXT"
+#  if defined(XTERM_SCROLLBAR)
+                                    "+"
+#  endif
+# endif
+# if defined(XTERM_SCROLLBAR)
+                                    "xterm"
+# endif
+#endif
                                     "\nUsage: ";               /* Usage */
 
 #define INDENT 18