[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master e257808 413/433: Copy mmm-indent-line body into mmm-indent
From: |
Dmitry Gutov |
Subject: |
[elpa] master e257808 413/433: Copy mmm-indent-line body into mmm-indent-narrowed |
Date: |
Thu, 15 Mar 2018 19:44:46 -0400 (EDT) |
branch: master
commit e257808a95256fe1a65ddc5bb7cacd7c4d48249b
Author: Adam <address@hidden>
Commit: Adam <address@hidden>
Copy mmm-indent-line body into mmm-indent-narrowed
---
mmm-region.el | 24 +++++++++++++++++-------
1 file changed, 17 insertions(+), 7 deletions(-)
diff --git a/mmm-region.el b/mmm-region.el
index 5b6bec1..a0e5de5 100644
--- a/mmm-region.el
+++ b/mmm-region.el
@@ -873,15 +873,25 @@ indentation function. See `mmm-indent-line' as the
starting point.")
(defun mmm-indent-line-narrowed ()
"An indent function which works on modes which don't play well with mmm-mode.
-Calls `mmm-indent-line' internally, but narrows the buffer before indenting to
+Works like `mmm-indent-line' , but narrows the buffer before indenting to
appease modes which rely on constructs like (point-min) to indent."
(interactive)
- (if mmm-current-overlay
- (save-restriction
- (narrow-to-region (overlay-start mmm-current-overlay)
- (overlay-end mmm-current-overlay))
- (mmm-indent-line))
- (mmm-indent-line)))
+ (funcall
+ (save-excursion
+ (back-to-indentation)
+ (mmm-update-submode-region)
+ (let ((indent-function (get
+ (if (and mmm-current-overlay
+ (> (overlay-end mmm-current-overlay)
(point)))
+ mmm-current-submode
+ mmm-primary-mode)
+ 'mmm-indent-line-function)))
+ (if mmm-current-overlay
+ (save-restriction
+ (narrow-to-region (overlay-start mmm-current-overlay)
+ (overlay-end mmm-current-overlay))
+ indent-function)
+ indent-function)))))
(defun mmm-indent-line ()
(interactive)
- [elpa] master 1e655f7 395/433: mmm-save-local-variables: Add forward-sexp-function and SMIE-related vars, (continued)
- [elpa] master 1e655f7 395/433: mmm-save-local-variables: Add forward-sexp-function and SMIE-related vars, Dmitry Gutov, 2018/03/15
- [elpa] master c23be30 384/433: Limit html-php to .php files, Dmitry Gutov, 2018/03/15
- [elpa] master 70f115e 348/433: Update the TODO, Dmitry Gutov, 2018/03/15
- [elpa] master 02a3248 394/433: Merge pull request #49 from namikister/css-mode, Dmitry Gutov, 2018/03/15
- [elpa] master 2995771 420/433: Update copyright dates again, Dmitry Gutov, 2018/03/15
- [elpa] master 3f771f7 419/433: Use cl-lib instead of cl, Dmitry Gutov, 2018/03/15
- [elpa] master 912f3bd 335/433: Use syntax-propertize-function set in submodes, Dmitry Gutov, 2018/03/15
- [elpa] master c9dea38 363/433: Update the FAQ, Dmitry Gutov, 2018/03/15
- [elpa] master 628e1dc 380/433: Merge pull request #31 from tom-tan/add-autoloads, Dmitry Gutov, 2018/03/15
- [elpa] master 01b5cd9 338/433: * mmm-apply-all: flush syntax cache, Dmitry Gutov, 2018/03/15
- [elpa] master e257808 413/433: Copy mmm-indent-line body into mmm-indent-narrowed,
Dmitry Gutov <=
- [elpa] master 3895201 294/433: Merge pull request #3 from dgutov/shortcuts-fix, Dmitry Gutov, 2018/03/15
- [elpa] master de643c9 409/433: Mode transition hooks, Dmitry Gutov, 2018/03/15
- [elpa] master 395317c 332/433: * mmm-make-region: Don't call mmm-save-changed-local-variables, or set the, Dmitry Gutov, 2018/03/15
- [elpa] master 38439a4 301/433: Reparse mmm-mode buffer when Emacs is idle, Dmitry Gutov, 2018/03/15
- [elpa] master c76b13e 418/433: Add some NEWS entries, Dmitry Gutov, 2018/03/15
- [elpa] master a4deb1b 432/433: Merge commit 'cb905bdc728fb3b5f9fdff8836d71b62bd717eab' from mmm-mode, Dmitry Gutov, 2018/03/15
- [elpa] master aeb1c33 430/433: Add 'packages/mmm-mode/' from commit '00c10a69c8c90178530219730ccea14ab634a74e', Dmitry Gutov, 2018/03/15