1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-24 19:03:29 +00:00

* lisp/misc.el (duplicate-line-final-position): New defcustom (bug#64185).

* lisp/misc.el (duplicate-line): Use it.

* test/lisp/misc-tests.el (misc--duplicate-line): Add tests for
duplicate-line-final-position.

Don't merge to master.
This commit is contained in:
Juri Linkov 2023-06-29 10:13:06 +03:00
parent ef16339918
commit d5cff340b3
3 changed files with 45 additions and 8 deletions

View File

@ -696,7 +696,9 @@ between these modes while the user is inputting a command by hitting
'duplicate-line' duplicates the current line the specified number of times.
'duplicate-dwim' duplicates the region if it is active. If not, it
works like 'duplicate-line'. An active rectangular region is
duplicated on its right-hand side.
duplicated on its right-hand side. The new user option
'duplicate-line-final-position' specifies where to move point
after duplicating the line.
---
** Files with the ".eld" extension are now visited in 'lisp-data-mode'.

View File

@ -63,21 +63,42 @@ Also see the `duplicate-line' command."
(+ n (point)))))))
(insert string)))
(defcustom duplicate-line-final-position 0
"Where to put point after duplicating the line with `duplicate-line'.
When 0, leave point on the original line.
When 1, move point to the first new line.
When -1, move point to the last new line.
The same column is preserved after moving to a new line."
:type '(choice (const :tag "Leave point on old line" 0)
(const :tag "Move point to first new line" 1)
(const :tag "Move point to last new line" -1)
(integer))
:group 'editing
:version "29.1")
;;;###autoload
(defun duplicate-line (&optional n)
"Duplicate the current line N times.
Interactively, N is the prefix numeric argument, and defaults to 1.
The user option `duplicate-line-final-position' specifies where to
move point after duplicating the line.
Also see the `copy-from-above-command' command."
(interactive "p")
(unless n
(setq n 1))
(let ((line (buffer-substring (line-beginning-position) (line-end-position))))
(save-excursion
(forward-line 1)
(unless (bolp)
(insert "\n"))
(dotimes (_ n)
(insert line "\n")))))
(let ((line (buffer-substring (line-beginning-position) (line-end-position)))
(pos (point))
(col (current-column)))
(forward-line 1)
(unless (bolp)
(insert "\n"))
(dotimes (_ n)
(insert line "\n"))
(unless (< duplicate-line-final-position 0)
(goto-char pos))
(unless (eq duplicate-line-final-position 0)
(forward-line duplicate-line-final-position)
(move-to-column col))))
(declare-function rectangle--duplicate-right "rect" (n))

View File

@ -88,6 +88,20 @@
(duplicate-line 2)
(should (equal (buffer-string) "abc\ndefg\ndefg\ndefg\nh\n"))
(should (equal (point) 7)))
;; Duplicate a line (twice) and move point to the first duplicated line.
(with-temp-buffer
(insert "abc\ndefg\nh\n")
(goto-char 7)
(let ((duplicate-line-final-position 1)) (duplicate-line 2))
(should (equal (buffer-string) "abc\ndefg\ndefg\ndefg\nh\n"))
(should (equal (point) 12)))
;; Duplicate a line (twice) and move point to the last duplicated line.
(with-temp-buffer
(insert "abc\ndefg\nh\n")
(goto-char 7)
(let ((duplicate-line-final-position -1)) (duplicate-line 2))
(should (equal (buffer-string) "abc\ndefg\ndefg\ndefg\nh\n"))
(should (equal (point) 17)))
;; Duplicate a non-terminated line.
(with-temp-buffer
(insert "abc")