Module Name:	src
Committed By:	jdc
Date:		Sun Feb  2 17:54:39 UTC 2003

Modified Files:
	src/lib/libcurses: setterm.c

Log Message:
Redo the conflict calculation (again).
Assume that "me" clears all attributes apart from acs.
Problem noticed when working on window(1).


To generate a diff of this commit:
cvs rdiff -r1.35 -r1.36 src/lib/libcurses/setterm.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.