From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id aNuQA/Jmh2Ib5QAAbAwnHQ (envelope-from ) for ; Fri, 20 May 2022 12:01:22 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id UESVA/Jmh2LQcwAAauVa8A (envelope-from ) for ; Fri, 20 May 2022 12:01:22 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 85BE3ED53 for ; Fri, 20 May 2022 12:01:21 +0200 (CEST) Received: from localhost ([::1]:36508 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nrzRf-0005S3-Qm for larch@yhetil.org; Fri, 20 May 2022 06:01:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34838) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nrzRO-0005Ny-7a for bug-guix@gnu.org; Fri, 20 May 2022 06:01:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43714) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nrzRN-0003dr-Tt for bug-guix@gnu.org; Fri, 20 May 2022 06:01:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nrzRN-0006tK-Pn for bug-guix@gnu.org; Fri, 20 May 2022 06:01:01 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#55495: [PATCH v2] gnu: emacs-haskell-mode: Fix build. References: <87o7zvtf8z.fsf@taiju.info> In-Reply-To: <87o7zvtf8z.fsf@taiju.info> Resent-From: Taiju HIGASHI Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Fri, 20 May 2022 10:01:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55495 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 55495@debbugs.gnu.org Cc: Taiju HIGASHI Received: via spool by 55495-submit@debbugs.gnu.org id=B55495.165304081726422 (code B ref 55495); Fri, 20 May 2022 10:01:01 +0000 Received: (at 55495) by debbugs.gnu.org; 20 May 2022 10:00:17 +0000 Received: from localhost ([127.0.0.1]:37611 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nrzQe-0006s6-40 for submit@debbugs.gnu.org; Fri, 20 May 2022 06:00:16 -0400 Received: from mail-pf1-f174.google.com ([209.85.210.174]:34439) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nrzQb-0006rM-6W for 55495@debbugs.gnu.org; Fri, 20 May 2022 06:00:14 -0400 Received: by mail-pf1-f174.google.com with SMTP id a11so7372309pff.1 for <55495@debbugs.gnu.org>; Fri, 20 May 2022 03:00:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=taiju-info.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=QWJCDR+ZX0e84COvTVPdBxEv9F+po+TrZ8gcYKkpCT4=; b=sTDItt2h9e0Jt72n7tLJE9Wr7sbgTPbbGtq+HE4gcQe1O+nkVlR975z9SnCarBDtQE c5ciffdNutLjAMHlG2lsS/6mkvwo08Ocwt884PmjDvKkUHObaOIa8HELcgu6MdOfDiaB J/+CHJzSq1TYm8SD6wfJR3tbNsbYguCHpNLrJZ/7Jrrdze0GQ5OFR7ubYVj2AW3wwjvV hmwG42pZBFaxl69QqqwGR0z4VTdGFoh1WhMPfYU2MYcZrOwfTliSRQ4/9PxhfQ4VxdLg IPsVq8yq8mth2jCi/SdNF6noihCk40oHr1HfcFKBai5y7SO7hBwvoLDpkSwu8NbYAawB mXrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=QWJCDR+ZX0e84COvTVPdBxEv9F+po+TrZ8gcYKkpCT4=; b=6FHKakhuS2fwOYJOW6SJp0VphABKAjGGHYijaC2IlxXYI9sTH4VqKIf8/LZpl5Z5ok dRYOoesiKIBhJ93w0E8XTLSeyv+0tJKHuE3KjeypmzTzdagKsL7Ls/nbE6UHDNoawG+B C3XpHkIwcyozqhbBRDFRAdJwyrkA9DC9CNhGfk0ubT3YPl0IEGQLHOLD0ttOkIgh/pkl CSPlQnDrHajqVixVVGKKWvfTT1W5H+KhuffbfghgTyVtzbj60hEcUKK1PqMs1YAtzHts 0fLJll1sqzb5QYcuWrKUZsBTE02J6RgWksPu0npHFIFLPN7hZt43qeVwYV2SNQQdFVri F8Lw== X-Gm-Message-State: AOAM533dy5F9iPIxpv0zbrGluxHLV7TnKdVqO2bAO4VmdhkpsOuIU+8+ 6TzS9wA2NQ95EYyrlRTIhtz4mrdksmx2sMgc X-Google-Smtp-Source: ABdhPJyY07kN656YIBbMiiTmOQ1YONeh3P4OY9oCUno89f0bZeRYx+2RxP4KbGSZ5uhr4GX1FygcbQ== X-Received: by 2002:a05:6a00:1a44:b0:510:a043:3b09 with SMTP id h4-20020a056a001a4400b00510a0433b09mr9136167pfv.62.1653040806470; Fri, 20 May 2022 03:00:06 -0700 (PDT) Received: from Taix.flets-west.jp ([240b:253:ec40:2400:b7d1:436e:2d61:e925]) by smtp.gmail.com with ESMTPSA id u13-20020a17090a450d00b001df955c28f6sm1203814pjg.37.2022.05.20.03.00.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 May 2022 03:00:05 -0700 (PDT) From: Taiju HIGASHI Date: Fri, 20 May 2022 18:59:30 +0900 Message-Id: <20220520095930.3983-1-higashi@taiju.info> X-Mailer: git-send-email 2.36.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1653040881; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=QWJCDR+ZX0e84COvTVPdBxEv9F+po+TrZ8gcYKkpCT4=; b=ABfUzHgZHwRwPsXmbvIyb8DiuGzyxpR6iYYwk2TqZrSDKD9T3tVT9Js1z069c5fDYvwCpl 34AJgRyYt3IyZlFHisZiMJlZstsQ3B/b8927d8IRjT0yWi2D4710PwBlXsAmqvLfJKhvU7 L8LIvrHszSRbpdG/igTT/UdvZPs04KT90NE6wbQYFYpX5VtDZ2X4dhup2r1hnLBO0GnMjw /rEbPYxTAb/b6EoQGLrQvqRsLUl9GYrQ2/HD+qPo17IQZjQq2ujSO5Ea9hgrrrTrgkPRhf pxv2AlIXfvW2uN2Ee5UaBhf639Hp5faRgmJWwSyQmLk7FB1PtxFlso2j2Z1Gzg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1653040881; a=rsa-sha256; cv=none; b=QWMWqk88Zvz+Q/NYuAxqZvsqhyAITyLk3ciPz3UBTHhujbTQbPwXme559vuRCDDSC0NrcA PK1CiECZ2MZd1QQlQPbkFqfL6lWAtl0yn45OHZZSiflIo8tr/8rfzPihcNHlWhJPObVY1i 3x+HgIek7ecRYeOc9YmvhsMsb9ZNfdtxV0/AlPDgAF8Au9rwtDiXcSNEYHqf1L8DwMGQ0q xlSlGFi1q16eGhTMnUWEkqVlEDpXVDkAVGVDGrBio4Ds2c5T1YuPScLFsZ2kb70ABJVS6U +ao/xKt7mHtOZfVw53DPzhYiXe/U9DYqzuhKEXk9IK2z2J5DawDcrlbvlC3D0Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=taiju-info.20210112.gappssmtp.com header.s=20210112 header.b=sTDItt2h; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 2.46 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=taiju-info.20210112.gappssmtp.com header.s=20210112 header.b=sTDItt2h; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 85BE3ED53 X-Spam-Score: 2.46 X-Migadu-Scanner: scn0.migadu.com X-TUID: 9P6wPWPfkJKv * gnu/packages/emacs-xyz.scm (emacs-haskell-mode): Fix build. --- gnu/packages/emacs-xyz.scm | 14 +- .../emacs-haskell-mode-fix-tests.patch | 273 ++++++++++++++++++ 2 files changed, 286 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/emacs-haskell-mode-fix-tests.patch diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 529e9329d6..767a214641 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1553,7 +1553,12 @@ (define-public emacs-haskell-mode (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0zxbacqzr84krmhqpvzndnvlcjh1gs1x20ys0dykgd7chyhci5j5")))) + (base32 "0zxbacqzr84krmhqpvzndnvlcjh1gs1x20ys0dykgd7chyhci5j5")) + ;; Submitted for inclusion upstream. + ;; Not identical patches due to different target versions. + ;; (see: https://github.com/haskell/haskell-mode/pull/1780) + (patches + (search-patches "emacs-haskell-mode-fix-tests.patch")))) (propagated-inputs (list emacs-dash)) (native-inputs @@ -1572,6 +1577,13 @@ (define-public emacs-haskell-mode (guix build emacs-utils)) #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'disable-vc-handled-backends + (lambda _ + ;; Suppresses problems with git commands being called and tests + ;; failing. + (substitute* "tests/haskell-mode-tests.el" + (("\\(require 'haskell-test-utils\\)" all) + (string-append all " (setq vc-handled-backends nil)"))))) (delete 'configure) (add-before 'build 'pre-build (lambda* (#:key inputs #:allow-other-keys) diff --git a/gnu/packages/patches/emacs-haskell-mode-fix-tests.patch b/gnu/packages/patches/emacs-haskell-mode-fix-tests.patch new file mode 100644 index 0000000000..cc14d5ca60 --- /dev/null +++ b/gnu/packages/patches/emacs-haskell-mode-fix-tests.patch @@ -0,0 +1,273 @@ +diff --git a/haskell-cabal.el b/haskell-cabal.el +index a2de2ea..dd08ab6 100644 +--- a/haskell-cabal.el ++++ b/haskell-cabal.el +@@ -361,7 +361,8 @@ OTHER-WINDOW use `find-file-other-window'." + (defconst haskell-cabal-conditional-regexp "^[ \t]*\\(\\if\\|else\\|}\\)") + + (defun haskell-cabal-classify-line () +- "Classify the current line into 'section-header 'subsection-header 'section-data 'comment and 'empty '" ++ "Classify the current line into 'section-header 'subsection-header ++'section-data 'comment and 'empty '" + (save-excursion + (beginning-of-line) + (cond +@@ -494,7 +495,8 @@ OTHER-WINDOW use `find-file-other-window'." + ((equal component-type "benchmark") "bench")))) + + (defun haskell-cabal-enum-targets (&optional process-type) +- "Enumerate .cabal targets. PROCESS-TYPE determines the format of the returned target." ++ "Enumerate .cabal targets. PROCESS-TYPE determines the format of the ++returned target." + (let ((cabal-file (haskell-cabal-find-file)) + (process-type (if process-type process-type 'ghci))) + (when (and cabal-file (file-readable-p cabal-file)) +@@ -926,7 +928,9 @@ resulting buffer-content. Unmark line at the end." + (defun haskell-cabal-line-filename () + "Expand filename in current line according to the subsection type + +-Module names in exposed-modules and other-modules are expanded by replacing each dot (.) in the module name with a forward slash (/) and appending \".hs\" ++Module names in exposed-modules and other-modules are expanded by ++replacing each dot (.) in the module name with a forward slash (/) and ++appending \".hs\" + + Example: Foo.Bar.Quux ==> Foo/Bar/Quux.hs + +diff --git a/haskell-compile.el b/haskell-compile.el +index 667102c..2e808ed 100644 +--- a/haskell-compile.el ++++ b/haskell-compile.el +@@ -41,35 +41,40 @@ + + (defcustom haskell-compile-cabal-build-command + "cabal build --ghc-option=-ferror-spans" +- "Default build command to use for `haskell-cabal-build' when a cabal file is detected. ++ "Default build command to use for `haskell-cabal-build' when a cabal ++file is detected. + For legacy compat, `%s' is replaced by the cabal package top folder." + :group 'haskell-compile + :type 'string) + + (defcustom haskell-compile-cabal-build-alt-command + "cabal clean -s && cabal build --ghc-option=-ferror-spans" +- "Alternative build command to use when `haskell-cabal-build' is called with a negative prefix argument. ++ "Alternative build command to use when `haskell-cabal-build' is ++called with a negative prefix argument. + For legacy compat, `%s' is replaced by the cabal package top folder." + :group 'haskell-compile + :type 'string) + + (defcustom haskell-compile-stack-build-command + "stack build --fast" +- "Default build command to use for `haskell-stack-build' when a stack file is detected. ++ "Default build command to use for `haskell-stack-build' when a stack ++file is detected. + For legacy compat, `%s' is replaced by the stack package top folder." + :group 'haskell-compile + :type 'string) + + (defcustom haskell-compile-stack-build-alt-command + "stack clean && stack build --fast" +- "Alternative build command to use when `haskell-stack-build' is called with a negative prefix argument. ++ "Alternative build command to use when `haskell-stack-build' is ++called with a negative prefix argument. + For legacy compat, `%s' is replaced by the stack package top folder." + :group 'haskell-compile + :type 'string) + + (defcustom haskell-compile-command + "ghc -Wall -ferror-spans -fforce-recomp -c %s" +- "Default build command to use for `haskell-cabal-build' when no cabal or stack file is detected. ++ "Default build command to use for `haskell-cabal-build' when no ++cabal or stack file is detected. + The `%s' placeholder is replaced by the current buffer's filename." + :group 'haskell-compile + :type 'string) +@@ -82,9 +87,9 @@ The `%s' placeholder is replaced by the current buffer's filename." + + (defcustom haskell-compiler-type + 'auto +- "Controls whether to use cabal, stack, or ghc to compile. +- Auto (the default) means infer from the presence of a cabal or stack spec file, +- following same rules as haskell-process-type." ++ "Controls whether to use cabal, stack, or ghc to compile. Auto (the ++ default) means infer from the presence of a cabal or stack spec ++ file, following same rules as haskell-process-type." + :type '(choice (const auto) (const ghc) (const stack) (const cabal)) + :group 'haskell-compile) + (make-variable-buffer-local 'haskell-compiler-type) +diff --git a/haskell-customize.el b/haskell-customize.el +index c316de2..235a3c4 100644 +--- a/haskell-customize.el ++++ b/haskell-customize.el +@@ -172,7 +172,8 @@ pass additional flags to `ghc'." + + (defcustom haskell-process-do-cabal-format-string + ":!cd %s && %s" +- "The way to run cabal comands. It takes two arguments -- the directory and the command. ++ "The way to run cabal comands. It takes two arguments -- the ++directory and the command. + See `haskell-process-do-cabal' for more details." + :group 'haskell-interactive + :type 'string) +@@ -241,7 +242,8 @@ is a member of the hidden package, blah blah." + + (defcustom haskell-process-suggest-overloaded-strings + t +- "Suggest adding OverloadedStrings pragma to file when getting type mismatches with [Char]." ++ "Suggest adding OverloadedStrings pragma to file when getting type ++mismatches with [Char]." + :type 'boolean + :group 'haskell-interactive) + +@@ -409,9 +411,9 @@ imports." + presence of a *.cabal file or stack.yaml file or something similar.") + + (defun haskell-build-type () +- "Looks for cabal and stack spec files. +- When found, returns a pair (TAG . DIR) +- where TAG is 'cabal-project, 'cabal-sandbox. 'cabal, or 'stack; ++ "Looks for cabal and stack spec files. ++ When found, returns a pair (TAG . DIR) ++ where TAG is 'cabal-project, 'cabal-sandbox. 'cabal, or 'stack; + and DIR is the directory containing cabal or stack file. + When none found, DIR is nil, and TAG is 'ghc" + ;; REVIEW maybe just 'cabal is enough. +diff --git a/haskell-indent.el b/haskell-indent.el +index afa5585..83eb1de 100644 +--- a/haskell-indent.el ++++ b/haskell-indent.el +@@ -435,7 +435,8 @@ Returns the location of the start of the comment, nil otherwise." + (haskell-indent-skip-blanks-and-newlines-forward end)))) + + (defun haskell-indent-next-symbol-safe (end) +- "Puts point to the next following symbol, or to end if there are no more symbols in the sexp." ++ "Puts point to the next following symbol, or to end if there are no ++more symbols in the sexp." + (condition-case _errlist (haskell-indent-next-symbol end) + (error (goto-char end)))) + +diff --git a/haskell-interactive-mode.el b/haskell-interactive-mode.el +index f4fb325..ae5fcd3 100644 +--- a/haskell-interactive-mode.el ++++ b/haskell-interactive-mode.el +@@ -48,7 +48,7 @@ + "Mark used for the old beginning of the prompt.") + + (defun haskell-interactive-prompt-regex () +- "Generate a regex for searching for any occurrence of the prompt\ ++ "Generate a regex for searching for any occurrence of the prompt + at the beginning of the line. This should prevent any + interference with prompts that look like haskell expressions." + (concat "^" (regexp-quote haskell-interactive-prompt))) +diff --git a/haskell-lexeme.el b/haskell-lexeme.el +index 622f53f..198c994 100644 +--- a/haskell-lexeme.el ++++ b/haskell-lexeme.el +@@ -452,8 +452,10 @@ Possible results are: + - 'string: for strings literals + - 'char: for char literals + - 'number: for decimal, float, hexadecimal and octal number literals +-- 'template-haskell-quote: for a string of apostrophes for template haskell +-- 'template-haskell-quasi-quote: for a string of apostrophes for template haskell ++- 'template-haskell-quote: for a string of apostrophes for template ++ haskell ++- 'template-haskell-quasi-quote: for a string of apostrophes for ++ template haskell + + Note that for qualified symbols (match-string 1) returns the + unqualified identifier or symbol. Further qualification for +diff --git a/haskell-mode.el b/haskell-mode.el +index c20e66a..0cedf14 100644 +--- a/haskell-mode.el ++++ b/haskell-mode.el +@@ -1142,7 +1142,8 @@ successful, nil otherwise." + "2015-11-11") + + (defun haskell-mode-toggle-scc-at-point () +- "If point is in an SCC annotation, kill the annotation. Otherwise, try to insert a new annotation." ++ "If point is in an SCC annotation, kill the annotation. ++Otherwise, try to insert a new annotation." + (interactive) + (if (not (haskell-mode-try-kill-scc-at-point)) + (if (not (haskell-mode-try-insert-scc-at-point)) +@@ -1181,7 +1182,8 @@ Uses `haskell-guess-module-name-from-file-name'." + + (defvar haskell-auto-insert-module-format-string + "-- | \n\nmodule %s where\n\n" +- "Template string that will be inserted in new haskell buffers via `haskell-auto-insert-module-template'.") ++ "Template string that will be inserted in new haskell buffers via ++`haskell-auto-insert-module-template'.") + + (defun haskell-auto-insert-module-template () + "Insert a module template for the newly created buffer." +diff --git a/haskell-move-nested.el b/haskell-move-nested.el +index c4a7bd5..1339043 100644 +--- a/haskell-move-nested.el ++++ b/haskell-move-nested.el +@@ -34,7 +34,8 @@ + + ;;;###autoload + (defun haskell-move-nested (cols) +- "Shift the nested off-side-rule block adjacent to point by COLS columns to the right. ++ "Shift the nested off-side-rule block adjacent to point by COLS ++columns to the right. + + In Transient Mark mode, if the mark is active, operate on the contents + of the region instead. +diff --git a/haskell-process.el b/haskell-process.el +index 2ca131f..f1f5303 100644 +--- a/haskell-process.el ++++ b/haskell-process.el +@@ -205,7 +205,8 @@ HPTYPE is the result of calling `'haskell-process-type`' function." + t)) + + (defun haskell-process-send-string (process string) +- "Try to send a string to the process's process. Ask to restart if it's not running." ++ "Try to send a string to the process's process. Ask to restart if ++it's not running." + (let ((child (haskell-process-process process))) + (if (equal 'run (process-status child)) + (let ((out (concat string "\n"))) +diff --git a/haskell.el b/haskell.el +index a679b62..66e5f7e 100644 +--- a/haskell.el ++++ b/haskell.el +@@ -446,7 +446,7 @@ Give optional NEXT-P parameter to override value of + (list "build --ghc-options=-fforce-recomp")))))) + + (defun haskell-process-file-loadish (command reload-p module-buffer) +- "Run a loading-ish COMMAND that wants to pick up type errors\ ++ "Run a loading-ish COMMAND that wants to pick up type errors + and things like that. RELOAD-P indicates whether the notification + should say 'reloaded' or 'loaded'. MODULE-BUFFER may be used + for various things, but is optional." +diff --git a/inf-haskell.el b/inf-haskell.el +index e62b6ed..1bda90e 100644 +--- a/inf-haskell.el ++++ b/inf-haskell.el +@@ -74,7 +74,8 @@ directory structure." + + (defvar inferior-haskell-multiline-prompt-re + "^\\*?[[:upper:]][\\._[:alnum:]]*\\(?: \\*?[[:upper:]][\\._[:alnum:]]*\\)*| " +- "Regular expression for matching multiline prompt (the one inside :{ ... :} blocks).") ++ "Regular expression for matching multiline prompt (the one inside ++:{ ... :} blocks).") + + (defconst inferior-haskell-error-regexp-alist + `(;; Format of error messages used by GHCi. +diff --git a/w3m-haddock.el b/w3m-haddock.el +index 141cbf4..4ef6a88 100644 +--- a/w3m-haddock.el ++++ b/w3m-haddock.el +@@ -49,7 +49,9 @@ directories of package-name-x.x. + You can rebind this if you're using hsenv by adding it to your + .dir-locals.el in your project root. E.g. + +- ((haskell-mode . ((haskell-w3m-haddock-dirs . (\"/home/chris/Projects/foobar/.hsenv/cabal/share/doc\"))))) ++ ((haskell-mode . ++ ((haskell-w3m-haddock-dirs . ++ (\"/home/chris/Projects/foobar/.hsenv/cabal/share/doc\"))))) + + " + :group 'haskell -- 2.36.0