[422] in BarnOwl Developers
[D-O-H] r553 - in trunk: . owl
daemon@ATHENA.MIT.EDU (nelhage@MIT.EDU)
Thu Oct 29 18:05:59 2009
Resent-From: nelhage@mit.edu
Resent-To: barnowl-dev-mtg@charon.mit.edu
Date: Tue, 23 Jan 2007 18:36:25 -0500
To: dirty-owl-hackers@mit.edu
From: nelhage@MIT.EDU
Reply-To: dirty-owl-hackers@MIT.EDU
Author: nelhage
Date: 2007-01-23 18:36:24 -0500 (Tue, 23 Jan 2007)
New Revision: 553
Modified:
trunk/
trunk/owl/fmtext.c
Log:
r18169@phanatique: nelhage | 2007-01-23 18:34:01 -0500
tabs must die.
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- bb873fd7-8e23-0410-944a-99ec44c633eb:/branches/owl/filter-rewrite:15925
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/d-o-h/trunk:18166
+ bb873fd7-8e23-0410-944a-99ec44c633eb:/branches/owl/filter-rewrite:15925
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/d-o-h/trunk:18169
Modified: trunk/owl/fmtext.c
===================================================================
--- trunk/owl/fmtext.c 2007-01-23 23:26:44 UTC (rev 552)
+++ trunk/owl/fmtext.c 2007-01-23 23:36:24 UTC (rev 553)
@@ -697,31 +697,31 @@
short oldfg, oldbg;
pair_content(pair, &oldfg, &oldbg);
if (cpmgr->pairs[oldfg+1][oldbg] == pair) {
- cpmgr->pairs[oldfg+1][oldbg] = -1;
+ cpmgr->pairs[oldfg+1][oldbg] = -1;
}
init_pair(pair, fg, bg);
cpmgr->pairs[fg+1][bg] = pair;
cpmgr->used[pair] = 1;
} else {
- // Skip the first COLORS, sicne they're static.
+ // Skip the first COLORS, since they're static.
for(i = COLORS; i < COLOR_PAIRS; i++) {
- if (0 == cpmgr->used[i]) {
- pair = i;
- break;
- }
+ if (0 == cpmgr->used[i]) {
+ pair = i;
+ break;
+ }
}
if (pair != -1) {
- short oldfg, oldbg;
- pair_content(pair, &oldfg, &oldbg);
- if (cpmgr->pairs[oldfg+1][oldbg] == pair) {
- cpmgr->pairs[oldfg+1][oldbg] = -1;
- }
- init_pair(pair, fg, bg);
- cpmgr->pairs[fg+1][bg] = pair;
- cpmgr->used[pair] = 1;
+ short oldfg, oldbg;
+ pair_content(pair, &oldfg, &oldbg);
+ if (cpmgr->pairs[oldfg+1][oldbg] == pair) {
+ cpmgr->pairs[oldfg+1][oldbg] = -1;
+ }
+ init_pair(pair, fg, bg);
+ cpmgr->pairs[fg+1][bg] = pair;
+ cpmgr->used[pair] = 1;
} else {
- // Fail to skipping background.
- pair = fg;
+ // Fail to skipping background.
+ pair = fg;
}
}
}
