From 6bffa6e47f568a40eca7e520043319f1c530af96 Mon Sep 17 00:00:00 2001 From: Maciej Szlosarczyk Date: Sat, 26 May 2018 11:13:26 +0300 Subject: [PATCH] Add specific configuration for internet.ee projects --- config/behaviour.el | 7 +++++++ languages/ruby.el | 10 +++++----- languages/web.el | 17 +++++++++++------ 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/config/behaviour.el b/config/behaviour.el index ee86535..2289ff7 100644 --- a/config/behaviour.el +++ b/config/behaviour.el @@ -115,6 +115,13 @@ (column-enforce-mode -1) (column-enforce-mode 1)) +(defun set-width-100 () + "Set line length to 100 columns." + (interactive) + (setq column-enforce-column 100) + (column-enforce-mode -1) + (column-enforce-mode 1)) + (defun set-width-80 () "Set line length to 80 columns." (interactive) diff --git a/languages/ruby.el b/languages/ruby.el index ffc472d..cdef6dc 100644 --- a/languages/ruby.el +++ b/languages/ruby.el @@ -12,7 +12,10 @@ "Setup editor for Ruby." ;; Indentation and line length - (set-width-80) + (if (string-match-p "internetee/" (buffer-file-name)) + (set-width-100) + (set-width-80)) + (set-indent 2) (setq ruby-deep-indent-paren nil) @@ -23,10 +26,7 @@ (setq ruby-deep-indent-paren nil) ;; Do not insert encoding comments - (setq ruby-insert-encoding-magic-comment nil) - - ;; Use web-mode for erb - (add-to-list 'auto-mode-alist '("\\.erb\\'" . web-mode))) + (setq ruby-insert-encoding-magic-comment nil)) ;;========== Rspec config ========================= (defun rspec-ruby-mode-config () diff --git a/languages/web.el b/languages/web.el index 0c920e6..af28268 100644 --- a/languages/web.el +++ b/languages/web.el @@ -6,12 +6,17 @@ ;;========== Editor config ========================= (defun editor-config-web () "Editor configuration for Web." - (set-indent 2) (set-width-120) - (setq web-mode-markup-indent-offset 2) - (setq web-mode-code-indent-offset 2) - (setq css-indent-offset 2)) + (if (string-match-p "internetee/" (buffer-file-name)) + ((set-indent 4) + (setq web-mode-markup-indent-offset 4) + (setq web-mode-code-indent-offset 4) + (setq css-indent-offset 4)) + ((set-indent 2) + (setq web-mode-markup-indent-offset 2) + (setq web-mode-code-indent-offset 2) + (setq css-indent-offset 2)))) ;;========== Code completion ======================= (defun completion-config-web () @@ -24,8 +29,8 @@ company-files)))) ;;========== Hooks ================================= -(add-hook 'html-mode-hook 'editor-config-web) -(add-hook 'html-mode-hook 'completion-config-web) +;; Use web-mode for erb +(add-to-list 'auto-mode-alist '("\\.erb\\'" . web-mode)) (add-hook 'web-mode-hook 'editor-config-web) (add-hook 'web-mode-hook 'completion-config-web)