Mercurial > vim
diff src/ex_cmds.c @ 15010:e3910b9827d0 v8.1.0516
patch 8.1.0516: :move command marks buffer modified when nothing changed
commit https://github.com/vim/vim/commit/ddd1f9183bed00d096f29c503721ac559174a29f
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Nov 10 19:19:36 2018 +0100
patch 8.1.0516: :move command marks buffer modified when nothing changed
Problem: :move command marks buffer modified when nothing changed.
Solution: Do not set 'modified'. Add a test. (Jason Franklin)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 10 Nov 2018 19:30:05 +0100 |
| parents | 6f2ce3b311de |
| children | b63787182765 |
line wrap: on
line diff
--- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -899,9 +899,9 @@ do_move(linenr_T line1, linenr_T line2, { char_u *str; linenr_T l; - linenr_T extra; /* Num lines added before line1 */ - linenr_T num_lines; /* Num lines moved */ - linenr_T last_line; /* Last line in file after adding new text */ + linenr_T extra; // Num lines added before line1 + linenr_T num_lines; // Num lines moved + linenr_T last_line; // Last line in file after adding new text #ifdef FEAT_FOLDING win_T *win; tabpage_T *tp; @@ -909,10 +909,24 @@ do_move(linenr_T line1, linenr_T line2, if (dest >= line1 && dest < line2) { - EMSG(_("E134: Move lines into themselves")); + EMSG(_("E134: Cannot move a range of lines into itself")); return FAIL; } + // Do nothing if we are not actually moving any lines. This will prevent + // the 'modified' flag from being set without cause. + if (dest == line1 - 1 || dest == line2) + { + // Move the cursor as if lines were moved (see below) to be backwards + // compatible. + if (dest >= line1) + curwin->w_cursor.lnum = dest; + else + curwin->w_cursor.lnum = dest + (line2 - line1) + 1; + + return OK; + } + num_lines = line2 - line1 + 1; /*