emacs and xmodmap fixes
emacs cpp improvements