emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use s.el instead of subr-x string funcs

Browse source
This commit is contained in:
Henrik Lissner 2017-03-25 01:45:23 -04:00
parent 2526101de6
commit 2a377b44f1
6 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/autoload/system.el
View file

@ -22,11 +22,11 @@
"Runs a shell command and prints any output to the DOOM buffer." "Runs a shell command and prints any output to the DOOM buffer."
(let ((cmd-list (split-string command " "))) (let ((cmd-list (split-string command " ")))
(cond ((equal (car cmd-list) "sudo") (cond ((equal (car cmd-list) "sudo")
(apply 'doom-sudo (string-join (cdr cmd-list) " ") args)) (apply 'doom-sudo (s-join " " (cdr cmd-list)) args))
((let ((bin (executable-find "npm"))) ((let ((bin (executable-find "npm")))
(and (file-exists-p bin) (and (file-exists-p bin)
(not (file-writable-p bin)))) (not (file-writable-p bin))))
(apply 'doom-sudo (string-join cmd-list " ") args)) (apply 'doom-sudo (s-join " " cmd-list) args))
(t (t
(princ (shell-command-to-string (apply 'format command args))))))) (princ (shell-command-to-string (apply 'format command args)))))))

2
modules/feature/version-control/autoload.el
View file

@ -17,7 +17,7 @@ Fallback to repository root."
(error (error
(setq url (shell-command-to-string "hub browse -u --")) (setq url (shell-command-to-string "hub browse -u --"))
(setq url (if url (setq url (if url
(concat (string-trim url) "/" (concat (s-trim url) "/"
(file-relative-name (buffer-file-name) (file-relative-name (buffer-file-name)
(doom-project-root)) (doom-project-root))
(when (use-region-p) (when (use-region-p)

2
modules/lang/python/packages.el
View file

@ -20,5 +20,5 @@
(when-let (pkgs (cl-remove-if (when-let (pkgs (cl-remove-if
(lambda (pkg) (zerop (shell-command (format "pip show %s" pkg)))) (lambda (pkg) (zerop (shell-command (format "pip show %s" pkg))))
'("jedi" "setuptools"))) '("jedi" "setuptools")))
(sh "pip install %s" (string-join pkgs " ")) (sh "pip install %s" (s-join " " pkgs))
t)) t))

2
modules/lang/rust/packages.el
View file

@ -18,7 +18,7 @@
(unless (executable-find "rustc") (push "rust" pkgs)) (unless (executable-find "rustc") (push "rust" pkgs))
(unless (executable-find "cargo") (push "cargo" pkgs)) (unless (executable-find "cargo") (push "cargo" pkgs))
(when pkgs (when pkgs
(sudo "pacman --noconfirm -S %s" (string-join pkgs " "))))) (sudo "pacman --noconfirm -S %s" (s-join " " pkgs)))))
('debian) ;; TODO ('debian) ;; TODO
('macos ('macos
(unless (executable-find "rustc") (unless (executable-find "rustc")

2
modules/lang/sh/packages.el
View file

@ -7,7 +7,7 @@
;; ;;
(def-bootstrap! sh (def-bootstrap! sh
(when-let (progs (cl-remove-if 'executable-find '("zshdb" "bashdb" "shellcheck"))) (when-let (progs (cl-remove-if 'executable-find '("zshdb" "bashdb" "shellcheck")))
(let ((prog-str (string-join progs " "))) (let ((prog-str (s-join " " progs)))
(pcase (doom-system-os) (pcase (doom-system-os)
('arch ('arch
(sudo "pacman --noconfirm -S %s" prog-str)) (sudo "pacman --noconfirm -S %s" prog-str))

2
modules/tools/electric-indent/config.el
View file

@ -26,7 +26,7 @@ trigger electric indentation."
(chars (plist-get plist :chars)) (chars (plist-get plist :chars))
(words (plist-get plist :words))) (words (plist-get plist :words)))
(when (or chars words) (when (or chars words)
(let ((fn-name (intern (format "doom--electric-%s" (string-join (mapcar 'symbol-name modes) "-"))))) (let ((fn-name (intern (format "doom--electric-%s" (s-join "-" (mapcar 'symbol-name modes))))))
`(progn `(progn
(defun ,fn-name () (defun ,fn-name ()
(electric-indent-local-mode +1) (electric-indent-local-mode +1)