Contrib emacs24.3

Split this line up, it's too long.