From 007ae88ed29f950a37aff17d658b956bea7b0b92 Mon Sep 17 00:00:00 2001
From: Bozhidar Batsov <bozhidar@batsov.com>
Date: Tue, 8 May 2018 22:54:42 +0300
Subject: [PATCH] Replace dash with the built-in cl-lib

---
 core/prelude-core.el              | 7 +++----
 core/prelude-editor.el            | 6 +++---
 core/prelude-packages.el          | 1 -
 sample/prelude-pinned-packages.el | 2 --
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/core/prelude-core.el b/core/prelude-core.el
index bfb98a8..4330d89 100644
--- a/core/prelude-core.el
+++ b/core/prelude-core.el
@@ -33,8 +33,7 @@
 ;;; Code:
 
 (require 'thingatpt)
-(require 'dash)
-(require 'ov)
+(require 'cl-lib)
 
 (defun prelude-buffer-mode (buffer-or-name)
   "Retrieve the `major-mode' of BUFFER-OR-NAME."
@@ -139,8 +138,8 @@ With a prefix ARG updates all installed packages."
   (when (y-or-n-p "Do you want to update Prelude's packages? ")
     (if arg
         (epl-upgrade)
-      (epl-upgrade (-filter (lambda (p) (memq (epl-package-name p) prelude-packages))
-                            (epl-installed-packages))))
+      (epl-upgrade (cl-remove-if-not (lambda (p) (memq (epl-package-name p) prelude-packages))
+                                     (epl-installed-packages))))
     (message "Update finished. Restart Emacs to complete the process.")))
 
 ;;; Emacs in macOS already has fullscreen support
diff --git a/core/prelude-editor.el b/core/prelude-editor.el
index eb135f7..89b65aa 100644
--- a/core/prelude-editor.el
+++ b/core/prelude-editor.el
@@ -138,9 +138,9 @@
 (defun prelude-recentf-exclude-p (file)
   "A predicate to decide whether to exclude FILE from recentf."
   (let ((file-dir (file-truename (file-name-directory file))))
-    (-any-p (lambda (dir)
-              (string-prefix-p dir file-dir))
-            (mapcar 'file-truename (list prelude-savefile-dir package-user-dir)))))
+    (cl-some (lambda (dir)
+               (string-prefix-p dir file-dir))
+             (mapcar 'file-truename (list prelude-savefile-dir package-user-dir)))))
 
 (add-to-list 'recentf-exclude 'prelude-recentf-exclude-p)
 
diff --git a/core/prelude-packages.el b/core/prelude-packages.el
index e9ce53a..27488c0 100644
--- a/core/prelude-packages.el
+++ b/core/prelude-packages.el
@@ -59,7 +59,6 @@
     beacon
     browse-kill-ring
     crux
-    dash
     discover-my-major
     diff-hl
     diminish
diff --git a/sample/prelude-pinned-packages.el b/sample/prelude-pinned-packages.el
index 6d79431..bb2b4b6 100644
--- a/sample/prelude-pinned-packages.el
+++ b/sample/prelude-pinned-packages.el
@@ -25,7 +25,6 @@
         (cython-mode . "melpa-stable")
         (d-mode . "melpa-stable")
         (dart-mode . "melpa-stable")
-        (dash . "melpa-stable")
         (diff-hl . "melpa-stable")
         (diminish . "melpa-stable")
         (discover-my-major . "melpa-stable")
@@ -92,7 +91,6 @@
         (mediawiki . "melpa-stable")
         (merlin . "melpa-stable")
         (operate-on-number . "melpa-stable")
-        (ov . "melpa-stable")
         (pcache . "melpa-stable")
         (php-mode . "melpa-stable")
         (pkg-info . "melpa-stable")