[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 201ec03 025/108: Indent changed region instead of defun fo
From: |
Artur Malabarba |
Subject: |
[elpa] master 201ec03 025/108: Indent changed region instead of defun for modes which aren't emacs-lisp. |
Date: |
Wed, 25 Mar 2015 18:38:54 +0000 |
branch: master
commit 201ec036cba0f74766da272e8f73ca3bcf469111
Author: Artur Malabarba <address@hidden>
Commit: Artur Malabarba <address@hidden>
Indent changed region instead of defun for modes which aren't emacs-lisp.
Fix #7
---
aggressive-indent.el | 54 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 52 insertions(+), 2 deletions(-)
diff --git a/aggressive-indent.el b/aggressive-indent.el
index a88204b..9854c42 100644
--- a/aggressive-indent.el
+++ b/aggressive-indent.el
@@ -131,6 +131,21 @@ commands will NOT be followed by a re-indent."
This is for internal use only. For user customization, use
`aggressive-indent-dont-indent-if' instead.")
+(defcustom modes-to-prefer-defun '(emacs-lisp-mode)
+ "List of major-modes in which indenting defun is preferred.
+Add here any major modes with very good definitions of
+`end-of-defun' and `beginning-of-defun', or modes which bug out
+if you have `after-change-functions' (such as paredit).
+
+If current major mode is derived from one of these,
+`aggressive-indent-mode' will call
+`aggressive-indent-indent-defun' after every command. Otherwise,
+it will call `aggressive-indent-indent-region-and-on' after every
+buffer change."
+ :type '(repeat symbol)
+ :group 'aggressive-indent
+ :package-version '(aggressive-indent . "0.3"))
+
(eval-after-load 'yasnippet
'(when (boundp 'yas--active-field-overlay)
(add-to-list 'aggressive-indent--internal-dont-indent-if
@@ -221,6 +236,38 @@ Like `aggressive-indent-indent-defun', but wrapped in a
`aggressive-indent--do-softly'."
(-do-softly (indent-defun)))
+:autoload
+(defun indent-region-and-on (l r)
+ "Indent region between L and R, and then some.
+Call `indent-region' between L and R, and then keep indenting
+until nothing more happens."
+ (interactive "r")
+ (let ((p (point-marker))
+ was-begining-of-line)
+ (set-marker-insertion-type p t)
+ (goto-char r)
+ (setq was-begining-of-line
+ (= r (line-beginning-position)))
+ ;; Indent the affected region.
+ (unless (= l r) (indent-region l r))
+ ;; `indent-region' doesn't do anything if R was the beginning of a line,
so we indent manually there.
+ (when was-begining-of-line
+ (indent-according-to-mode))
+ ;; And then we indent each following line until nothing happens.
+ (forward-line 1)
+ (while (/= (progn (skip-chars-forward "[:blank:]")
+ (point))
+ (progn (indent-according-to-mode)
+ (point)))
+ (forward-line 1))
+ (goto-char p)))
+
+(defun -softly-indent-region-and-on (l r &rest _)
+ "Indent current defun unobstrusively.
+Like `aggressive-indent-indent-region-and-on', but wrapped in a
+`aggressive-indent--do-softly'."
+ (-do-softly (indent-region-and-on l r)))
+
;;; Minor modes
:autoload
@@ -233,8 +280,11 @@ Like `aggressive-indent-indent-defun', but wrapped in a
(mode -1)
(when (fboundp 'electric-indent-local-mode)
(electric-indent-local-mode 1))
- (add-hook 'post-command-hook #'-softly-indent-defun nil 'local))
- (remove-hook 'post-command-hook #'-softly-indent-defun 'local)))
+ (if (cl-member-if #'derived-mode-p modes-to-prefer-defun)
+ (add-hook 'post-command-hook #'-softly-indent-defun nil 'local)
+ (add-hook 'after-change-functions #'-softly-indent-region-and-on nil
'local)))
+ (remove-hook 'post-command-hook #'-softly-indent-defun 'local)
+ (remove-hook 'after-change-functions #'-softly-indent-region-and-on
'local)))
:autoload
(define-globalized-minor-mode global-aggressive-indent-mode
- [elpa] master 215ddf7 030/108: Don't use do-softly for now., (continued)
- [elpa] master 215ddf7 030/108: Don't use do-softly for now., Artur Malabarba, 2015/03/25
- [elpa] master 81fadf1 029/108: Add modes to prefer defun., Artur Malabarba, 2015/03/25
- [elpa] master e4d3601 026/108: Implement a smarter engine for non-lisp modes., Artur Malabarba, 2015/03/25
- [elpa] master e774765 031/108: Merge branch 'region-indent', Artur Malabarba, 2015/03/25
- [elpa] master 7762250 032/108: Don't indent on empty line., Artur Malabarba, 2015/03/25
- [elpa] master 6e1d5a1 027/108: Merge pull request #12 from Bruce-Connor/region-indent, Artur Malabarba, 2015/03/25
- [elpa] master c15c56d 033/108: Skip empty lines when indenting blocks, Artur Malabarba, 2015/03/25
- [elpa] master 82c5d78 034/108: Merge pull request #17 from pmachata/master, Artur Malabarba, 2015/03/25
- [elpa] master b4b8dc3 037/108: Merge branch 'master' of github.com:Bruce-Connor/aggressive-indent-mode, Artur Malabarba, 2015/03/25
- [elpa] master 820db3c 035/108: Don't indent inside comments, but allow as an option., Artur Malabarba, 2015/03/25
- [elpa] master 201ec03 025/108: Indent changed region instead of defun for modes which aren't emacs-lisp.,
Artur Malabarba <=
- [elpa] master c4957eb 041/108: Fix bug on buffers with no final newline., Artur Malabarba, 2015/03/25
- [elpa] master d3948b0 036/108: Don't execute syntax-ppss if the controlling variable is t., Artur Malabarba, 2015/03/25
- [elpa] master c35bc62 039/108: Skip indenting lines only barely touched by changed region., Artur Malabarba, 2015/03/25
- [elpa] master 130b938 040/108: Redundant group specification., Artur Malabarba, 2015/03/25
- [elpa] master 69b5adc 042/108: Merge pull request #20 from tuhdo/master, Artur Malabarba, 2015/03/25
- [elpa] master c81d5c2 044/108: Add erc-mode to excluded-modes, Artur Malabarba, 2015/03/25
- [elpa] master 278084b 047/108: Add more to excluded-modes, Artur Malabarba, 2015/03/25
- [elpa] master d0a4bae 048/108: Typo, Artur Malabarba, 2015/03/25
- [elpa] master 7d8d0d2 038/108: Version bump, Artur Malabarba, 2015/03/25
- [elpa] master 45d25c3 045/108: List dependency in the Readme, Artur Malabarba, 2015/03/25