Merge pull request #1602 from yuya373/master

Fix compilation error

Author: purcell

ghc-core.el

@@ -45,6 +45,9 @@
   :type 'string
   :group 'ghc-core)
 
+(define-obsolete-variable-alias 'ghc-core-create-options 'ghc-core-program-args
+  "haskell-mode 13.7")
+
 (defcustom ghc-core-program-args
   '("-O2")
   "Additional options to be passed to GHC when generating core output.
@@ -66,9 +69,6 @@ See `M-x manual-entry RET ghc' for more details."
   :type '(repeat (string :tag "Argument"))
   :group 'ghc-core)
 
-(define-obsolete-variable-alias 'ghc-core-create-options 'ghc-core-program-args
-  "haskell-mode 13.7")
-
 (defun ghc-core-clean-region (start end)
   "Remove commonly ignored annotations and namespace prefixes
 in the region between START and END."

inf-haskell.el

@@ -121,13 +121,13 @@ The format should be the same as for `compilation-error-regexp-alist'.")
 ;;; -> Make font lock work for strings, directories, hyperlinks
 ;;; -> Make font lock work for key words???
 
+(defvaralias 'inferior-haskell-mode-map 'inf-haskell-map)
+
 (defvar inf-haskell-map
   (let ((map (make-sparse-keymap)))
     (define-key map "\C-c\C-d" 'comint-kill-subjob)
     map))
 
-(defvaralias 'inferior-haskell-mode-map 'inf-haskell-map)
-
 (define-derived-mode inferior-haskell-mode comint-mode "Inf-Haskell"
   "Major mode for interacting with an inferior Haskell process."
   :group 'inferior-haskell