branch: master commit af29d76895249c56a4edb12c086db19ce8f218d3 Merge: 1041ede a22acac Author: Oleh Krehel <ohwoeo...@gmail.com> Commit: Oleh Krehel <ohwoeo...@gmail.com>
Merge commit 'a22acac260a93530f98b1fe84b4b5edc2a6bdc0e' from ace-window --- packages/ace-window/ace-window.el | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/packages/ace-window/ace-window.el b/packages/ace-window/ace-window.el index 4b0a76f..5aa389d 100644 --- a/packages/ace-window/ace-window.el +++ b/packages/ace-window/ace-window.el @@ -57,6 +57,7 @@ ;;; Code: (require 'avy) +(require 'ring) ;;* Customization (defgroup ace-window nil @@ -261,7 +262,7 @@ Amend MODE-LINE to the mode line for the duration of the selection." #'aw--remove-leading-chars)) start-window) (error - (if (memq (caddr err) aw--flip-keys) + (if (memq (nth 2 err) aw--flip-keys) (aw--pop-window) (signal (car err) (cdr err))))) (aw--done)))))))