This fixes the Emacs keyboard shortcut problems that I noticed on my (Linux) system. In most cases the macros just needed to be updated to work with the current API. The align decls macro appeared to be unfinished. It should now work for simple two-token declarations.
emacs2.patch is a corrected version that makes an additional needed change to Emacs_Next_Line.bsh.