new hacks
merge
emacs/lib