From 16ce76a082905d5be4ab005b1176b0c11b76ceb4 Mon Sep 17 00:00:00 2001 From: Roman Coedo Date: Thu, 18 May 2017 17:56:59 +0200 Subject: [PATCH] Always run prettier if prettier-mode is active (#1623) --- editors/emacs/README.md | 10 ++++------ editors/emacs/prettier-js.el | 6 +++--- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/editors/emacs/README.md b/editors/emacs/README.md index 7a6215eca..61458e35f 100644 --- a/editors/emacs/README.md +++ b/editors/emacs/README.md @@ -2,15 +2,13 @@ Add this to your init: ```elisp (require 'prettier-js) -(prettier-mode) ``` -If you don't use `js-mode`, which is what Prettier targets by default, you'll need to first set your major-mode of choice: - +Then you can hook to your favorite javascript mode: ```elisp -(require 'prettier-js) -(setq prettier-target-mode "js2-mode") -(prettier-mode) +(add-hook 'js2-mode-hook 'prettier-mode) +(add-hook 'web-mode-hook 'prettier-mode) +... ``` To adjust the CLI args used for the prettier command, you can customize the `prettier-args` variable: diff --git a/editors/emacs/prettier-js.el b/editors/emacs/prettier-js.el index 52ddd1d7b..128ea2ab4 100644 --- a/editors/emacs/prettier-js.el +++ b/editors/emacs/prettier-js.el @@ -223,9 +223,9 @@ function." (define-minor-mode prettier-mode "Runs prettier on file save when this mode is turned on" :lighter " prettier" - :global t + :global nil (if prettier-mode - (add-hook 'before-save-hook 'prettier-before-save) - (remove-hook 'before-save-hook 'prettier-before-save))) + (add-hook 'before-save-hook 'prettier nil 'local) + (remove-hook 'before-save-hook 'prettier 'local))) (provide 'prettier-js)