emacs-nav "fork" for personal use. It contains patches I have/will submit to the orignal project.