Merge remote-tracking branch 'origin/master'
2 files changed, 5 insertions(+), 5 deletions(-)
jump to
M emacs/.emacs.d/init.org → emacs/.emacs.d/init.org
@@ -532,8 +532,7 @@ ** Projectile Projectile is awesome for working in projects, especially VCS-backed -ones. I added a couple of functions to allow me to open new projects -based upon some folder conventions I use. +ones. #+BEGIN_SRC emacs-lisp (use-package projectile@@ -545,7 +544,7 @@ ("s-G" . projectile-vc)) :demand t :diminish projectile-mode :config (progn - (projectile-mode 1) + (projectile-global-mode +1) (add-to-list 'projectile-globally-ignored-directories ".stversions") (defun yarn-install (&optional arg)@@ -564,7 +563,8 @@ (projectile-with-default-dir (projectile-project-root) (cmd-to-echo "yarn" (concat "add " package)))) (defun yarn-run (cmd) - (interactive "scommand: ") + (interactive (list + (projectile-completing-read "command: " (alist-get 'scripts (json-read-file (expand-file-name "package.json" (projectile-project-root))))))) (projectile-with-default-dir (projectile-project-root) (cmd-to-echo "yarn" (concat "run " cmd))))