Changeset 2994ca2


Ignore:
Timestamp:
Jul 24, 2011, 5:18:27 PM (10 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:
2 edited

Legend:

Unmodified
Added
Removed
  • variable.c

    r6f7d4f6 r1314e49  
    166166  OWLVAR_ENUM_FULL( "disable-ctrl-d" /* %OwlVarStub:lockout_ctrld */, 1,
    167167                    "don't send zephyrs on C-d",
    168                     "If set to 'off', C-d won't send a zephyr from the edit\n"
    169                     "window.  If set to 'on', C-d will always send a zephyr\n"
     168                    "If set to 'on', C-d won't send a zephyr from the edit\n"
     169                    "window.  If set to 'off', C-d will always send a zephyr\n"
    170170                    "being composed in the edit window.  If set to 'middle',\n"
    171171                    "C-d will only ever send a zephyr if the cursor is at\n"
  • fmtext.c

    rd8f22b6 r7abfcf2  
    186186static void _owl_fmtext_wcolor_set(WINDOW *w, short pair)
    187187{
     188  cchar_t background;
     189  wchar_t blank[2] = { ' ', 0 };
    188190  if (has_colors()) {
    189       wcolor_set(w,pair,NULL);
    190       wbkgdset(w, COLOR_PAIR(pair));
     191      wcolor_set(w, pair, NULL);
     192      /* Set the background with wbkgrndset so that we can handle color-pairs
     193       * past 256 on ncurses ABI 6 and later. */
     194      setcchar(&background, blank, 0, pair, NULL);
     195      wbkgrndset(w, &background);
    191196  }
    192197}
Note: See TracChangeset for help on using the changeset viewer.