branch: elpa/logview
commit 6f8b0bdf9cb299793f0dcca38cc91b9042815ed1
Author: Paul Pogonyshev <pogonys...@gmail.com>
Commit: Paul Pogonyshev <pogonys...@gmail.com>
Drop support for ancient Emacs 24.
---
.github/workflows/test.yml | 3 +--
Eldev | 8 --------
logview.el | 25 +++++++++----------------
test/logview.el | 8 ++------
4 files changed, 12 insertions(+), 32 deletions(-)
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e3fb26ab51..d219cba07f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -13,8 +13,7 @@ jobs:
strategy:
matrix:
- emacs_version: ['24.4', '24.5',
- '25.1', '25.2', '25.3',
+ emacs_version: ['25.1', '25.2', '25.3',
'26.1', '26.2', '26.3',
'27.1', '27.2',
'28.1',
diff --git a/Eldev b/Eldev
index b66b75b1d2..18bbd2ea7b 100644
--- a/Eldev
+++ b/Eldev
@@ -3,11 +3,3 @@
(eldev-require-version "0.5")
(eldev-use-package-archive 'melpa)
-
-;; Emacs 24 seems to issue a buggy byte-compilation warning in
-;; `logview--views'. For this reason, disable `-W' on Emacs 24.
-(add-hook 'eldev-build-system-hook
- (lambda ()
- (when (and (< emacs-major-version 25)
eldev-build-treat-warnings-as-errors)
- (eldev-warn "Disabling `--warnings-as-errors', as certain
warnings on Emacs 24 are incorrect")
- (setf eldev-build-treat-warnings-as-errors nil))))
diff --git a/logview.el b/logview.el
index b39a1030e2..6b6c394a2c 100644
--- a/logview.el
+++ b/logview.el
@@ -7,7 +7,7 @@
;; Version: 0.14.1snapshot
;; Keywords: files, tools
;; Homepage: https://github.com/doublep/logview
-;; Package-Requires: ((emacs "24.4") (datetime "0.6.1") (extmap "1.0"))
+;; Package-Requires: ((emacs "25.1") (datetime "0.6.1") (extmap "1.0"))
;; This program is free software; you can redistribute it and/or
;; modify it under the terms of the GNU General Public License as
@@ -1719,8 +1719,6 @@ cannot be deleted using their quick access indices."
(user-error "There are no views defined for the current submode"))
(logview--completing-read prompt defined-names nil t nil
'logview--view-name-history))))
-(defalias 'logview--format-message (if (fboundp 'format-message)
'format-message #'format))
-
(defun logview--do-save-filters-as-view (name global)
(unless (car logview--current-filter)
(user-error "There are currently no filters"))
@@ -1733,10 +1731,10 @@ cannot be deleted using their quick access indices."
(or global (null (plist-get view :submode)) (string=
(plist-get view :submode) logview--submode-name))))))
(dolist (view (logview--views))
(when (funcall matches view)
- (unless (y-or-n-p (logview--format-message (if global
- "There is already a
view named `%s'. Replace it?"
- "There is already a view
named `%s' for this submode. Replace it?")
- name))
+ (unless (y-or-n-p (format-message (if global
+ "There is already a view named
`%s'. Replace it?"
+ "There is already a view named
`%s' for this submode. Replace it?")
+ name))
(user-error "View named `%s' already exists; try a different name"
name))))
(let (new-views)
(dolist (view (logview--views))
@@ -2617,10 +2615,8 @@ returns non-nil."
(defvar inhibit-message)
(defmacro logview--internal-log (format-string &rest arguments)
- ;; No such variable present on old Emacses, just don't print anything.
- `(when (boundp 'inhibit-message)
- (let ((inhibit-message t))
- (message ,format-string ,@arguments))))
+ `(let ((inhibit-message t))
+ (message ,format-string ,@arguments)))
(defun logview--guess-submode ()
(save-excursion
@@ -2808,7 +2804,7 @@ returns non-nil."
;; file. If `datetime' reports a different locale database version, cache
is
;; discarded.
(let ((cache-file (ignore-errors (extmap-init
logview-cache-filename)))
- (locale-database-version (if (fboundp
#'datetime-locale-database-version) (with-no-warnings
(datetime-locale-database-version)) 0)))
+ (locale-database-version (datetime-locale-database-version)))
(when cache-file
(let ((cached-externally (extmap-get cache-file 'timestamp-formats t)))
(when (and cached-externally (equal (extmap-get cache-file
'locale-database-version t) locale-database-version))
@@ -3059,10 +3055,7 @@ See `logview--iterate-entries-forward' for details."
(defun logview--refontify-buffer ()
(logview--std-temporarily-widening
- (with-no-warnings (if (fboundp 'font-lock-flush)
- (font-lock-flush)
- ;; Emacs 24 doesn't have `font-lock-flush'.
- (font-lock-fontify-buffer)))))
+ (font-lock-flush)))
(defun logview--maybe-pulse-current-entry (&optional why)
diff --git a/test/logview.el b/test/logview.el
index 74d704b0af..dfecee2314 100644
--- a/test/logview.el
+++ b/test/logview.el
@@ -44,17 +44,13 @@
`(let (,@erase-customizations
,@(eval extra-customizations t)
(inhibit-message t))
- ;; Not available on older 24.x versions. Don't care enough to
- ;; rewrite differently.
- (when (fboundp 'advice-add)
- (advice-add 'display-warning :override
#'logview--test-display-warning-advice))
+ (advice-add 'display-warning :override
#'logview--test-display-warning-advice)
(unwind-protect
(with-temp-buffer
(insert-file-contents (expand-file-name ,filename
logview--test-directory))
(logview-mode)
,@body)
- (when (fboundp 'advice-add)
- (advice-remove 'display-warning
#'logview--test-display-warning-advice))))))
+ (advice-remove 'display-warning
#'logview--test-display-warning-advice)))))
(defun logview--test-current-message ()
