[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/jinja2-mode bc2f7ddcb5 41/57: Fix indent
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/jinja2-mode bc2f7ddcb5 41/57: Fix indent |
Date: |
Mon, 17 Jan 2022 05:58:26 -0500 (EST) |
branch: elpa/jinja2-mode
commit bc2f7ddcb501f38313ebf0dd7dae5986ee45d2fd
Author: Florian Mounier <florian.mounier@kozea.fr>
Commit: Florian Mounier <florian.mounier@kozea.fr>
Fix indent
---
jinja2-mode.el | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/jinja2-mode.el b/jinja2-mode.el
index 64b0e7f180..b191b267cd 100644
--- a/jinja2-mode.el
+++ b/jinja2-mode.el
@@ -283,10 +283,14 @@
(defun jinja2-indent-line ()
"Indent current line as Jinja code"
(interactive)
- (let ((indent (max 0 (jinja2-calculate-indent))))
- (if (> indent (- (point) (line-beginning-position)))
- (indent-line-to indent))
- indent))
+ (let ((old_indent (current-indentation)) (old_point (point)))
+ (move-beginning-of-line nil)
+ (let ((indent (max 0 (jinja2-calculate-indent))))
+ (indent-line-to indent)
+ (if (< old_indent (- old_point (line-beginning-position)))
+ (goto-char (+ (- indent old_indent) old_point)))
+ indent)))
+
;;;###autoload
(define-derived-mode jinja2-mode sgml-mode "Jinja2"
- [nongnu] elpa/jinja2-mode a6e6574441 37/57: Consider quote as quote, (continued)
- [nongnu] elpa/jinja2-mode a6e6574441 37/57: Consider quote as quote, ELPA Syncer, 2022/01/17
- [nongnu] elpa/jinja2-mode 97dacbedac 15/57: Add indent on insert tags, ELPA Syncer, 2022/01/17
- [nongnu] elpa/jinja2-mode 40c5ef2efa 23/57: Fuck tab, ELPA Syncer, 2022/01/17
- [nongnu] elpa/jinja2-mode 159558e0bb 54/57: Indent on save only when enabled, default disabled, ELPA Syncer, 2022/01/17
- [nongnu] elpa/jinja2-mode b3e564bfef 40/57: Fix uncomment, ELPA Syncer, 2022/01/17
- [nongnu] elpa/jinja2-mode 487b95f0d4 20/57: Merge pull request #1 from amirouche/master, ELPA Syncer, 2022/01/17
- [nongnu] elpa/jinja2-mode 757e3fa162 25/57: Add defcustom for kw and fun, ELPA Syncer, 2022/01/17
- [nongnu] elpa/jinja2-mode 985c538160 28/57: Add comment command, ELPA Syncer, 2022/01/17
- [nongnu] elpa/jinja2-mode ab077df663 24/57: Support whitespace tag syntax, ELPA Syncer, 2022/01/17
- [nongnu] elpa/jinja2-mode f98adc4211 34/57: Merge pull request #5 from davidmiller/patch-1, ELPA Syncer, 2022/01/17
- [nongnu] elpa/jinja2-mode bc2f7ddcb5 41/57: Fix indent,
ELPA Syncer <=
- [nongnu] elpa/jinja2-mode 69171a2baa 26/57: Switch back to sgml-mode, seems to fix #3, ELPA Syncer, 2022/01/17
- [nongnu] elpa/jinja2-mode 66d20afc30 13/57: Change indent func to recursive, ELPA Syncer, 2022/01/17
- [nongnu] elpa/jinja2-mode bcca3fe63b 17/57: renamed jinja2 -> jinja2-mode so that require 'jinja2-mode works, ELPA Syncer, 2022/01/17
- [nongnu] elpa/jinja2-mode 83eaa513b5 19/57: looks like the indentation at 4 is now possible inside jinja2 blocks, ELPA Syncer, 2022/01/17