Add aliases to provide backward compatibility

Author: Maxim Baz

haskell-commands.el

@@ -18,6 +18,7 @@
 ;;; Code:
 
 (require 'cl-lib)
+(require 'haskell-compat)
 (require 'xref)
 (require 'haskell-process)
 (require 'haskell-font-lock)

haskell-compat.el

@@ -31,6 +31,20 @@ A process is considered alive if its status is `run', `open',
     (memq (process-status process)
           '(run open listen connect stop))))
 
+;; Cross-referencing commands have been replaced since Emacs 25.1.
+;; These aliases are required to provide backward compatibility.
+(unless (require 'xref nil 'noerror)
+  (defalias 'xref-pop-marker-stack 'pop-tag-mark)
+
+  (defun xref-push-marker-stack ()
+    "Add point to the marker stack."
+    (require 'ring)
+    (defvar find-tag-marker-ring)
+
+    (ring-insert find-tag-marker-ring (point-marker)))
+
+  (provide 'xref))
+
 (provide 'haskell-compat)
 
 ;;; haskell-compat.el ends here

inf-haskell.el

@@ -32,6 +32,7 @@
 
 (require 'comint)
 (require 'shell)             ; For directory tracking.
+(require 'haskell-compat)
 (require 'xref)
 (require 'compile)
 (require 'haskell-mode)