I hope I am doing everything right, this is my first patch for Emacs.