[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 6d2e8fd: Revert move of interactive `transpose-regi
From: |
Karl Fogel |
Subject: |
[Emacs-diffs] master 6d2e8fd: Revert move of interactive `transpose-regions' to Lisp |
Date: |
Mon, 19 Mar 2018 13:23:15 -0400 (EDT) |
branch: master
commit 6d2e8fdd102d2d4f5105898c15813fd8dcd0907f
Author: Karl Fogel <address@hidden>
Commit: Karl Fogel <address@hidden>
Revert move of interactive `transpose-regions' to Lisp
This reverts my commit 3a3aa0e056a of 2018-03-18 at 21:43:18 UTC.
I thought consensus had been reached, but it had not: Eli Zaretskii
felt the pre-3a3aa0e056a situation was fine and would not like to
see it changed without at least further discussion.
---
lisp/simple.el | 28 ----------------------------
src/editfns.c | 22 +++++++++++++++++++---
2 files changed, 19 insertions(+), 31 deletions(-)
diff --git a/lisp/simple.el b/lisp/simple.el
index 543fa08..fa93cf8 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -7014,34 +7014,6 @@ With argument 0, interchanges line point is in with line
mark is in."
(forward-line arg))))
arg))
-(defun transpose-regions (startr1 endr1 startr2 endr2 &optional leave-markers)
- "Transpose region STARTR1 to ENDR1 with STARTR2 to ENDR2.
-The regions should not be overlapping, because the size of the buffer is
-never changed in a transposition.
-
-Optional fifth arg LEAVE-MARKERS, if non-nil, means don't update
-any markers that happen to be located in the regions.
-
-Transposing beyond buffer boundaries is an error.
-
-Interactively, STARTR1 and ENDR1 are point and mark; STARTR2 and ENDR2
-are the last two marks pushed to the mark ring; LEAVE-MARKERS is nil.
-If a prefix argument N is given, STARTR2 and ENDR2 are the two
-successive marks N entries back in the mark ring. A negative prefix
-argument instead counts forward from the oldest mark in the mark
-ring."
- (interactive
- (if (< (length mark-ring) 2)
- (error "Other region must be marked before transposing two regions")
- (let* ((num (if current-prefix-arg
- (prefix-numeric-value current-prefix-arg)
- 0))
- (ring-length (length mark-ring))
- (eltnum (mod num ring-length))
- (eltnum2 (mod (1+ num) ring-length)))
- (list (point) (mark) (elt mark-ring eltnum) (elt mark-ring eltnum2)))))
- (transpose-regions-internal startr1 endr1 startr2 endr2 leave-markers))
-
;; FIXME seems to leave point BEFORE the current object when ARG = 0,
;; which seems inconsistent with the ARG /= 0 case.
;; FIXME document SPECIAL.
diff --git a/src/editfns.c b/src/editfns.c
index e248672..d263194 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -5112,7 +5112,16 @@ transpose_markers (ptrdiff_t start1, ptrdiff_t end1,
}
}
-DEFUN ("transpose-regions-internal", Ftranspose_regions_internal,
Stranspose_regions_internal, 4, 5, 0,
+DEFUN ("transpose-regions", Ftranspose_regions, Stranspose_regions, 4, 5,
+ "(if (< (length mark-ring) 2)\
+ (error \"Other region must be marked before transposing two
regions\")\
+ (let* ((num (if current-prefix-arg\
+ (prefix-numeric-value current-prefix-arg)\
+ 0))\
+ (ring-length (length mark-ring))\
+ (eltnum (mod num ring-length))\
+ (eltnum2 (mod (1+ num) ring-length)))\
+ (list (point) (mark) (elt mark-ring eltnum) (elt mark-ring
eltnum2))))",
doc: /* Transpose region STARTR1 to ENDR1 with STARTR2 to ENDR2.
The regions should not be overlapping, because the size of the buffer is
never changed in a transposition.
@@ -5120,7 +5129,14 @@ never changed in a transposition.
Optional fifth arg LEAVE-MARKERS, if non-nil, means don't update
any markers that happen to be located in the regions.
-Transposing beyond buffer boundaries is an error. */)
+Transposing beyond buffer boundaries is an error.
+
+Interactively, STARTR1 and ENDR1 are point and mark; STARTR2 and ENDR2
+are the last two marks pushed to the mark ring; LEAVE-MARKERS is nil.
+If a prefix argument N is given, STARTR2 and ENDR2 are the two
+successive marks N entries back in the mark ring. A negative prefix
+argument instead counts forward from the oldest mark in the mark
+ring. */)
(Lisp_Object startr1, Lisp_Object endr1, Lisp_Object startr2, Lisp_Object
endr2, Lisp_Object leave_markers)
{
register ptrdiff_t start1, end1, start2, end2;
@@ -5565,5 +5581,5 @@ functions if all the text being accessed has this
property. */);
defsubr (&Swiden);
defsubr (&Snarrow_to_region);
defsubr (&Ssave_restriction);
- defsubr (&Stranspose_regions_internal);
+ defsubr (&Stranspose_regions);
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 6d2e8fd: Revert move of interactive `transpose-regions' to Lisp,
Karl Fogel <=