From 9da45b54f3ac69994de8f28a41dfefe3d786d875 Mon Sep 17 00:00:00 2001 From: Jethro Kuan Date: Sat, 24 Apr 2021 04:18:16 +0800 Subject: [PATCH] remove s --- org-roam-capture.el | 10 +++++----- org-roam-compat.el | 2 +- org-roam-completion.el | 3 +-- org-roam-dailies.el | 2 +- org-roam-db.el | 2 +- org-roam-doctor.el | 3 +-- org-roam-macs.el | 2 +- org-roam-mode.el | 2 +- org-roam-protocol.el | 2 +- org-roam-refile.el | 2 +- org-roam-utils.el | 2 +- org-roam.el | 3 +-- 12 files changed, 16 insertions(+), 19 deletions(-) diff --git a/org-roam-capture.el b/org-roam-capture.el index d520ac1..c3d56ba 100644 --- a/org-roam-capture.el +++ b/org-roam-capture.el @@ -36,7 +36,7 @@ (require 'org-roam-macs)) (require 'org-roam-db) (require 'dash) -(require 's) +(require 'subr-x) (require 'cl-lib) ;; Declarations @@ -514,14 +514,14 @@ Return the ID of the location." (user-error "Template needs to specify `:if-new'")) (`(file ,path) (setq path (expand-file-name - (s-trim (org-roam-capture--fill-template path t)) + (string-trim (org-roam-capture--fill-template path t)) org-roam-directory)) (set-buffer (org-capture-target-buffer path)) (widen) (setq p (point))) (`(file+olp ,path ,olp) (setq path (expand-file-name - (s-trim (org-roam-capture--fill-template path t)) + (string-trim (org-roam-capture--fill-template path t)) org-roam-directory)) (set-buffer (org-capture-target-buffer path)) (setq p (point-min)) @@ -530,7 +530,7 @@ Return the ID of the location." (widen)) (`(file+head ,path ,head) (setq path (expand-file-name - (s-trim (org-roam-capture--fill-template path t)) + (string-trim (org-roam-capture--fill-template path t)) org-roam-directory)) (let ((exists-p (file-exists-p path))) (set-buffer (org-capture-target-buffer path)) @@ -540,7 +540,7 @@ Return the ID of the location." (setq p (point-min))) (`(file+head+olp ,path ,head ,olp) (setq path (expand-file-name - (s-trim (org-roam-capture--fill-template path t)) + (string-trim (org-roam-capture--fill-template path t)) org-roam-directory)) (widen) (let ((exists-p (file-exists-p path))) diff --git a/org-roam-compat.el b/org-roam-compat.el index ae6687e..fc8ca2c 100644 --- a/org-roam-compat.el +++ b/org-roam-compat.el @@ -6,7 +6,7 @@ ;; URL: https://github.com/org-roam/org-roam ;; Keywords: org-mode, roam, convenience ;; Version: 2.0.0 -;; Package-Requires: ((emacs "26.1") (dash "2.13") (f "0.17.2") (s "1.12.0") (org "9.4") (emacsql "3.0.0") (emacsql-sqlite3 "1.0.2") (magit-section "2.90.1")) +;; Package-Requires: ((emacs "26.1") (dash "2.13") (f "0.17.2") (org "9.4") (emacsql "3.0.0") (emacsql-sqlite3 "1.0.2") (magit-section "2.90.1")) ;; This file is NOT part of GNU Emacs. diff --git a/org-roam-completion.el b/org-roam-completion.el index 5aef5db..ba4926d 100644 --- a/org-roam-completion.el +++ b/org-roam-completion.el @@ -6,8 +6,7 @@ ;; URL: https://github.com/org-roam/org-roam ;; Keywords: org-mode, roam, convenience ;; Version: 2.0.0 -;; Package-Requires: ((emacs "26.1") (dash "2.13") (f "0.17.2") (s "1.12.0") (org "9.4") (emacsql "3.0.0") (emacsql-sqlite3 "1.0.2") (magit-section "2.90.1")) - +;; Package-Requires: ((emacs "26.1") (dash "2.13") (f "0.17.2") (org "9.4") (emacsql "3.0.0") (emacsql-sqlite3 "1.0.2") (magit-section "2.90.1")) ;; This file is NOT part of GNU Emacs. ;; This program is free software; you can redistribute it and/or modify diff --git a/org-roam-dailies.el b/org-roam-dailies.el index 3cdd86f..3595eb4 100644 --- a/org-roam-dailies.el +++ b/org-roam-dailies.el @@ -8,7 +8,7 @@ ;; URL: https://github.com/org-roam/org-roam ;; Keywords: org-mode, roam, convenience ;; Version: 2.0.0 -;; Package-Requires: ((emacs "26.1") (dash "2.13") (f "0.17.2") (s "1.12.0") (org "9.4") (emacsql "3.0.0") (emacsql-sqlite3 "1.0.2") (magit-section "2.90.1")) +;; Package-Requires: ((emacs "26.1") (dash "2.13") (f "0.17.2") (org "9.4") (emacsql "3.0.0") (emacsql-sqlite3 "1.0.2") (magit-section "2.90.1")) ;; This file is NOT part of GNU Emacs. diff --git a/org-roam-db.el b/org-roam-db.el index f6c93ef..d84f698 100644 --- a/org-roam-db.el +++ b/org-roam-db.el @@ -6,7 +6,7 @@ ;; URL: https://github.com/org-roam/org-roam ;; Keywords: org-mode, roam, convenience ;; Version: 2.0.0 -;; Package-Requires: ((emacs "26.1") (dash "2.13") (f "0.17.2") (s "1.12.0") (org "9.4") (emacsql "3.0.0") (emacsql-sqlite3 "1.0.2") (magit-section "2.90.1")) +;; Package-Requires: ((emacs "26.1") (dash "2.13") (f "0.17.2") (org "9.4") (emacsql "3.0.0") (emacsql-sqlite3 "1.0.2") (magit-section "2.90.1")) ;; This file is NOT part of GNU Emacs. diff --git a/org-roam-doctor.el b/org-roam-doctor.el index e80362a..4570179 100644 --- a/org-roam-doctor.el +++ b/org-roam-doctor.el @@ -6,7 +6,7 @@ ;; URL: https://github.com/jethrokuan/org-roam ;; Keywords: org-mode, roam, convenience ;; Version: 2.0.0 -;; Package-Requires: ((emacs "26.1") (dash "2.13") (f "0.17.2") (s "1.12.0") (org "9.4") (emacsql "3.0.0") (emacsql-sqlite3 "1.0.2") (magit-section "2.90.1")) +;; Package-Requires: ((emacs "26.1") (dash "2.13") (f "0.17.2") (org "9.4") (emacsql "3.0.0") (emacsql-sqlite3 "1.0.2") (magit-section "2.90.1")) ;; This file is NOT part of GNU Emacs. @@ -45,7 +45,6 @@ (require 'cl-lib) (require 'org) (require 'org-element) -(require 's) (require 'dash) (eval-when-compile (require 'org-roam-macs)) diff --git a/org-roam-macs.el b/org-roam-macs.el index b677f91..f6916e7 100644 --- a/org-roam-macs.el +++ b/org-roam-macs.el @@ -6,7 +6,7 @@ ;; URL: https://github.com/org-roam/org-roam ;; Keywords: org-mode, roam, convenience ;; Version: 2.0.0 -;; Package-Requires: ((emacs "26.1") (dash "2.13") (f "0.17.2") (s "1.12.0") (org "9.4") (emacsql "3.0.0") (emacsql-sqlite3 "1.0.2") (magit-section "2.90.1")) +;; Package-Requires: ((emacs "26.1") (dash "2.13") (f "0.17.2") (org "9.4") (emacsql "3.0.0") (emacsql-sqlite3 "1.0.2") (magit-section "2.90.1")) ;; This file is NOT part of GNU Emacs. diff --git a/org-roam-mode.el b/org-roam-mode.el index f4f6dab..51eef1e 100644 --- a/org-roam-mode.el +++ b/org-roam-mode.el @@ -5,7 +5,7 @@ ;; URL: https://github.com/org-roam/org-roam ;; Keywords: org-mode, roam, convenience ;; Version: 2.0.0 -;; Package-Requires: ((emacs "26.1") (dash "2.13") (f "0.17.2") (s "1.12.0") (org "9.4") (emacsql "3.0.0") (emacsql-sqlite3 "1.0.2") (magit-section "2.90.1")) +;; Package-Requires: ((emacs "26.1") (dash "2.13") (f "0.17.2") (org "9.4") (emacsql "3.0.0") (emacsql-sqlite3 "1.0.2") (magit-section "2.90.1")) ;; This file is NOT part of GNU Emacs. diff --git a/org-roam-protocol.el b/org-roam-protocol.el index 1905d8b..30043ec 100644 --- a/org-roam-protocol.el +++ b/org-roam-protocol.el @@ -5,7 +5,7 @@ ;; URL: https://github.com/org-roam/org-roam ;; Keywords: org-mode, roam, convenience ;; Version: 2.0.0 -;; Package-Requires: ((emacs "26.1") (dash "2.13") (f "0.17.2") (s "1.12.0") (org "9.4") (emacsql "3.0.0") (emacsql-sqlite3 "1.0.2") (magit-section "2.90.1")) +;; Package-Requires: ((emacs "26.1") (dash "2.13") (f "0.17.2") (org "9.4") (emacsql "3.0.0") (emacsql-sqlite3 "1.0.2") (magit-section "2.90.1")) ;; This file is NOT part of GNU Emacs. diff --git a/org-roam-refile.el b/org-roam-refile.el index bbe5d66..6b6b598 100644 --- a/org-roam-refile.el +++ b/org-roam-refile.el @@ -6,7 +6,7 @@ ;; URL: https://github.com/org-roam/org-roam ;; Keywords: org-mode, roam, convenience ;; Version: 2.0.0 -;; Package-Requires: ((emacs "26.1") (dash "2.13") (f "0.17.2") (s "1.12.0") (org "9.4") (emacsql "3.0.0") (emacsql-sqlite3 "1.0.2") (magit-section "2.90.1")) +;; Package-Requires: ((emacs "26.1") (dash "2.13") (f "0.17.2") (org "9.4") (emacsql "3.0.0") (emacsql-sqlite3 "1.0.2") (magit-section "2.90.1")) ;; This file is NOT part of GNU Emacs. diff --git a/org-roam-utils.el b/org-roam-utils.el index 3063c94..159a6cb 100644 --- a/org-roam-utils.el +++ b/org-roam-utils.el @@ -6,7 +6,7 @@ ;; URL: https://github.com/org-roam/org-roam ;; Keywords: org-mode, roam, convenience ;; Version: 2.0.0 -;; Package-Requires: ((emacs "26.1") (dash "2.13") (f "0.17.2") (s "1.12.0") (org "9.4") (emacsql "3.0.0") (emacsql-sqlite3 "1.0.2") (magit-section "2.90.1")) +;; Package-Requires: ((emacs "26.1") (dash "2.13") (f "0.17.2") (org "9.4") (emacsql "3.0.0") (emacsql-sqlite3 "1.0.2") (magit-section "2.90.1")) ;; This file is NOT part of GNU Emacs. diff --git a/org-roam.el b/org-roam.el index 469f9a1..39c733b 100644 --- a/org-roam.el +++ b/org-roam.el @@ -6,7 +6,7 @@ ;; URL: https://github.com/org-roam/org-roam ;; Keywords: org-mode, roam, convenience ;; Version: 2.0.0 -;; Package-Requires: ((emacs "26.1") (dash "2.13") (f "0.17.2") (s "1.12.0") (org "9.4") (emacsql "3.0.0") (emacsql-sqlite3 "1.0.2") (magit-section "2.90.1")) +;; Package-Requires: ((emacs "26.1") (dash "2.13") (f "0.17.2") (org "9.4") (emacsql "3.0.0") (emacsql-sqlite3 "1.0.2") (magit-section "2.90.1")) ;; This file is NOT part of GNU Emacs. @@ -43,7 +43,6 @@ (require 'dash) (require 'f) (require 'rx) -(require 's) (require 'seq) (require 'magit-section) (eval-when-compile (require 'subr-x))