[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/bash-completion 084fea092e 1/4: Officially require Emacs 2
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/bash-completion 084fea092e 1/4: Officially require Emacs 25.3. |
Date: |
Sun, 15 Jan 2023 13:58:29 -0500 (EST) |
branch: elpa/bash-completion
commit 084fea092e59767b15357c0b1b003c122975a875
Author: Stephane Zermatten <szermatt@gmx.net>
Commit: Stephane Zermatten <szermatt@gmx.net>
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..
---
README.md | 4 ++--
bash-completion.el | 16 ++++++++--------
test/bash-completion-integration-test.el | 4 +---
test/bash-completion-test.el | 3 ---
4 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/README.md b/README.md
index 29172628e6..67d6be170a 100644
--- a/README.md
+++ b/README.md
@@ -132,8 +132,8 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for more details.
## COMPATIBILITY
-bash-completion.el is known to work with Bash 3, 4 and 5, on Emacs,
-starting with version 24.3, under Linux and OSX. It does not work on
+bash-completion.el is known to work with Bash 4 and 5, on Emacs,
+starting with version 25.3, under Linux and OSX. It does not work on
XEmacs.
[new_issue]: https://github.com/szermatt/emacs-bash-completion/issues/new
diff --git a/bash-completion.el b/bash-completion.el
index 21eca7679c..3da7307e1b 100644
--- a/bash-completion.el
+++ b/bash-completion.el
@@ -7,7 +7,7 @@
;; Version: 3.1.0
;; Keywords: convenience, unix
;; URL: http://github.com/szermatt/emacs-bash-completion
-;; Package-Requires: ((emacs "24.3"))
+;; Package-Requires: ((emacs "25.3"))
;; This program is free software: you can redistribute it and/or
;; modify it under the terms of the GNU General Public License as
@@ -99,8 +99,8 @@
;;; Compatibility:
-;; bash-completion.el is known to work with Bash 3, 4 and 5, on Emacs,
-;; starting with version 24.3, under Linux and OSX. It does not work
+;; bash-completion.el is known to work with Bash 4 and 5, on Emacs,
+;; starting with version 25.3, under Linux and OSX. It does not work
;; on XEmacs.
;;; History:
@@ -274,13 +274,13 @@ Bash processes.")
"Value for the special PS1 prompt set for completions, quoted.")
(eval-when-compile
- (unless (or (and (= emacs-major-version 24) (>= emacs-minor-version 3))
- (>= emacs-major-version 25))
+ (unless (or (and (= emacs-major-version 25) (>= emacs-minor-version 3))
+ (>= emacs-major-version 26))
(error
(concat
- "Emacs version 24.3 or later is required to run emacs-bash-completion.\n"
- "Download emacs-bash-completion version 2.1 to run on older Emacs "
- "versions, from 22 to 24."))))
+ "Emacs version 25.3 or later is required to run emacs-bash-completion.\n"
+ "Download emacs-bash-completion version 2.1 to run on Emacs 22 and 23"
+ "version 3.1.0 to run on Emacs 24."))))
(defvar bash-completion--debug-info nil
"Alist that stores info about the last call to `bash-completion-send'.
diff --git a/test/bash-completion-integration-test.el
b/test/bash-completion-integration-test.el
index 5c06b66b29..c044782d65 100644
--- a/test/bash-completion-integration-test.el
+++ b/test/bash-completion-integration-test.el
@@ -182,9 +182,7 @@ for testing completion."
(defun bash-completion_test-teardown-env (test-env-dir)
"Deletes everything `bash-completion_test-setup-env' set up."
(when test-env-dir
- (if (>= emacs-major-version 24)
- (delete-directory test-env-dir 'recursive)
- (dired-delete-file test-env-dir 'always))))
+ (delete-directory test-env-dir 'recursive)))
(defun bash-completion_test-equal-any-order (expected actual)
"Compare a sorted list of string EXPECTED with ACTUAL.
diff --git a/test/bash-completion-test.el b/test/bash-completion-test.el
index 6c36800964..30b6a52847 100644
--- a/test/bash-completion-test.el
+++ b/test/bash-completion-test.el
@@ -32,9 +32,6 @@
(require 'cl-lib)
(require 'ert)
-; for Emacs 24.1
-(unless (fboundp 'cl-letf) (defalias 'cl-letf 'letf))
-
(defmacro bash-completion-test-with-buffer (content &rest body)
"Create a temporary buffer with CONTENT and execute BODY.