branch: elpa/forth-mode
commit 2f5d87f3c5a17f789ef98b82b2447fdcf8a63122
Author: Helmut Eller <[email protected]>
Commit: Helmut Eller <[email protected]>
No 64-bit build for pForth in Ubuntu. Try Gforth.
---
.travis.yml | 2 +-
test/tests.el | 9 ++++-----
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 9337a8837b..65a87de777 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ env:
install:
- sudo add-apt-repository -y ppa:ubuntu-elisp
- sudo apt-get update -y
- - sudo apt-get install emacs23 emacs24 emacs-snapshot pforth
+ - sudo apt-get install emacs23 emacs24 emacs-snapshot gforth
script: make EMACS=$EMACS
notifications:
email: [email protected]
diff --git a/test/tests.el b/test/tests.el
index 0f8bb26427..3329946032 100644
--- a/test/tests.el
+++ b/test/tests.el
@@ -88,7 +88,6 @@ The whitespace before and including \"|\" on each line is
removed."
(should (string= after (substring-no-properties (buffer-string))))
(should (= (point) point-after))))))
-
(defun forth-should-region-before/after (before after fun)
(destructuring-bind (before start1 end1) (forth-strip-|-and-¹² before)
(destructuring-bind (after point-after) (forth-strip-|-and-→ after)
@@ -102,18 +101,18 @@ The whitespace before and including \"|\" on each line is
removed."
(defmacro forth-with-gforth (&rest body)
(declare (indent 0))
- `(let* ((proc (get-buffer-process forth-interaction-buffer)))
+ `(let* ((forth-executable "gforth")
+ (proc (get-buffer-process forth-interaction-buffer)))
;; FIXME: there should be a better way to do this. Probably a
;; callback function.
(while (not (processp proc))
(run-forth)
- (message "Waiting for pforth to start ...")
+ (message "Waiting for gforth to start ...")
(accept-process-output nil 0.3)
(setq proc (get-buffer-process forth-interaction-buffer)))
(unwind-protect
(progn . ,body)
(kill-process proc))))
->>>>>>> Test completion-at-point
(ert-deftest forth-paren-comment-font-lock ()
(forth-assert-face "→( )" font-lock-comment-delimiter-face)
@@ -345,7 +344,7 @@ The whitespace before and including \"|\" on each line is
removed."
(call-interactively #'comment-dwim))))
(ert-deftest forth-completion-at-point ()
- (forth-with-forth
+ (forth-with-gforth
(forth-should-before/after
"2C→"
"2Constant→"
