emacs changes; upgrade to java 7