Changeset 2994ca2

Timestamp:

Jul 24, 2011, 5:18:27 PM (13 years ago)

Author:

GitHub Merge Button <merge-button@github.com>

Parents:

7abfcf2 (diff), 1314e49 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge 1314e4984b5e0326d385bdc2aebb7903f3583f67 into 7abfcf2abcef37025bc4c07654f96ccce56aabe3

Files:

• variable.c (modified) (1 diff)
• fmtext.c (modified) (1 diff)

variable.c

@@ -166 +166 @@
   OWLVAR_ENUM_FULL( "disable-ctrl-d" /* %OwlVarStub:lockout_ctrld */, 1,
                     "don't send zephyrs on C-d",
-                    "If set to 'off', C-d won't send a zephyr from the edit\n"
-                    "window.  If set to 'on', C-d will always send a zephyr\n"
+                    "If set to 'on', C-d won't send a zephyr from the edit\n"
+                    "window.  If set to 'off', C-d will always send a zephyr\n"
                     "being composed in the edit window.  If set to 'middle',\n"
                     "C-d will only ever send a zephyr if the cursor is at\n"

fmtext.c

@@ -186 +186 @@
 static void _owl_fmtext_wcolor_set(WINDOW *w, short pair)
 {
+  cchar_t background;
+  wchar_t blank[2] = { ' ', 0 };
   if (has_colors()) {
-      wcolor_set(w,pair,NULL);
-      wbkgdset(w, COLOR_PAIR(pair));
+      wcolor_set(w, pair, NULL);
+      /* Set the background with wbkgrndset so that we can handle color-pairs
+       * past 256 on ncurses ABI 6 and later. */
+      setcchar(&background, blank, 0, pair, NULL);
+      wbkgrndset(w, &background);
   }
 }