From 6d3df42352f4aa6766b826af4803645b893326ca Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sat, 2 Mar 2019 01:36:53 -0500 Subject: [PATCH] More conservative electric-indent-local-mode Prevent them from propagating to derived modes (I'm looking at you c modes!) --- modules/emacs/electric/autoload.el | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/emacs/electric/autoload.el b/modules/emacs/electric/autoload.el index 2a457a0da..f4e33728b 100644 --- a/modules/emacs/electric/autoload.el +++ b/modules/emacs/electric/autoload.el @@ -17,9 +17,10 @@ Enables `electric-indent-local-mode' in MODES. (unintern fn nil)) ((fset fn (lambda () - (setq-local electric-indent-inhibit nil) - (cl-destructuring-bind (&key chars words) plist - (electric-indent-local-mode +1) - (if chars (setq electric-indent-chars chars)) - (if words (setq +electric-indent-words words))))) + (when (eq major-mode mode) + (setq-local electric-indent-inhibit nil) + (cl-destructuring-bind (&key chars words) plist + (electric-indent-local-mode +1) + (if chars (setq electric-indent-chars chars)) + (if words (setq +electric-indent-words words)))))) (add-hook hook fn))))))