branch: elpa/forth-mode
commit 5b42dfac0cf93cb238e4648178d7b4dee3239aa3
Merge: 45f3f20f18 992bfb64b4
Author: Helmut Eller <[email protected]>
Commit: Helmut Eller <[email protected]>
Merge branch 'master' into case-insensitive-indentation
---
.travis.yml | 6 +++++-
test/tests.el | 7 ++++++-
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index a986285750..955735c36f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,11 @@ sudo: required
env:
- EMACS=emacs23
- EMACS=emacs24
-install: sudo apt-get update -y && sudo apt-get install emacs23 emacs24
+ - EMACS=emacs-snapshot
+install:
+ - sudo add-apt-repository -y ppa:ubuntu-elisp
+ - sudo apt-get update -y
+ - sudo apt-get install emacs23 emacs24 emacs-snapshot
script: make EMACS=$EMACS
notifications:
email: [email protected]
diff --git a/test/tests.el b/test/tests.el
index 57e4428b4a..e9460de9cc 100644
--- a/test/tests.el
+++ b/test/tests.el
@@ -23,10 +23,15 @@
(forth-mode)
,@body))
+(unless (boundp 'font-lock-ensure)
+ ;; Emacs 24 doesn't have font-lock-ensure.
+ (defun font-lock-ensure ()
+ (font-lock-fontify-buffer)))
+
(defun forth-assert-face (content pos face)
(when (boundp 'syntax-propertize-function)
(forth-with-temp-buffer content
- (font-lock-fontify-buffer)
+ (font-lock-ensure)
(should (eq face (get-text-property pos 'face))))))
(defun forth-strip-| (string)
