patch 7.4.1035

Problem:    An Ex range gets adjusted for folded lines even when the range is
            not using line numbers.
Solution:   Only adjust line numbers for folding. (Christian Brabandt)

diff --git a/runtime/doc/fold.txt b/runtime/doc/fold.txt
index e2ea1ab66d90d2885e5e070d3112680951d66786..96e46f5a131c4712f24ce7160d6a066ef235cb07 100644 (file)
--- a/runtime/doc/fold.txt
+++ b/runtime/doc/fold.txt
@@ -1,4 +1,4 @@
-*fold.txt*      For Vim version 7.4.  Last change: 2015 Nov 24
+*fold.txt*      For Vim version 7.4.  Last change: 2016 Jan 02
 
 
                  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -585,8 +585,9 @@ what you type!
 When using an operator, a closed fold is included as a whole.  Thus "dl"
 deletes the whole closed fold under the cursor.
 
-For Ex commands the range is adjusted to always start at the first line of a
-closed fold and end at the last line of a closed fold.  Thus this command: >
+For Ex commands that work on buffer lines the range is adjusted to always
+start at the first line of a closed fold and end at the last line of a closed
+fold.  Thus this command: >
        :s/foo/bar/g
 when used with the cursor on a closed fold, will replace "foo" with "bar" in
 all lines of the fold.

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index a29d657501e71bd859ee9aeb9a91056b95c5c5e8..648cc0d77091b078b94bdc16a5a90334929fb14a 100644 (file)
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -2543,7 +2543,8 @@ do_one_cmd(cmdlinep, sourcing,
     correct_range(&ea);
 
 #ifdef FEAT_FOLDING
-    if (((ea.argt & WHOLEFOLD) || ea.addr_count >= 2) && !global_busy)
+    if (((ea.argt & WHOLEFOLD) || ea.addr_count >= 2) && !global_busy
+           && ea.addr_type == ADDR_LINES)
     {
        /* Put the first line at the start of a closed fold, put the last line
         * at the end of a closed fold. */

diff --git a/src/version.c b/src/version.c
index 90cfd89f3c2da0a881d120ae1a93d276758ef5a6..49eebc12cca3ee412e8f2f1a6b714772e804b61b 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1035,
 /**/
     1034,
 /**/