Skip to content

Commit 6338007

Browse files
committed
Officially support only Emacs 24.3 and later
1 parent cff017b commit 6338007

File tree

6 files changed

+8
-382
lines changed

6 files changed

+8
-382
lines changed

Makefile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ EMACS := $(shell which "$${EMACS}" || which "emacs")
2727
EMACS_VERSION := $(shell "$(EMACS)" -Q --batch --eval '(princ emacs-version)')
2828

2929
EFLAGS = --eval "(add-to-list 'load-path (expand-file-name \"tests/compat\") 'append)" \
30-
--eval "(when (< emacs-major-version 24) \
31-
(setq byte-compile-warnings '(not cl-functions)))" \
3230
--eval '(setq byte-compile-error-on-warn t)' \
3331
--eval '(when (not (version< emacs-version "24.4")) (setq load-prefer-newer t))' \
3432
--eval '(defun byte-compile-dest-file (filename) \
@@ -50,8 +48,8 @@ PKG_DIST_FILES = $(ELFILES) logo.svg NEWS haskell-mode.info dir
5048
all: check-emacs-version compile $(AUTOLOADS) info
5149

5250
check-emacs-version :
53-
@$(BATCH) --eval "(when (< emacs-major-version 23) \
54-
(message \"Error: haskell-mode requires Emacs 23 or later\") \
51+
@$(BATCH) --eval "(when (version< emacs-version \"24.3\") \
52+
(message \"Error: haskell-mode requires Emacs 24.3 or later\") \
5553
(message \"Your version of Emacs is %s\" emacs-version) \
5654
(message \"Found as '$(EMACS)'\") \
5755
(message \"Use one of:\") \

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ for setup and user guide.
6767

6868
## Installation - more information
6969

70-
`haskell-mode` supports GNU Emacs version 24 or later.
70+
`haskell-mode` supports GNU Emacs version 24.3 or later.
7171

7272
`haskell-mode` is available from [melpa-stable](http://stable.melpa.org) (releases) and [melpa](http://melpa.org)
7373
(git snapshots).

doc/haskell-mode.texi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Front-Cover Texts and no Back-Cover Texts.
4242
@top Haskell Mode
4343

4444
Haskell Mode is an Haskell development Environment for GNU Emacs version
45-
24 or later. It provides syntax-based indentation, font locking,
45+
24.3 or later. It provides syntax-based indentation, font locking,
4646
editing cabal files, and supports running an inferior Haskell
4747
interpreter (e.g. GHCi).
4848

@@ -167,7 +167,7 @@ The above steps should result in the following snippet in your @file{.emacs}:
167167

168168
@section Installation - more information
169169

170-
@code{haskell-mode} supports GNU Emacs versions 24 and upcoming 25
170+
@code{haskell-mode} supports GNU Emacs versions 24.3+, including 25
171171
(snapshot).
172172

173173
@code{haskell-mode} is available from

haskell-mode-pkg.el

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(define-package "haskell-mode" "16.1-git" "A Haskell editing mode"
2-
'((emacs "24.1") (cl-lib "0.5"))
2+
'((emacs "24.3"))
33
:url "https://github.com/haskell/haskell-mode"
44
:keywords '("haskell" "cabal" "ghc" "repl"))
55
;; Local Variables:

haskell-mode.el

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -786,8 +786,8 @@ Minor modes that work well with `haskell-mode':
786786
- `smerge-mode': show and work with diff3 conflict markers used
787787
by git, svn and other version control systems."
788788
:group 'haskell
789-
(when (< emacs-major-version 24)
790-
(error "haskell-mode requires at least Emacs 24"))
789+
(when (version< emacs-version "24.3")
790+
(error "haskell-mode requires at least Emacs 24.3"))
791791

792792
;; paragraph-{start,separate} should treat comments as paragraphs as well.
793793
(set (make-local-variable 'paragraph-start)

0 commit comments

Comments
 (0)