Merge from default
Merge from coroutine
Remove raw CR's from *rc -- it confuses the parser in windows
colors: Haskell, ini, iptables, java, joerc
Fix ^X ^F and ^X ^B in jmacs
Add in history from the patch; restore jsf files
Add options to j*rc.in files. Remove unused functions in colors.c
Add color, highlight-line options to the other rc files