From 30066b4ba0fbde562219ea1d977cdf1f08a69baa Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Thu, 17 Sep 2020 16:26:09 +0100 Subject: refactor(notable): Remove dependency on dash It was only used for #'-each, for which the built-in dolist is sufficient. Change-Id: I326d8b733b36b2edfebd4e9384e70b8a570fee0f Reviewed-on: https://cl.tvl.fyi/c/depot/+/1987 Tested-by: BuildkiteCI Reviewed-by: tazjin --- tools/emacs-pkgs/notable/default.nix | 2 +- tools/emacs-pkgs/notable/notable.el | 19 ++++++++----------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/tools/emacs-pkgs/notable/default.nix b/tools/emacs-pkgs/notable/default.nix index 94af474dad..22c906609b 100644 --- a/tools/emacs-pkgs/notable/default.nix +++ b/tools/emacs-pkgs/notable/default.nix @@ -5,7 +5,7 @@ pkgs.emacsPackages.trivialBuild rec { version = "1.0"; src = ./notable.el; packageRequires = with pkgs.emacsPackages; [ - dash f ht s + f ht s depot.tools.emacs-pkgs.dottime ]; } diff --git a/tools/emacs-pkgs/notable/notable.el b/tools/emacs-pkgs/notable/notable.el index d6d2dbe348..ba59a1ee2b 100644 --- a/tools/emacs-pkgs/notable/notable.el +++ b/tools/emacs-pkgs/notable/notable.el @@ -20,7 +20,6 @@ ;; specified by `notable-note-dir'. (require 'cl-lib) -(require 'dash) (require 'dottime) (require 'f) (require 'ht) @@ -60,13 +59,12 @@ (defvar notable--next-note (let ((next 0)) - (-each (f-entries notable-note-dir) - (lambda (file) - (when-let* ((match (string-match notable--note-regexp file)) - (id (string-to-number - (match-string 1 file))) - (larger (> id next))) - (setq next id)))) + (dolist (file (f-entries notable-note-dir)) + (when-let* ((match (string-match notable--note-regexp file)) + (id (string-to-number + (match-string 1 file))) + (larger (> id next))) + (setq next id))) (+ 1 next)) "Next ID to use for notes. Initial value is determined based on the existing notes files.") @@ -219,9 +217,8 @@ the list buffer. For larger notes only the first line is displayed." - (-each notes - (lambda (id) - (notable--render-note id (notable--get-note id))))) + (dolist (id notes) + (notable--render-note id (notable--get-note id)))) ;; User-facing functions -- cgit 1.4.1