[nongnu] elpa/pacmacs 131a070556 163/472: Merge pull request #110 from syohex/fix-package

[ELPA Syncer]

branch: elpa/pacmacs
commit 131a07055642d2e94db7932933a869ea5ea91e00
Merge: 330c69201f bb622648e3
Author: Alexey Kutepov <reximkut@gmail.com>
Commit: Alexey Kutepov <reximkut@gmail.com>

    Merge pull request #110 from syohex/fix-package
    
    Fix package
---
 Cask             |  3 ---
 pacmacs-utils.el |  4 +++-
 pacmacs.el       | 44 +++++++++++++++++++++++---------------------
 3 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/Cask b/Cask
index f8e4ebb2a5..9f5be6eb2f 100644
--- a/Cask
+++ b/Cask
@@ -8,9 +8,6 @@
        ("sprites" "sprites/*.json")
        ("sprites" "sprites/*.xpm"))
 
-(depends-on "dash")
-(depends-on "dash-functional")
-
 (development
  (depends-on "el-mock")
  (depends-on "ert-runner")
diff --git a/pacmacs-utils.el b/pacmacs-utils.el
index 19fb56a68a..3f2cfd4fc9 100644
--- a/pacmacs-utils.el
+++ b/pacmacs-utils.el
@@ -32,11 +32,13 @@
 
 ;;; Code:
 
+(require 'cl-lib)
+
 (defconst pacmacs--base (file-name-directory load-file-name))
 
 (defmacro plist-bind (keys expr &rest body)
   (declare (indent 2) (debug (sexp form &rest form)))
-  (let ((expr-name (gensym)))
+  (let ((expr-name (cl-gensym)))
     `(let* ((,expr-name ,expr)
             ,@(mapcar #'(lambda (key)
                           (cons (car key)
diff --git a/pacmacs.el b/pacmacs.el
index e4759dda13..c85d583b58 100644
--- a/pacmacs.el
+++ b/pacmacs.el
@@ -6,6 +6,7 @@
 ;; Maintainer: Alexey Kutepov <reximkut@gmail.com>
 ;; URL: http://github.com/rexim/pacmacs.el
 ;; Version: 0.0.1
+;; Package-Requires: ((dash "2.11.0") (dash-functional "1.2.0") (cl-lib "0.5"))
 
 ;; Permission is hereby granted, free of charge, to any person
 ;; obtaining a copy of this software and associated documentation
@@ -35,6 +36,7 @@
 
 ;;; Code:
 
+(require 'cl-lib)
 (require 'dash)
 
 (require 'pacmacs-anim)
@@ -268,7 +270,7 @@
                    (column (cdr p))
                    (possible-ways (pacmacs--possible-ways row column))
                    (candidate-ways
-                    (remove-if #'pacmacs--filter-candidates possible-ways)))
+                    (cl-remove-if #'pacmacs--filter-candidates possible-ways)))
               (dolist (candidate-way candidate-ways)
                 (pacmacs--track-point candidate-way p))
               (setq next-wave
@@ -312,13 +314,13 @@
     (-when-let (pill (pacmacs--pill-at-p row column))
       (setq pacmacs-score (+ pacmacs-score 10))
       (setq pacmacs-pills
-            (remove-if #'(lambda (pill)
-                           (plist-bind ((p-row :row)
-                                        (p-column :column))
-                               pill
-                             (and (= row p-row)
-                                  (= column p-column))))
-                       pacmacs-pills)))))
+            (cl-remove-if #'(lambda (pill)
+                              (plist-bind ((p-row :row)
+                                           (p-column :column))
+                                  pill
+                                (and (= row p-row)
+                                     (= column p-column))))
+                          pacmacs-pills)))))
 
 (defun pacmacs--ghost-collision-p ()
   (plist-bind ((row :row)
@@ -361,8 +363,8 @@
 (defun pacmacs-waiting-logic (switcher)
   (if (<= pacmacs-waiting-counter 0)
       (funcall switcher)
-    (decf pacmacs-waiting-counter
-          pacmacs-tick-duration-ms)))
+    (cl-decf pacmacs-waiting-counter
+             pacmacs-tick-duration-ms)))
 
 (defun pacmacs--put-object (anim-object)
   (when anim-object
@@ -373,7 +375,7 @@
 
 (defun pacmacs--switch-to-death-state ()
   (setq pacmacs-game-state 'death)
-  (decf pacmacs-lives)
+  (cl-decf pacmacs-lives)
   (plist-put pacmacs-player-state :current-animation
              (pacmacs-load-anim "Pacman-Death")))
 
@@ -486,20 +488,20 @@
     (setq pacmacs-ghosts nil)
     (setq pacmacs-player-state nil)
 
-    (loop
+    (cl-loop
      for line being the element of lines using (index row)
-     do (loop for x being the element of line using (index column)
-              do (cond ((char-equal x ?#)
-                        (add-to-list 'pacmacs-wall-cells 
(pacmacs--make-wall-cell row column)))
+     do (cl-loop for x being the element of line using (index column)
+                 do (cond ((char-equal x ?#)
+                           (add-to-list 'pacmacs-wall-cells 
(pacmacs--make-wall-cell row column)))
 
-                       ((char-equal x ?.)
-                        (add-to-list 'pacmacs-pills (pacmacs--make-pill row 
column)))
+                          ((char-equal x ?.)
+                           (add-to-list 'pacmacs-pills (pacmacs--make-pill row 
column)))
 
-                       ((char-equal x ?o)
-                        (setq pacmacs-player-state (pacmacs--make-player row 
column)))
+                          ((char-equal x ?o)
+                           (setq pacmacs-player-state (pacmacs--make-player 
row column)))
 
-                       ((char-equal x ?g)
-                        (add-to-list 'pacmacs-ghosts (pacmacs--make-ghost row 
column))))))))
+                          ((char-equal x ?g)
+                           (add-to-list 'pacmacs-ghosts (pacmacs--make-ghost 
row column))))))))
 
 (provide 'pacmacs)