Fix zap-up-to-char
Update haskell-mode