X-Git-Url: http://christophe.rhodes.io/gitweb/?p=iplayer-el.git;a=blobdiff_plain;f=iplayer.el;h=8e883521d78706c251bf0e9d93785dcc705265a1;hp=5b5b5c4e0b0bca3fb10293e60e7053a5f76c0429;hb=33f79d5354ce397f2f8d2d6299941c13fdd05fab;hpb=c637da1996edc05cf4ace5879c133cd263d9fdb1

diff --git a/iplayer.el b/iplayer.el
index 5b5b5c4..8e88352 100644
--- a/iplayer.el
+++ b/iplayer.el
@@ -36,11 +36,11 @@
     (setq iplayer-updating-cache-process nil
           iplayer-updating-cache-sentinel-info nil)
     (dolist (info info)
-      (let ((iplayer-command-frame (car info))
-            (iplayer-command-window (cadr info))
-            (iplayer-command-buffer (caddr info))
-            (keys (car (cdddr info)))
-            (function (cadr (cdddr info))))
+      (let ((iplayer-command-frame (nth 0 info))
+            (iplayer-command-window (nth 1 info))
+            (iplayer-command-buffer (nth 2 info))
+            (keys (nth 3 info))
+            (function (nth 4 info)))
         (when (and (frame-live-p iplayer-command-frame)
                    (window-live-p iplayer-command-window)
                    (buffer-live-p iplayer-command-buffer))
@@ -80,7 +80,7 @@
   (let (docstring interactive)
     (when (stringp (car body))
       (setq docstring (car body) body (cdr body)))
-    (when (and (consp (car body)) (eql (caar body) 'interactive))
+    (when (and (consp (car body)) (eql (car (car body)) 'interactive))
       (setq interactive (car body) body (cdr body)))
     `(defun ,name ,arglist
        ,@(when docstring (list docstring))