[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/expand-region e8f4e0fe9c 2/2: Revert "expand-region-cor
From: |
ELPA Syncer |
Subject: |
[elpa] externals/expand-region e8f4e0fe9c 2/2: Revert "expand-region-core: Fix excursions when expensive" |
Date: |
Fri, 19 Jan 2024 07:03:07 -0500 (EST) |
branch: externals/expand-region
commit e8f4e0fe9c9a80a6a26e2b438502aba9a799d580
Author: Magnar Sveen <magnars@gmail.com>
Commit: Magnar Sveen <magnars@gmail.com>
Revert "expand-region-core: Fix excursions when expensive"
This reverts commit e1b099a62ff3c718d1bd8a100f516b3dff035dd2.
---
expand-region-core.el | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/expand-region-core.el b/expand-region-core.el
index 1f60dbe974..c239fd1f99 100644
--- a/expand-region-core.el
+++ b/expand-region-core.el
@@ -72,7 +72,8 @@
`(save-excursion ,@body))))
(defmacro er--save-excursion (&rest body)
- `(let ((action (lambda () ,@body)))
+ `(let ((action (lambda ()
+ (save-mark-and-excursion ,@body))))
(if er/save-mode-excursion
(funcall er/save-mode-excursion action)
(funcall action))))
@@ -108,18 +109,17 @@ moving point or mark as little as possible."
(skip-chars-forward er--space-str)
(setq start (point)))
- (er--save-excursion
- (while try-list
- (ignore-errors
- (save-mark-and-excursion
- (funcall (car try-list))
- (when (and (region-active-p)
- (er--this-expansion-is-better start end best-start
best-end))
- (setq best-start (point))
- (setq best-end (mark))
- (when (and er--show-expansion-message (not (minibufferp)))
- (message "%S" (car try-list))))))
- (setq try-list (cdr try-list))))
+ (while try-list
+ (er--save-excursion
+ (ignore-errors
+ (funcall (car try-list))
+ (when (and (region-active-p)
+ (er--this-expansion-is-better start end best-start
best-end))
+ (setq best-start (point))
+ (setq best-end (mark))
+ (when (and er--show-expansion-message (not (minibufferp)))
+ (message "%S" (car try-list))))))
+ (setq try-list (cdr try-list)))
(setq deactivate-mark nil)
;; if smart cursor enabled, decide to put it at start or end of region: