[elpa] externals/ace-window d93e16b 48/92: ace-window.el: Fix frame-parameter being a cons sometimes

[Stefan Monnier]

branch: externals/ace-window
commit d93e16b52ee7c1b6c9df599060e7077b4e46cbf8
Author: Oleh Krehel <ohwoeowho@gmail.com>
Commit: Oleh Krehel <ohwoeowho@gmail.com>

    ace-window.el: Fix frame-parameter being a cons sometimes
    
    Happens on Emacs-24.5.
    Fixes #138
---
 Makefile      | 8 +++++---
 ace-window.el | 9 +++++++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index c0a7d2a..f31aa83 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,13 @@
+emacs ?= emacs
+
 update:
-       emacs -batch -l test/make-update.el
+       $(emacs) -batch -l test/make-update.el
 
 compile: clean
-       emacs -batch -l test/elpa.el -l test/make-compile.el
+       $(emacs) -batch -l test/elpa.el -l test/make-compile.el
 
 plain:
-       emacs -Q -l test/elpa.el -l test/make-plain
+       $(emacs) -Q -l test/elpa.el -l test/make-plain
 
 clean:
        rm -f *.elc
diff --git a/ace-window.el b/ace-window.el
index 847d9d2..e84221e 100644
--- a/ace-window.el
+++ b/ace-window.el
@@ -559,8 +559,13 @@ window."
 ;;* Utility
 (unless (fboundp 'frame-position)
   (defun frame-position (&optional frame)
-    (cons (frame-parameter frame 'left)
-          (frame-parameter frame 'top))))
+    (let ((pl (frame-parameter frame 'left))
+          (pt (frame-parameter frame 'top)))
+      (when (consp pl)
+        (setq pl (eval pl)))
+      (when (consp pt)
+        (setq pt (eval pt)))
+      (cons pl pt))))
 
 (defun aw-window< (wnd1 wnd2)
   "Return true if WND1 is less than WND2.