Merge commit 'cc38c044a13e6df822431d6c706cf4b9255900bd' from ace-window

Move the dependencies into a new ELPA package avy.

diff --combined packages/ace-window/Cask
index 0000000000000000000000000000000000000000,5526c3c62e99d4f576515e76b3940afd33155491..5526c3c62e99d4f576515e76b3940afd33155491
mode 000000,100644..100644
--- /dev/null
--- 2/Cask
+++ b/packages/ace-window/Cask
@@@ -1,0 -1,8 +1,8 @@@
+ (source gnu)
+ (source melpa)
+ 
+ (package-file "ace-window.el")
+ 
+ (development
+  (depends-on "avy"))
+ 

diff --combined packages/ace-window/Makefile
index 4f0a64001858976e1829decfeab472c5fce86c2f,8dff696675957096f3ea881bb3fd38fc188ecb18..8dff696675957096f3ea881bb3fd38fc188ecb18
--- 1/packages/ace-window/Makefile
--- 2/Makefile
+++ b/packages/ace-window/Makefile
@@@ -1,14 -1,15 +1,15 @@@
- EMACS = emacs
- # EMACS = emacs-24.3
+ emacs ?= emacs
+ CASK = ~/.cask/bin/cask
  
- LOAD = -l avy.el -l avy-test.el
+ .PHONY: all clean
  
- .PHONY: all test clean
+ all: compile
  
- all: test
+ cask:
+       $(shell EMACS=$(emacs) $(CASK) --verbose --debug)
  
- test:
-       $(EMACS) -batch $(LOAD) -f ert-run-tests-batch-and-exit
+ compile:
+       $(CASK) exec $(emacs) -batch --eval "(byte-compile-file \"ace-window.el\")"
  
  clean:
        rm -f *.elc

diff --combined packages/ace-window/ace-window.el
index 68e28cfffc83b67447e1311f88051c843db3c793,f34a77afcd15daa4e0414bf39d0f47959c9fc5a5..f34a77afcd15daa4e0414bf39d0f47959c9fc5a5
--- 1/packages/ace-window/ace-window.el
--- 2/ace-window.el
+++ b/packages/ace-window/ace-window.el
@@@ -5,7 -5,8 +5,8 @@@
  ;; Author: Oleh Krehel <ohwoeowho@gmail.com>
  ;; Maintainer: Oleh Krehel <ohwoeowho@gmail.com>
  ;; URL: https://github.com/abo-abo/ace-window
- ;; Version: 0.8.0
+ ;; Version: 0.8.1
+ ;; Package-Requires: ((avy "0.1.0"))
  ;; Keywords: window, location
  
  ;; This file is part of GNU Emacs.
@@@ -59,7 -60,7 +60,7 @@@
  ;; deleted instead.
  
  ;;; Code:
- (require 'avy)
+ (require 'avy-jump)
  (require 'ring)
  
  ;;* Customization
@@@ -141,9 -142,6 +142,6 @@@ Use M-0 `ace-window' to toggle this val
         (error "Invalid `aw-scope': %S" aw-scope))))
     'aw-window<))
  
- (defvar aw-overlays-lead nil
-   "Hold overlays for leading chars.")
- 
  (defvar aw-overlays-back nil
    "Hold overlays for when `aw-background' is t.")
  
@@@ -163,7 -161,7 +161,7 @@@
    ;; background
    (mapc #'delete-overlay aw-overlays-back)
    (setq aw-overlays-back nil)
-   (aw--remove-leading-chars))
+   (avy--remove-leading-chars))
  
  (defun aw--lead-overlay (path leaf)
    "Create an overlay using PATH at LEAF.
@@@ -197,12 -195,7 +195,7 @@@ LEAF is (PT . WND).
      (overlay-put ol 'face 'aw-leading-char-face)
      (overlay-put ol 'window wnd)
      (overlay-put ol 'display new-str)
-     (push ol aw-overlays-lead)))
- 
- (defun aw--remove-leading-chars ()
-   "Remove leading char overlays."
-   (mapc #'delete-overlay aw-overlays-lead)
-   (setq aw-overlays-lead nil))
+     (push ol avy--overlays-lead)))
  
  (defun aw--make-backgrounds (wnd-list)
    "Create a dim background overlay for each window on WND-LIST."
@@@ -265,7 -258,7 +258,7 @@@ Amend MODE-LINE to the mode line for th
                (condition-case err
                    (or (cdr (avy-read (avy-tree candidate-list aw-keys)
                                       #'aw--lead-overlay
-                                      #'aw--remove-leading-chars))
+                                      #'avy--remove-leading-chars))
                        start-window)
                  (error
                   (if (memq (nth 2 err) aw--flip-keys)