[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master c281465 17/17: Merge commit '1b831d21ac9688e3f31703f0b4922
From: |
Artur Malabarba |
Subject: |
[elpa] master c281465 17/17: Merge commit '1b831d21ac9688e3f31703f0b492202f6d24a75b' |
Date: |
Tue, 09 Feb 2016 19:59:19 +0000 |
branch: master
commit c28146524b0a750b83bfb6ee13b59a35c987f383
Merge: 122215e 1b831d2
Author: Artur Malabarba <address@hidden>
Commit: Artur Malabarba <address@hidden>
Merge commit '1b831d21ac9688e3f31703f0b492202f6d24a75b'
---
packages/aggressive-indent/README.md | 6 +--
packages/aggressive-indent/aggressive-indent.el | 49 ++++++++++++-----------
2 files changed, 28 insertions(+), 27 deletions(-)
diff --git a/packages/aggressive-indent/README.md
b/packages/aggressive-indent/README.md
index 8873568..68e07ad 100644
--- a/packages/aggressive-indent/README.md
+++ b/packages/aggressive-indent/README.md
@@ -39,10 +39,8 @@ every programming mode, you can do something like:
#### Manual Installation ####
If you don't want to install from Melpa, you can download it manually,
-place it in your `load-path` along with its two dependencies:
-
-- [Names](https://github.com/Bruce-Connor/names/)
-- and `cl-lib` (which you should already have if your `emacs-version` is at
least 24.3).
+place it in your `load-path` along with its dependency `cl-lib` (which
+you should already have if your `emacs-version` is at least 24.3).
Then require it with:
diff --git a/packages/aggressive-indent/aggressive-indent.el
b/packages/aggressive-indent/aggressive-indent.el
index a4424cb..67c3af8 100644
--- a/packages/aggressive-indent/aggressive-indent.el
+++ b/packages/aggressive-indent/aggressive-indent.el
@@ -3,8 +3,8 @@
;; Copyright (C) 2014, 2015 Free Software Foundation, Inc
;; Author: Artur Malabarba <address@hidden>
-;; URL: http://github.com/Malabarba/aggressive-indent-mode
-;; Version: 1.4
+;; URL: https://github.com/Malabarba/aggressive-indent-mode
+;; Version: 1.5
;; Package-Requires: ((emacs "24.1") (cl-lib "0.5"))
;; Keywords: indent lisp maint tools
;; Prefix: aggressive-indent
@@ -79,12 +79,6 @@
;; GNU General Public License for more details.
;;
-;;; Change Log:
-;; 0.3.1 - 2014/10/30 - Define new delete-backward bound to backspace.
-;; 0.3 - 2014/10/23 - Implement a smarter engine for non-lisp modes.
-;; 0.2 - 2014/10/20 - Reactivate `electric-indent-mode'.
-;; 0.2 - 2014/10/19 - Add variable `aggressive-indent-dont-indent-if', so
the user can prevent indentation.
-;; 0.1 - 2014/10/15 - Release.
;;; Code:
(require 'cl-lib)
@@ -92,6 +86,7 @@
(defgroup aggressive-indent nil
"Customization group for aggressive-indent."
:prefix "aggressive-indent-"
+ :group 'electricity
:group 'indent)
(defun aggressive-indent-bug-report ()
@@ -105,7 +100,7 @@ Please include this in your report!"
(require 'lisp-mnt)
(lm-version)))
emacs-version)
- (browse-url
"https://github.com/Bruce-Connor/aggressive-indent-mode/issues/new"))
+ (browse-url
"https://github.com/Malabarba/aggressive-indent-mode/issues/new"))
(defvar aggressive-indent-mode)
@@ -132,6 +127,7 @@ Please include this in your report!"
jabber-chat-mode
haml-mode
haskell-mode
+ haskell-interactive-mode
image-mode
makefile-mode
makefile-gmake-mode
@@ -234,6 +230,10 @@ This is for internal use only. For user customization, use
'(when (boundp 'iedit-mode)
(add-to-list 'aggressive-indent--internal-dont-indent-if
'iedit-mode)))
+(eval-after-load 'evil
+ '(when (boundp 'iedit-mode)
+ (add-to-list 'aggressive-indent--internal-dont-indent-if
+ 'iedit-mode)))
(eval-after-load 'coq
'(add-to-list 'aggressive-indent--internal-dont-indent-if
'(and (derived-mode-p 'coq-mode)
@@ -335,7 +335,7 @@ until nothing more happens."
;; not at all, stop at the limit.
(< (point) point-limit))))
(forward-line 1)
- (skip-chars-forward "[:blank:]\n\r\xc"))))
+ (skip-chars-forward "[:blank:]\n\r\f"))))
(goto-char p))))
(defun aggressive-indent--softly-indent-region-and-on (l r &rest _)
@@ -353,18 +353,21 @@ or messages."
(defun aggressive-indent--indent-if-changed ()
"Indent any region that changed in the last command loop."
(when aggressive-indent--changed-list
- (unless (or (run-hook-wrapped 'aggressive-indent--internal-dont-indent-if
#'eval)
- (aggressive-indent--run-user-hooks))
- (while-no-input
- (let ((inhibit-modification-hooks t)
- (inhibit-point-motion-hooks t)
- (indent-function
- (if (cl-member-if #'derived-mode-p
aggressive-indent-modes-to-prefer-defun)
- #'aggressive-indent--softly-indent-defun
#'aggressive-indent--softly-indent-region-and-on)))
- (while aggressive-indent--changed-list
- (apply indent-function (car aggressive-indent--changed-list))
- (setq aggressive-indent--changed-list
- (cdr aggressive-indent--changed-list))))))))
+ (save-excursion
+ (save-selected-window
+ (unless (or (run-hook-wrapped
'aggressive-indent--internal-dont-indent-if #'eval)
+ (aggressive-indent--run-user-hooks))
+ (while-no-input
+ (redisplay)
+ (let ((inhibit-modification-hooks t)
+ (inhibit-point-motion-hooks t)
+ (indent-function
+ (if (cl-member-if #'derived-mode-p
aggressive-indent-modes-to-prefer-defun)
+ #'aggressive-indent--softly-indent-defun
#'aggressive-indent--softly-indent-region-and-on)))
+ (while aggressive-indent--changed-list
+ (apply indent-function (car aggressive-indent--changed-list))
+ (setq aggressive-indent--changed-list
+ (cdr aggressive-indent--changed-list))))))))))
(defun aggressive-indent--keep-track-of-changes (l r &rest _)
"Store the limits (L and R) of each change in the buffer."
@@ -375,7 +378,7 @@ or messages."
;;;###autoload
(define-minor-mode aggressive-indent-mode
nil nil " =>"
- '(("" . aggressive-indent-indent-defun)
+ `((,(kbd "C-c C-q") . aggressive-indent-indent-defun)
([backspace]
menu-item "maybe-delete-indentation" ignore :filter
(lambda (&optional _)
- [elpa] master ad1a0b3 07/17: quoting fix, (continued)
- [elpa] master ad1a0b3 07/17: quoting fix, Artur Malabarba, 2016/02/09
- [elpa] master c7a2811 08/17: remove reference to names.el from README.md, Artur Malabarba, 2016/02/09
- [elpa] master ba4508b 09/17: fix indent, Artur Malabarba, 2016/02/09
- [elpa] master 1900801 10/17: Merge pull request #65 from spwhitton/control-char-fix, Artur Malabarba, 2016/02/09
- [elpa] master e613e7e 11/17: Merge pull request #66 from spwhitton/namesdep, Artur Malabarba, 2016/02/09
- [elpa] master 2467ee2 12/17: Remove changelog header, Artur Malabarba, 2016/02/09
- [elpa] master 0cf12ad 13/17: Change a \xc to \f, Artur Malabarba, 2016/02/09
- [elpa] master 651812f 14/17: Fix #67 - Avoid changing the selected window, Artur Malabarba, 2016/02/09
- [elpa] master fd5cbf4 15/17: Add haskell-interactive-mode to excluded modes, Artur Malabarba, 2016/02/09
- [elpa] master 1b831d2 16/17: Version 1.5, Artur Malabarba, 2016/02/09
- [elpa] master c281465 17/17: Merge commit '1b831d21ac9688e3f31703f0b492202f6d24a75b',
Artur Malabarba <=