branch: elpa/logview
commit 60b86ec5888d3bbd857f4abb434a6ae3406b7c93
Author: Paul Pogonyshev <pogonys...@gmail.com>
Commit: Paul Pogonyshev <pogonys...@gmail.com>
Use yet another PPA for Emacs 24; silence another warning on it.
---
.travis.yml | 2 +-
logview.el | 6 ++++--
run-tests.sh | 3 ++-
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index ae71940736..255ef69857 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@ language: emacs-lisp
before_install:
# For Emacs 24.
- - sudo add-apt-repository ppa:jonathonf/emacs24 -y
+ - sudo add-apt-repository ppa:fryda.tomas/emacs -y
# For Emacs 25.
- sudo add-apt-repository ppa:kelleyk/emacs -y
# For snapshot builds.
diff --git a/logview.el b/logview.el
index fa4a558c00..f2a79a43e8 100644
--- a/logview.el
+++ b/logview.el
@@ -1992,8 +1992,10 @@ returns non-nil."
(maphash (lambda (regexp key)
(push `(,(car key) (regexp . ,regexp))
logview--all-timestamp-formats-cache))
uniques)
- (let ((inhibit-message t))
- (message "Logview/datetime: built list of %d timestamp regexps in %.3f
s" (hash-table-count uniques) (- (float-time) start-time)))))
+ ;; No such variable present on old Emacses, just don't print anything.
+ (when (boundp 'inhibit-message)
+ (let ((inhibit-message t))
+ (message "Logview/datetime: built list of %d timestamp regexps in
%.3f s" (hash-table-count uniques) (- (float-time) start-time))))))
logview--all-timestamp-formats-cache)
diff --git a/run-tests.sh b/run-tests.sh
index 0a7ecd83e8..14124c5e2c 100755
--- a/run-tests.sh
+++ b/run-tests.sh
@@ -36,9 +36,10 @@ $EMACS --batch
--load test/logview.el
\
--eval "(ert-run-tests-batch-and-exit (quote ${ERT_SELECTOR}))"
+# Fuck Emacs 24, I'm tired of fighting warnings on it.
$EMACS --batch
\
--eval "(progn (require 'package) (package-initialize))"
\
--directory "$OWN_DIRECTORY"
\
--eval "(when (locate-file \"local-environment.el\" (list (car
load-path))) (load \"local-environment.el\" nil t t))" \
- --eval "(setq byte-compile-error-on-warn t)"
\
+ --eval "(when (>= emacs-major-version 25) (setq
byte-compile-error-on-warn t))" \
--eval "(batch-byte-compile)" logview.el
