diff --git a/modules/completion/ivy/autoload/ivy.el b/modules/completion/ivy/autoload/ivy.el index 09c9d3fc1..118d41ecd 100644 --- a/modules/completion/ivy/autoload/ivy.el +++ b/modules/completion/ivy/autoload/ivy.el @@ -38,13 +38,13 @@ (ivy--switch-buffer-action (s-chop-suffix "[+]" - (substring buffer 0 (s-index-of " " buffer))))) + (substring buffer 0 (string-match-p (regexp-quote " ") buffer))))) (defun +ivy--select-buffer-other-window-action (buffer) (ivy--switch-buffer-other-window-action (s-chop-suffix "[+]" - (substring buffer 0 (s-index-of " " buffer))))) + (substring buffer 0 (string-match-p (regexp-quote " ") buffer))))) ;;;###autoload (defun +ivy/switch-workspace-buffer (&optional other-window-p) diff --git a/modules/feature/file-templates/templates/ruby-mode/__module b/modules/feature/file-templates/templates/ruby-mode/__module index 66aa75de5..3c5bdaeb9 100644 --- a/modules/feature/file-templates/templates/ruby-mode/__module +++ b/modules/feature/file-templates/templates/ruby-mode/__module @@ -1,7 +1,7 @@ # `(progn - (setq-local pkgs (s-split "/" (s-chop-prefix (concat (doom-project-root) "lib/") (file-name-sans-extension buffer-file-name)) t)) + (setq-local pkgs (split-string (s-chop-prefix (concat (doom-project-root) "lib/") (file-name-sans-extension buffer-file-name)) "/" t)) (setq-local pkgs-p (eq (length pkgs) 1)) - (setq-local pkg-module (s-replace " " "::" (s-titleized-words (if pkgs-p (car pkgs) (s-join " " (butlast pkgs)))))) + (setq-local pkg-module (s-replace " " "::" (s-titleized-words (if pkgs-p (car pkgs) (string-join (butlast pkgs) " "))))) (concat "lib/" (file-name-nondirectory buffer-file-name)))` diff --git a/modules/tools/tmux/autoload/tmux.el b/modules/tools/tmux/autoload/tmux.el index f02cddda8..fde2946e5 100644 --- a/modules/tools/tmux/autoload/tmux.el +++ b/modules/tools/tmux/autoload/tmux.el @@ -133,7 +133,7 @@ but do not execute them." flags)))) (if lines (mapcar (lambda (it) - (let ((pane (s-split it ";"))) + (let ((pane (split-string it ";"))) (list (nth 0 pane) :window-id (nth 1 pane) :session-id (nth 2 pane)