Merge pull request #4655 from brcolow/vim-7.4.1035

vim-patch: 7.4.1035

runtime/doc/fold.txt

@@ -1,4 +1,4 @@
-*fold.txt*      For Vim version 7.4.  Last change: 2013 Dec 04
+*fold.txt*      For Vim version 7.4.  Last change: 2016 Jan 02
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -570,8 +570,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
+For Ex commands that work on buffer lines the range is adjusted to always
-closed fold and end at the last line of a closed fold.  Thus this command: >
+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.

src/nvim/ex_docmd.c

@@ -1826,9 +1826,10 @@ static char_u * do_one_cmd(char_u **cmdlinep,
 
   correct_range(&ea);
 
-  if (((ea.argt & WHOLEFOLD) || ea.addr_count >= 2) && !global_busy) {
+  if (((ea.argt & WHOLEFOLD) || ea.addr_count >= 2) && !global_busy
-    /* Put the first line at the start of a closed fold, put the last line
+      && ea.addr_type == ADDR_LINES) {
-     * at the end of a closed fold. */
+    // Put the first line at the start of a closed fold, put the last line
+    // at the end of a closed fold.
     (void)hasFolding(ea.line1, &ea.line1, NULL);
     (void)hasFolding(ea.line2, NULL, &ea.line2);
   }

src/nvim/version.c

@@ -643,7 +643,7 @@ static int included_patches[] = {
   // 1038 NA
   // 1037,
   // 1036,
-  // 1035,
+  1035,
   // 1034,
   // 1033 NA
   1032,