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

Electric-indent on words

Browse source
This commit is contained in:
Henrik Lissner 2016-03-23 11:59:06 -04:00
parent 3c72351220
commit 28a720e626
4 changed files with 22 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
core/core-editor.el
View file

@ -80,7 +80,6 @@ enable multiple minor modes for the same regexp.")
(add-hook! help-mode 'visual-line-mode) (add-hook! help-mode 'visual-line-mode)
(add-hook! special-mode (setq truncate-lines nil)) (add-hook! special-mode (setq truncate-lines nil))
(add-hook! python-mode 'electric-indent-local-mode)
(add-hook! change-major-mode-hook (add-hook! change-major-mode-hook
(when indent-tabs-mode (whitespace-mode +1))) (when indent-tabs-mode (whitespace-mode +1)))
@ -108,6 +107,17 @@ enable multiple minor modes for the same regexp.")
;; (global-whitespace-mode 1) ; Show whitespace ;; (global-whitespace-mode 1) ; Show whitespace
;; (global-font-lock-mode t) ; Enable syntax highlighting for older emacs ;; (global-font-lock-mode t) ; Enable syntax highlighting for older emacs
(electric-indent-mode -1) ; on by default (electric-indent-mode -1) ; on by default
(defvar narf-electric-indent-words '())
(make-variable-buffer-local 'narf-electric-indent-words)
(setq electric-indent-chars '(?\n ?\^?))
(defvar narf-electric-indent-p nil)
(push (lambda (c)
(when (eolp)
(save-excursion
(backward-word)
(looking-at-p (concat "\\<" (regexp-opt narf-electric-indent-words))))))
electric-indent-functions)
(global-auto-revert-mode 1) ; revert buffers for changed files (global-auto-revert-mode 1) ; revert buffers for changed files
;; window config undo/redo ;; window config undo/redo

4
modules/module-lua.el
View file

@ -9,6 +9,10 @@
(after! company-dict (after! company-dict
(add-to-list 'company-dict-minor-mode-list 'love-mode)) (add-to-list 'company-dict-minor-mode-list 'love-mode))
(add-hook! lua-mode
(electric-indent-local-mode +1)
(setq narf-electric-indent-words '("else" "end")))
(defun narf-inf-lua () (defun narf-inf-lua ()
(lua-start-process "lua" "lua") (lua-start-process "lua" "lua")
(pop-to-buffer lua-process-buffer))) (pop-to-buffer lua-process-buffer)))

4
modules/module-ruby.el
View file

@ -16,6 +16,10 @@
;; Formatting ;; Formatting
(setq ruby-deep-indent-paren t) (setq ruby-deep-indent-paren t)
(add-hook! ruby-mode
(electric-indent-local-mode +1)
(setq narf-electric-indent-words '("else" "end" "elseif")))
;; Don't interfere with my custom RET behavior ;; Don't interfere with my custom RET behavior
(define-key ruby-mode-map [?\n] nil) (define-key ruby-mode-map [?\n] nil)

4
modules/module-sh.el
View file

@ -17,7 +17,9 @@
(define-repl! sh-mode narf/inf-shell) (define-repl! sh-mode narf/inf-shell)
(add-hook! sh-mode 'flycheck-mode) (add-hook! sh-mode 'flycheck-mode)
(add-hook! sh-mode 'electric-indent-local-mode) (add-hook! sh-mode
(electric-indent-local-mode +1)
(setq narf-electric-indent-words '("else" "elif" "fi" "done")))
(require 'company-shell) (require 'company-shell)