From 416add6952d215d98d193aeea141d084463cbb21 Mon Sep 17 00:00:00 2001 From: Bastien Date: Sun, 7 Jul 2019 19:59:19 +0200 Subject: [PATCH] Prevent electric indentation within inlined docstrings Fix https://github.com/clojure-emacs/clojure-mode/pull/447#issuecomment-507388077 --- clojure-mode.el | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/clojure-mode.el b/clojure-mode.el index db0420a8..0259728b 100644 --- a/clojure-mode.el +++ b/clojure-mode.el @@ -554,9 +554,14 @@ replacement for `cljr-expand-let`." (clojure-font-lock-setup) (add-hook 'paredit-mode-hook #'clojure-paredit-setup) ;; `electric-layout-post-self-insert-function' prevents indentation in strings - ;; and comments, force indentation in docstrings: + ;; and comments, force indentation of non-inlined docstrings: (add-hook 'electric-indent-functions - (lambda (_char) (if (clojure-in-docstring-p) 'do-indent))) + (lambda (_char) (if (and (clojure-in-docstring-p) + (save-excursion + (beginning-of-line-text) + (eq (get-text-property (point) 'face) + 'font-lock-doc-face))) + 'do-indent))) ;; integration with project.el (add-hook 'project-find-functions #'clojure-current-project))