31c31
< __FBSDID("$FreeBSD: head/sys/dev/syscons/scterm-teken.c 186681 2009-01-01 13:26:53Z ed $");
---
> __FBSDID("$FreeBSD: head/sys/dev/syscons/scterm-teken.c 188391 2009-02-09 15:55:21Z ed $");
51a52
> static unsigned int scteken_attr(const teken_attr_t *);
167a169
> teken_stat *ts = scp->ts;
168a171
> unsigned int attr;
172c175,176
< *(int*)data = SC_NORM_ATTR;
---
> *(int*)data =
> scteken_attr(teken_get_curattr(&ts->ts_teken));
175d178
< /* XXX: INCORRECT! */
179,182c182,187
< vi->mv_norm.fore = SC_NORM_ATTR & 0x0f;
< vi->mv_norm.back = (SC_NORM_ATTR >> 4) & 0x0f;
< vi->mv_rev.fore = SC_NORM_ATTR & 0x0f;
< vi->mv_rev.back = (SC_NORM_ATTR >> 4) & 0x0f;
---
>
> attr = scteken_attr(teken_get_defattr(&ts->ts_teken));
> vi->mv_norm.fore = attr & 0x0f;
> vi->mv_norm.back = (attr >> 4) & 0x0f;
> vi->mv_rev.fore = vi->mv_norm.back;
> vi->mv_rev.back = vi->mv_norm.fore;
283c288
< static inline unsigned int
---
> static unsigned int
303c308
< return (attr << 8);
---
> return (attr);
340c345
< attr = scteken_attr(a);
---
> attr = scteken_attr(a) << 8;
376c381
< attr = scteken_attr(a);
---
> attr = scteken_attr(a) << 8;