commit/haskell-mode: sperber: Merge upstream font-lock fix.