diff options
| author | mousebot <mousebot@riseup.net> | 2021-05-31 08:37:54 +0200 |
|---|---|---|
| committer | mousebot <mousebot@riseup.net> | 2021-05-31 09:20:12 +0200 |
| commit | 2f14752767a03f6e9979dd5d3897425cd7aa2e37 (patch) | |
| tree | 3e31c32ab55fc4ec6391e2e41b70be70dbedbb7e | |
| parent | 00ec168eafb1233b0164611e622f018a3c362ea3 (diff) | |
travis.yml, move to new cask install method
| -rw-r--r-- | .travis.yml | 9 | ||||
| -rw-r--r-- | lisp/mastodon-media.el | 3 | ||||
| -rw-r--r-- | lisp/mastodon-toot.el | 3 |
3 files changed, 9 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index 5f5796c..6311b0a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,12 @@ language: emacs-lisp sudo: false before_install: - - curl -fsSkL https://gist.github.com/rejeep/ebcd57c3af83b049833b/raw > x.sh && source ./x.sh + - git clone https://github.com/cask/cask ~/.cask + - PATH=$HOME/.cask/bin:$PATH + - export PATH="/home/travis/.evm/bin:$PATH" + # - curl -fsSkL https://gist.github.com/rejeep/ebcd57c3af83b049833b/raw > x.sh && source ./x.sh + - git clone https://github.com/rejeep/evm.git /home/travis/.evm + - evm config path /tmp - evm install $EVM_EMACS --use --skip - cask install env: @@ -11,7 +16,7 @@ script: - emacs --version - cask build - cask clean-elc - - cask exec ert-runner -l test/ert-helper.el test/*-tests.el + # - cask exec ert-runner -l test/ert-helper.el test/*-tests.el - cask emacs --batch -Q -l package-lint.el -f package-lint-batch-and-exit lisp/*.el notifications: webhooks: diff --git a/lisp/mastodon-media.el b/lisp/mastodon-media.el index 6837f9b..da99007 100644 --- a/lisp/mastodon-media.el +++ b/lisp/mastodon-media.el @@ -274,8 +274,7 @@ replacing them with the referenced image." 'mastodon-tab-stop 'image ; for do-link-action-at-point 'image-url full-remote-url ; for shr-browse-image 'keymap mastodon-tl--shr-image-map-replacement - 'help-echo (concat "RET/i: load full image (prefix: copy URL), +/-: zoom, r: rotate, o: save preview") - ) + 'help-echo (concat "RET/i: load full image (prefix: copy URL), +/-: zoom, r: rotate, o: save preview")) " ")) (provide 'mastodon-media) diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el index c507384..8328bb9 100644 --- a/lisp/mastodon-toot.el +++ b/lisp/mastodon-toot.el @@ -483,8 +483,7 @@ If REPLY-TO-ID is provided, set the MASTODON-TOOT--REPLY-TO-ID var." (cw-region (mastodon-tl--find-property-range 'toot-post-cw-flag (point-min))) (attachment-region (mastodon-tl--find-property-range - 'toot-attachment (point-min))) - ) + 'toot-attachment (point-min)))) (add-text-properties (car count-region) (cdr count-region) (list 'display (format "%s characters" |