Removed a function provided by the wonderful emacs
Updated documentation to match new API
Pre-merge checkin