From 1446f20dbc8fa22c10698d667e320c95f892708c Mon Sep 17 00:00:00 2001 From: Jason Blevins Date: Thu, 21 Dec 2017 15:38:07 -0500 Subject: [PATCH] Drop support for Emacs 24.3 --- .travis.yml | 1 - CHANGES.md | 2 ++ README.md | 2 +- markdown-mode.el | 2 +- tests/markdown-test.el | 19 ++++--------------- 5 files changed, 8 insertions(+), 18 deletions(-) diff --git a/.travis.yml b/.travis.yml index 274a5e6..8fc7c12 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,6 @@ before_install: - curl -fsSkL https://gist.github.com/rejeep/ebcd57c3af83b049833b/raw > x.sh && source ./x.sh - evm install $EVM_EMACS --use --skip env: - - EVM_EMACS=emacs-24.3-travis - EVM_EMACS=emacs-24.4-travis - EVM_EMACS=emacs-24.5-travis - EVM_EMACS=emacs-25.1-travis diff --git a/CHANGES.md b/CHANGES.md index 61beb26..1e93a33 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -4,6 +4,8 @@ * **Breaking changes:** + - GNU Emacs 24.4 or later is required. Support for Emacs 24.3 + has been dropped. - Face variables, such as `markdown-italic-face` are now obsolete. Use face names directly in code and customizations. The face names themselves are unaffected, so this shouldn't diff --git a/README.md b/README.md index a42dc1b..0464227 100644 --- a/README.md +++ b/README.md @@ -1012,7 +1012,7 @@ contributions! See the [contributors graph][contrib] for details. ## Bugs markdown-mode is developed and tested primarily for compatibility -with GNU Emacs 24.3 and later. If you find any bugs in +with GNU Emacs 24.4 and later. If you find any bugs in markdown-mode, please construct a test case or a patch and open a ticket on the [GitHub issue tracker][issues]. See the contributing guidelines in `CONTRIBUTING.md` for details on diff --git a/markdown-mode.el b/markdown-mode.el index a83c3f1..bc6e4c9 100644 --- a/markdown-mode.el +++ b/markdown-mode.el @@ -7,7 +7,7 @@ ;; Maintainer: Jason R. Blevins ;; Created: May 24, 2007 ;; Version: 2.4-dev -;; Package-Requires: ((emacs "24") (cl-lib "0.5")) +;; Package-Requires: ((emacs "24.4") (cl-lib "0.5")) ;; Keywords: Markdown, GitHub Flavored Markdown, itex ;; URL: https://jblevins.org/projects/markdown-mode/ diff --git a/tests/markdown-test.el b/tests/markdown-test.el index 33b2305..0e3971d 100644 --- a/tests/markdown-test.el +++ b/tests/markdown-test.el @@ -1391,13 +1391,6 @@ the opening bracket of [^2], and then subsequent functions would kill [^2])." (markdown-footnote-kill) (should (string-equal (current-kill 0) "foo\n"))))) -(when (version< emacs-version "24.2") - ;; fix segfault on 24.1 with the normal implementation of this function. isn't - ;; exactly correct, but should make tests work the same - (defadvice kill-buffer-and-window (around markdown-test-fix-segfault activate) - (kill-buffer) - (select-window (previous-window)))) - (ert-deftest test-markdown-footnote-reference/jump () "Test `markdown-do' for footnotes and reference links." (markdown-test-string @@ -2555,12 +2548,10 @@ puts markdown.to_html (markdown-test-range-has-face 1 3 'markdown-markup-face) ; ``` (markdown-test-range-has-face 4 7 'markdown-language-keyword-face) ; ruby (markdown-test-range-has-face 9 90 'markdown-code-face) ; entire code block - (unless (version< emacs-version "24.4") - (markdown-test-range-has-face 9 15 'font-lock-builtin-face)) ; require + (markdown-test-range-has-face 9 15 'font-lock-builtin-face) ; require (markdown-test-range-has-face 17 27 'font-lock-string-face) ; 'redcarpet' (markdown-test-range-has-face 40 48 'font-lock-type-face) ; Redcarpet - (unless (version< emacs-version "24.4") - (markdown-test-range-has-face 70 72 'font-lock-builtin-face)) ; puts + (markdown-test-range-has-face 70 72 'font-lock-builtin-face) ; puts (markdown-test-range-has-face 92 94 'markdown-markup-face)))) ; ``` (ert-deftest test-markdown-font-lock/gfm-fenced-2 () @@ -2608,12 +2599,10 @@ puts markdown.to_html (markdown-test-range-has-face 1 3 'markdown-markup-face) ; ``` (markdown-test-range-has-face 4 7 'markdown-language-keyword-face) ; ruby (markdown-test-range-has-face 9 90 'markdown-code-face) ; entire code block - (unless (version< emacs-version "24.4") - (markdown-test-range-has-face 9 15 'font-lock-builtin-face)) ; require + (markdown-test-range-has-face 9 15 'font-lock-builtin-face) ; require (markdown-test-range-has-face 17 27 'font-lock-string-face) ; 'redcarpet' (markdown-test-range-has-face 40 48 'font-lock-type-face) ; Redcarpet - (unless (version< emacs-version "24.4") - (markdown-test-range-has-face 70 72 'font-lock-builtin-face)) ; puts + (markdown-test-range-has-face 70 72 'font-lock-builtin-face) ; puts (markdown-test-range-has-face 92 94 'markdown-markup-face)))) ; ``` (ert-deftest test-markdown-font-lock/atx-no-spaces () -- 2.11.4.GIT