Skip to content

Commit 084fea0

Browse files
committed
Officially require Emacs 25.3.
This change updates the startup check to reject versions older than 25.3 instead of 24.3 and documents the change. Also removes some backward-compatibility code that was necessary to run the test under Emacs 24..
1 parent 2d40c61 commit 084fea0

File tree

4 files changed

+11
-16
lines changed

4 files changed

+11
-16
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,8 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for more details.
132132

133133
## COMPATIBILITY
134134

135-
bash-completion.el is known to work with Bash 3, 4 and 5, on Emacs,
136-
starting with version 24.3, under Linux and OSX. It does not work on
135+
bash-completion.el is known to work with Bash 4 and 5, on Emacs,
136+
starting with version 25.3, under Linux and OSX. It does not work on
137137
XEmacs.
138138

139139
[new_issue]: https://github.com/szermatt/emacs-bash-completion/issues/new

bash-completion.el

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
;; Version: 3.1.0
88
;; Keywords: convenience, unix
99
;; URL: http://github.com/szermatt/emacs-bash-completion
10-
;; Package-Requires: ((emacs "24.3"))
10+
;; Package-Requires: ((emacs "25.3"))
1111

1212
;; This program is free software: you can redistribute it and/or
1313
;; modify it under the terms of the GNU General Public License as
@@ -99,8 +99,8 @@
9999

100100
;;; Compatibility:
101101

102-
;; bash-completion.el is known to work with Bash 3, 4 and 5, on Emacs,
103-
;; starting with version 24.3, under Linux and OSX. It does not work
102+
;; bash-completion.el is known to work with Bash 4 and 5, on Emacs,
103+
;; starting with version 25.3, under Linux and OSX. It does not work
104104
;; on XEmacs.
105105

106106
;;; History:
@@ -274,13 +274,13 @@ Bash processes.")
274274
"Value for the special PS1 prompt set for completions, quoted.")
275275

276276
(eval-when-compile
277-
(unless (or (and (= emacs-major-version 24) (>= emacs-minor-version 3))
278-
(>= emacs-major-version 25))
277+
(unless (or (and (= emacs-major-version 25) (>= emacs-minor-version 3))
278+
(>= emacs-major-version 26))
279279
(error
280280
(concat
281-
"Emacs version 24.3 or later is required to run emacs-bash-completion.\n"
282-
"Download emacs-bash-completion version 2.1 to run on older Emacs "
283-
"versions, from 22 to 24."))))
281+
"Emacs version 25.3 or later is required to run emacs-bash-completion.\n"
282+
"Download emacs-bash-completion version 2.1 to run on Emacs 22 and 23"
283+
"version 3.1.0 to run on Emacs 24."))))
284284

285285
(defvar bash-completion--debug-info nil
286286
"Alist that stores info about the last call to `bash-completion-send'.

test/bash-completion-integration-test.el

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -182,9 +182,7 @@ for testing completion."
182182
(defun bash-completion_test-teardown-env (test-env-dir)
183183
"Deletes everything `bash-completion_test-setup-env' set up."
184184
(when test-env-dir
185-
(if (>= emacs-major-version 24)
186-
(delete-directory test-env-dir 'recursive)
187-
(dired-delete-file test-env-dir 'always))))
185+
(delete-directory test-env-dir 'recursive)))
188186

189187
(defun bash-completion_test-equal-any-order (expected actual)
190188
"Compare a sorted list of string EXPECTED with ACTUAL.

test/bash-completion-test.el

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@
3232
(require 'cl-lib)
3333
(require 'ert)
3434

35-
; for Emacs 24.1
36-
(unless (fboundp 'cl-letf) (defalias 'cl-letf 'letf))
37-
3835
(defmacro bash-completion-test-with-buffer (content &rest body)
3936
"Create a temporary buffer with CONTENT and execute BODY.
4037

0 commit comments

Comments
 (0)