diff options
| author | Jesús <heckyel@hyperbola.info> | 2021-10-14 22:36:46 -0500 |
|---|---|---|
| committer | Jesús <heckyel@hyperbola.info> | 2021-10-14 22:36:46 -0500 |
| commit | 5c590da187d67db5c4080145d93388cbb40508c3 (patch) | |
| tree | e3afc90afea22dd565381b23513c1ce6c698faf7 /modules | |
| parent | e8d4767adc49dbfe337233005d3c414e3032ee29 (diff) | |
| parent | 3fe51a5a87a2ceda9c5d5bb952f5d732e7b03da3 (diff) | |
| download | emacs-personal-5c590da187d67db5c4080145d93388cbb40508c3.tar.lz emacs-personal-5c590da187d67db5c4080145d93388cbb40508c3.tar.xz emacs-personal-5c590da187d67db5c4080145d93388cbb40508c3.zip | |
Merge branch 'master' of ssh://hgit/software/emacs-personal into master
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/init-editorconfig.el | 1 | ||||
| -rw-r--r-- | modules/init-gui.el | 1 | ||||
| -rw-r--r-- | modules/init-js-two.el | 4 |
3 files changed, 4 insertions, 2 deletions
diff --git a/modules/init-editorconfig.el b/modules/init-editorconfig.el index c8466b8..0ac6121 100644 --- a/modules/init-editorconfig.el +++ b/modules/init-editorconfig.el @@ -7,6 +7,7 @@ ;; EditorConfig ;;---------------------------------------------------------------------------- (use-package editorconfig + :ensure t :config (when (and (require 'editorconfig nil t) (fboundp 'editorconfig-mode)) diff --git a/modules/init-gui.el b/modules/init-gui.el index 1e70495..7b83c4b 100644 --- a/modules/init-gui.el +++ b/modules/init-gui.el @@ -64,6 +64,7 @@ (global-set-key (kbd "s-C--") 'sacha/decrease-font-size) ; C-- decrease font size (global-set-key (kbd "<f12>") 'revert-buffer-no-confirm) (global-set-key (kbd "s-h") 'global-hl-line-mode) ; Highlight current line +(global-set-key (kbd "M-c") nil) ; disable capitalize-word ;;--------------------------------------------------------------------------- ;; FullScreen diff --git a/modules/init-js-two.el b/modules/init-js-two.el index eba6ed6..fef9bb9 100644 --- a/modules/init-js-two.el +++ b/modules/init-js-two.el @@ -13,8 +13,8 @@ (company-mode)))) :config ;; have 4 space indentation by default - (setq js-indent-level 4 - js2-basic-offset 4 + (setq js-indent-level 2 + js2-basic-offset 2 js-chain-indent t) ;; use eslint_d insetad of eslint for faster linting |