Switch from the obsolete "prompt2" GHCi option to prompt-cont

Closes #1555, #1689, see #1553.

Author: purcell

haskell-commands.el

@@ -119,8 +119,8 @@ You can create new session using function `haskell-session-make'."
                                                             '(":set +c"))) ; :type-at in GHC 8+
                                                   "\n"))
           (haskell-process-send-string process ":set prompt \"\\4\"")
-          (haskell-process-send-string process (format ":set prompt2 \"%s\""
-                                                       haskell-interactive-prompt2)))
+          (haskell-process-send-string process (format ":set prompt-cont \"%s\""
+                                                       haskell-interactive-prompt-cont)))
 
     :live (lambda (process buffer)
             (when (haskell-process-consume

haskell-customize.el

@@ -332,15 +332,17 @@ ambiguous class constraint."
   :type 'string
   :group 'haskell-interactive)
 
-(defcustom haskell-interactive-prompt2 (replace-regexp-in-string
-                                        "> $"
-                                        "| "
-                                        haskell-interactive-prompt)
+(defcustom haskell-interactive-prompt-cont (replace-regexp-in-string
+                                            "> $"
+                                            "| "
+                                            haskell-interactive-prompt)
   "The multi-line prompt to use.
 The default is `haskell-interactive-prompt' with the last > replaced with |."
   :type 'string
   :group 'haskell-interactive)
 
+(define-obsolete-variable-alias 'haskell-interactive-prompt2 'haskell-interactive-prompt-cont)
+
 (defcustom haskell-interactive-mode-eval-mode
   nil
   "Use the given mode's font-locking to render some text."

haskell-interactive-mode.el

@@ -130,11 +130,14 @@ be nil.")
   :group 'haskell-interactive)
 
 ;;;###autoload
-(defface haskell-interactive-face-prompt2
+(defface haskell-interactive-face-prompt-cont
   '((t :inherit font-lock-keyword-face))
-  "Face for the prompt2 in multi-line mode."
+  "Face for GHCi's prompt-cont in multi-line mode."
   :group 'haskell-interactive)
 
+;;;###autoload
+(define-obsolete-face-alias 'haskell-interactive-face-prompt2 'haskell-interactive-face-prompt-cont)
+
 ;;;###autoload
 (defface haskell-interactive-face-compile-error
   '((t :inherit compilation-error))
@@ -266,7 +269,7 @@ do the
               ":{\n"
               (mapconcat #'identity lines "\n")
               "\n:}\n"
-              (format ":set prompt2 \"%s\"" haskell-interactive-prompt2)))))
+              (format ":set prompt-cont \"%s\"" haskell-interactive-prompt-cont)))))
 
 (defun haskell-interactive-mode-line-is-query (line)
   "Is LINE actually a :t/:k/:i?"
@@ -330,10 +333,10 @@ SESSION, otherwise operate on the current buffer."
                                  'result t)))
       (save-excursion
         (goto-char (point-max))
-        (when (string= text haskell-interactive-prompt2)
+        (when (string= text haskell-interactive-prompt-cont)
           (setq prop-text
                 (propertize prop-text
-                            'font-lock-face 'haskell-interactive-face-prompt2
+                            'font-lock-face 'haskell-interactive-face-prompt-cont
                             'read-only haskell-interactive-prompt-read-only)))
         (insert (ansi-color-apply prop-text))
         (haskell-interactive-mode-handle-h)