Skip to content

Commit 24619e0

Browse files
committed
Require at least Emacs 24.1
1 parent a8d7a33 commit 24619e0

File tree

5 files changed

+10
-32
lines changed

5 files changed

+10
-32
lines changed

.travis.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ dist: trusty
44

55
env:
66
matrix:
7-
- EMACS=emacs23 TARGET=check
87
- EMACS=emacs24 TARGET=check
98
- EMACS=emacs-snapshot TARGET=check
109
- TARGET=deploy-manual
@@ -16,10 +15,6 @@ matrix:
1615
- env: EMACS=emacs-snapshot TARGET=check
1716

1817
install:
19-
- if [ "$EMACS" = "emacs23" ]; then
20-
sudo apt-get update &&
21-
sudo apt-get install --no-install-suggests --no-install-recommends --assume-yes emacs23-nox;
22-
fi
2318
- if [ "$EMACS" = "emacs24" ]; then
2419
sudo apt-get update &&
2520
sudo apt-get install --no-install-suggests --no-install-recommends --assume-yes emacs24-nox;

README.md

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,7 @@ for setup and user guide.
6565

6666
## Installation - more information
6767

68-
`haskell-mode` supports GNU Emacs versions 23, 24 and upcoming 25
69-
(snapshot).
68+
`haskell-mode` supports GNU Emacs version 24 or later.
7069

7170
`haskell-mode` is available from [melpa-stable](http://stable.melpa.org) (releases) and [melpa](http://melpa.org)
7271
(git snapshots).
@@ -75,18 +74,6 @@ Other means of obtaining `haskell-mode` include
7574
[el-get](https://github.com/dimitri/el-get),
7675
[Emacs Prelude](https://github.com/bbatsov/prelude) and [Debian package](https://packages.debian.org/search?keywords=haskell-mode).
7776

78-
Emacs23 requires an the use of "cl-lib". cl-lib.el can be found in
79-
the tests/compat directory. Copy cl-lib.el to your emacs
80-
directory, e.g. ~/.emacs.d directory and put
81-
82-
```el
83-
(add-to-list 'load-path "~/.emacs.d/")
84-
(require 'cl-lib)
85-
```
86-
87-
in your .emacs file.
88-
89-
9077
## Installation from git repository
9178

9279
Running `haskell-mode` directly from sources is easy but

doc/haskell-mode.texi

Lines changed: 5 additions & 12 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-
23 or later. It provides syntax-based indentation, font locking,
45+
24 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

@@ -156,7 +156,7 @@ source code in color now.
156156

157157
@section Installation - more information
158158

159-
@code{haskell-mode} supports GNU Emacs versions 23, 24 and upcoming 25
159+
@code{haskell-mode} supports GNU Emacs versions 24 and upcoming 25
160160
(snapshot).
161161

162162
@code{haskell-mode} is available from @uref{http://stable.melpa.org,melpa-stable (releases)} and @uref{http://melpa.org, melpa
@@ -166,16 +166,9 @@ Other means of obtaining `haskell-mode` include
166166
@uref{https://github.com/dimitri/el-get, el-get},
167167
@uref{https://github.com/bbatsov/prelude, Emacs Prelude}) and @uref{https://packages.debian.org/search?keywords=haskell-mode, Debian package}.
168168

169-
Emacs23 requires an the use of @code{cl-lib}. cl-lib.el can be found in
170-
the tests/compat directory. Copy cl-lib.el to your emacs
171-
directory, e.g. ~/.emacs.d directory and put
172-
173-
@lisp
174-
(add-to-list 'load-path "~/.emacs.d/")
175-
(require 'cl-lib)
176-
@end lisp
177-
178-
in your .emacs file.
169+
Last version of haskell-mode that supported Emacs 23 is haskell-mode
170+
13.18 available at
171+
@uref{https://github.com/haskell/haskell-mode/releases/tag/v13.18}.
179172

180173
@section Customizing
181174

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-
'((cl-lib "0.5"))
2+
'((emacs "24.1") (cl-lib "0.5"))
33
:url "https://github.com/haskell/haskell-mode"
44
:keywords '("haskell" "cabal" "ghc" "repl"))
55
;; Local Variables:

haskell-mode.el

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -634,6 +634,9 @@ Minor modes that work well with `haskell-mode':
634634
- `smerge-mode': show and work with diff3 conflict markers used
635635
by git, svn and other version control systems."
636636
:group 'haskell
637+
(when (< emacs-major-version 24)
638+
(error "haskell-mode requires at least Emacs 24"))
639+
637640
;; paragraph-{start,separate} should treat comments as paragraphs as well.
638641
(set (make-local-variable 'paragraph-start)
639642
(concat " *{-\\| *-- |\\|" page-delimiter))

0 commit comments

Comments
 (0)