[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/javaimp 4be004d 10/32: packages/javaimp/javaimp.el: rep
From: |
Stefan Monnier |
Subject: |
[elpa] externals/javaimp 4be004d 10/32: packages/javaimp/javaimp.el: replace kill-line with delete-region |
Date: |
Tue, 1 Dec 2020 10:08:28 -0500 (EST) |
branch: externals/javaimp
commit 4be004d92eefd8ee2a568a9bb622bbc2b2f7f5c3
Author: Filipp Gunbin <fgunbin@fastmail.fm>
Commit: Filipp Gunbin <fgunbin@fastmail.fm>
packages/javaimp/javaimp.el: replace kill-line with delete-region
---
javaimp.el | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/javaimp.el b/javaimp.el
index 888f5c1..822b891 100644
--- a/javaimp.el
+++ b/javaimp.el
@@ -617,8 +617,7 @@ argument is a list of additional classes to import."
(interactive)
(barf-if-buffer-read-only)
(save-excursion
- (let ((kill-whole-line t)
- import-groups static-import-groups old-imports-start)
+ (let (import-groups static-import-groups old-imports-start)
;; existing imports
(goto-char (point-min))
(while (re-search-forward
@@ -633,9 +632,9 @@ argument is a list of additional classes to import."
static-import-groups)))
(beginning-of-line)
(unless old-imports-start (setq old-imports-start (point)))
- (kill-line)
- ;; delete whatever happened to be between import statements
- (when (not (equal (point) old-imports-start))
+ (delete-region (point) (save-excursion (forward-line 1) (point)))
+ ;; delete whatever was between import statements
+ (when (/= (point) old-imports-start)
(delete-region old-imports-start (point))))
;; new imports
(dolist (class new-classes)
@@ -645,15 +644,17 @@ argument is a list of additional classes to import."
(progn
;; prepare the position
(cond (old-imports-start
- ;; here we do not mangle with empty lines at all
+ ;; when there were any imports, do not touch blank lines
+ ;; before imports
(goto-char old-imports-start))
((re-search-forward "^\\s-*package\\s-" nil t)
- ;; try to preserve all empty lines (if any) before the
- ;; following text
- (when (equal (forward-line) 1) (insert ?\n)) ;; last line?
+ ;; when there is a package statement, insert one or two
+ ;; blank lines after it
+ (when (= (forward-line) 1) (insert ?\n)) ;; last line?
(insert ?\n))
(t
- ;; start from the bob; add one line after the insert pos
+ ;; otherwise, start at the bob, insert one empty line
+ ;; after point
(goto-char (point-min))
(insert ?\n)
(backward-char)))
- [elpa] branch externals/javaimp created (now 3c95c22), Stefan Monnier, 2020/12/01
- [elpa] externals/javaimp c2bb0bc 01/32: * javaimp: New package., Stefan Monnier, 2020/12/01
- [elpa] externals/javaimp 60a7312 02/32: javaimp: converted to lexical binding, doc fixes, minor code fixes, Stefan Monnier, 2020/12/01
- [elpa] externals/javaimp c38cd53 03/32: javaimp: fixed lexical-binding var placement, Stefan Monnier, 2020/12/01
- [elpa] externals/javaimp 170e1cd 05/32: javaimp: version 0.5, Stefan Monnier, 2020/12/01
- [elpa] externals/javaimp 07e5c0f 04/32: javaimp: fix for cases when maven doesn't add xml declaration, Stefan Monnier, 2020/12/01
- [elpa] externals/javaimp f8681a5 07/32: packages/javaimp/javaimp.el: added check for changes in parent pom, Stefan Monnier, 2020/12/01
- [elpa] externals/javaimp 177572a 08/32: packages/javaimp/javaimp.el: parent pom check fix, Stefan Monnier, 2020/12/01
- [elpa] externals/javaimp 59f2e14 11/32: packages/javaimp/javaimp.el: use line-beginning-position instead of forward-line, Stefan Monnier, 2020/12/01
- [elpa] externals/javaimp d65f827 09/32: minor fixes, Stefan Monnier, 2020/12/01
- [elpa] externals/javaimp 4be004d 10/32: packages/javaimp/javaimp.el: replace kill-line with delete-region,
Stefan Monnier <=
- [elpa] externals/javaimp 4fa5d2a 12/32: * packages/javaimp/javaimp.el: Fix some compiler warnings, Stefan Monnier, 2020/12/01
- [elpa] externals/javaimp 32304ae 14/32: javaimp.el: Fix Maven output start regexp., Stefan Monnier, 2020/12/01
- [elpa] externals/javaimp b5158b9 15/32: * packages/javaimp/javaimp.el: Update javaimp to v. 0.6., Stefan Monnier, 2020/12/01
- [elpa] externals/javaimp 069aa0c 06/32: javaimp: doc fixes, Stefan Monnier, 2020/12/01
- [elpa] externals/javaimp d1507ca 13/32: packages/javaimp/javaimp.el: Support additional source directories., Stefan Monnier, 2020/12/01
- [elpa] externals/javaimp c59e1f7 22/32: packages/javaimp: Fix comparison of module load ts with parent files., Stefan Monnier, 2020/12/01
- [elpa] externals/javaimp eb08936 23/32: Fix some quoting problems in doc strings, Stefan Monnier, 2020/12/01
- [elpa] externals/javaimp ed26a43 24/32: * javaimp.el: Add missing license, Stefan Monnier, 2020/12/01
- [elpa] externals/javaimp 88f1376 27/32: [javaimp] Bump version to 0.6.1, Stefan Monnier, 2020/12/01
- [elpa] externals/javaimp 084153c 29/32: packages/javaimp/javaimp.el: Add News section, bump version to 0.7, Stefan Monnier, 2020/12/01