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

Replace :electric with set-electric-rules!

Browse source 
And general refactor of the emacs/electric-indent module.

Also updates (set! :electric ...) references in various :lang modules
This commit is contained in:
Henrik Lissner 2018-06-15 12:30:56 +02:00
parent f801939ce7
commit 9f0ebe42e8
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
9 changed files with 39 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

25
modules/emacs/electric-indent/autoload.el Normal file
View file

@ -0,0 +1,25 @@
;;; emacs/electric-indent/autoload.el -*- lexical-binding: t; -*-
;;;###autodef
(defun set-electric! (modes &rest plist)
"Declare :words (list of strings) or :chars (lists of chars) in MODES that
trigger electric indentation."
(declare (indent 1))
(cl-destructuring-bind (&key char words) plist
(when (or chars words)
(let* ((name (mapconcat #'symbol-name modes "-"))
(fn (intern (format "+electric-indent--init-%s" name))))
(fset fn
(lambda () (electric-indent-local-mode +1)
(if chars (setq electric-indent-chars chars))
(if words (setq +electric-indent-words words))))
(dolist (mode modes)
(add-hook (intern (format "%s-hook" mode)) fn-name))))))
;; FIXME obsolete :electric
;;;###autoload
(def-setting! :electric (modes &rest plist)
"Declare :words (list of strings) or :chars (lists of chars) in MODES that
trigger electric indentation."
:obsolete set-electric!
`(set-electric! ,modes ,@plist))

29
modules/emacs/electric-indent/config.el
View file

@ -2,37 +2,18 @@
;; Smarter, keyword-based electric-indent
(defvar doom-electric-indent-p nil
"TODO")
(defvar-local doom-electric-indent-words '()
"TODO")
(def-setting! :electric (modes &rest plist)
"Declare :words (list of strings) or :chars (lists of chars) in MODES that
trigger electric indentation."
(declare (indent 1))
(let ((modes (doom-enlist (doom-unquote modes)))
(chars (doom-unquote (plist-get plist :chars)))
(words (doom-unquote (plist-get plist :words))))
(when (or chars words)
(let ((fn-name (intern (format "doom--init-electric-%s" (mapconcat #'symbol-name modes "-")))))
`(progn
(defun ,fn-name ()
(electric-indent-local-mode +1)
,@(if chars `((setq electric-indent-chars ',chars)))
,@(if words `((setq doom-electric-indent-words ',words))))
(add-hook! ,modes #',fn-name))))))
(defvar-local +electric-indent-words '()
"The list of electric words. Typing these will trigger reindentation of the
current line.")
;;
(after! electric
(setq-default electric-indent-chars '(?\n ?\^?))
(defun +electric-indent|char (_c)
(when (and (eolp) doom-electric-indent-words)
(when (and (eolp) +electric-indent-words)
(save-excursion
(backward-word)
(looking-at-p
(concat "\\<" (regexp-opt doom-electric-indent-words))))))
(looking-at-p (concat "\\<" (regexp-opt +electric-indent-words))))))
(add-to-list 'electric-indent-functions #'+electric-indent|char nil #'eq))