Permalink
Browse files

Ace Window now depends on Avy

* Cask: New file.

* Makefile: Leave only the compile target.

* ace-window.el: Depend on `avy'.

* avy-init.el:
* avy-jump.el:
* avy-test.el:
* avy.el: Delete files, they are in `avy' repository now.

Fixes #39
  • Loading branch information...
1 parent c53b0d2 commit 05e701626568ea51969659516b2c45554f63ae36 @abo-abo committed May 8, 2015
Showing with 15 additions and 607 deletions.
  1. +8 −0 Cask
  2. +6 −11 Makefile
  3. +1 −0 ace-window.el
  4. +0 −27 avy-init.el
  5. +0 −383 avy-jump.el
  6. +0 −68 avy-test.el
  7. +0 −118 avy.el
View
@@ -0,0 +1,8 @@
+(source gnu)
+(source melpa)
+
+(package-file "ace-window.el")
+
+(development
+ (depends-on "avy"))
+
View
@@ -1,20 +1,15 @@
emacs ?= emacs
-# EMACS = emacs-24.3
+CASK = ~/.cask/bin/cask
-LOAD = -l avy.el -l avy-test.el
+.PHONY: all clean
-.PHONY: all test clean
+all: compile
-all: test
-
-test:
- $(emacs) -batch $(LOAD) -f ert-run-tests-batch-and-exit
+cask:
+ $(shell EMACS=$(emacs) $(CASK) --verbose --debug)
compile:
- $(emacs) -batch -l avy-init.el
-
-run:
- $(emacs) -Q -l avy-init.el
+ $(CASK) exec $(emacs) -batch --eval "(byte-compile-file \"ace-window.el\")"
clean:
rm -f *.elc
View
@@ -6,6 +6,7 @@
;; Maintainer: Oleh Krehel <ohwoeowho@gmail.com>
;; URL: https://github.com/abo-abo/ace-window
;; Version: 0.8.0
+;; Package-Requires: ((avy "0.1.0"))
;; Keywords: window, location
;; This file is part of GNU Emacs.
View
@@ -1,27 +0,0 @@
-;;; avy-init.el --- bare avy init
-
-;; Copyright (C) 2015 Free Software Foundation, Inc.
-
-;; Author: Oleh Krehel
-
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
-
-(add-to-list 'load-path default-directory)
-(mapc #'byte-compile-file '("avy.el" "avy-jump.el" "ace-window.el"))
-(require 'ace-window)
-(require 'avy-jump)
-(global-set-key (kbd "C-c j") 'avi-goto-char)
-(global-set-key (kbd "C-'") 'avi-goto-char-2)
Oops, something went wrong.

0 comments on commit 05e7016

Please sign in to comment.