[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/sweeprolog 9695f1bdcc 1/3: Use indent-to instead manually
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/sweeprolog 9695f1bdcc 1/3: Use indent-to instead manually indenting with spaces |
Date: |
Sat, 17 Dec 2022 01:59:47 -0500 (EST) |
branch: elpa/sweeprolog
commit 9695f1bdccc94d7b7a2303899c8082cf53528791
Author: Eshel Yaron <me@eshelyaron.com>
Commit: Eshel Yaron <me@eshelyaron.com>
Use indent-to instead manually indenting with spaces
* sweeprolog.el (sweeprolog-indent-line): use indent-to.
(sweeprolog-indent-offset): tweak docstring.
(sweeprolog-indent-line-after-prefix): use it instead of hard-coded
offset.
(sweeprolog-export-predicate): don't override indent-tabs-mode.
---
sweeprolog.el | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/sweeprolog.el b/sweeprolog.el
index 2981dd3a5b..b50a12bbd8 100644
--- a/sweeprolog.el
+++ b/sweeprolog.el
@@ -139,7 +139,7 @@ notices with the module header."
:group 'sweeprolog)
(defcustom sweeprolog-indent-offset 4
- "Number of columns to indent lines with in `sweeprolog-mode' buffers."
+ "Number of columns to indent with in `sweeprolog-mode' buffers."
:package-version '((sweeprolog . "0.3.1"))
:type 'integer
:group 'sweeprolog)
@@ -3395,8 +3395,7 @@ non-exported predicates defined in the current buffer."
(unless (or (sweeprolog-at-beginning-of-top-term-p)
(sweeprolog-beginning-of-next-top-term))
(user-error "No module declaration found"))
- (let* ((indent-tabs-mode nil)
- (target-position nil)
+ (let* ((target-position nil)
(module-term-beg nil)
(module-term-end nil)
(exported-operator nil)
@@ -3670,7 +3669,7 @@ valid Prolog atom."
(defun sweeprolog-indent-line-after-prefix (fbeg _fend _pre)
(save-excursion
(goto-char fbeg)
- (+ (current-column) 4)))
+ (+ (current-column) sweeprolog-indent-offset)))
(defun sweeprolog-indent-line-after-term ()
(if-let ((open (nth 1 (syntax-ppss))))
@@ -3714,15 +3713,16 @@ valid Prolog atom."
(interactive)
(let ((pos (- (point-max) (point))))
(back-to-indentation)
- (let ((indent (if (nth 8 (syntax-ppss))
+ (let ((column (if (nth 8 (syntax-ppss))
'noindent
(if-let ((open (and (not (eobp))
(= (char-syntax (char-after)) ?\))
(nth 1 (syntax-ppss)))))
(save-excursion
(goto-char open)
- (when (or (= (char-syntax (char-before)) ?w)
- (= (char-syntax (char-before)) ?_))
+ (when (and (char-before)
+ (or (= (char-syntax (char-before)) ?w)
+ (= (char-syntax (char-before)) ?_)))
(when (save-excursion
(forward-char)
(skip-syntax-forward " "
(line-end-position))
@@ -3754,14 +3754,14 @@ valid Prolog atom."
(pre (sweeprolog-indent-line-after-prefix lbeg
lend pre)))))))
(`(,_ltyp ,_lbeg ,_lend)
(sweeprolog-indent-line-after-term)))))))
- (when (numberp indent)
- (unless (= indent (current-column))
+ (when (numberp column)
+ (unless (= column (current-column))
(combine-after-change-calls
(delete-horizontal-space)
- (insert (make-string indent ? )))))
+ (indent-to column))))
(when (> (- (point-max) pos) (point))
(goto-char (- (point-max) pos)))
- indent)))
+ column)))
;;;; Xref