summaryrefslogtreecommitdiff
path: root/source/ap/vim/patches/7.3.550
diff options
context:
space:
mode:
Diffstat (limited to 'source/ap/vim/patches/7.3.550')
-rw-r--r--source/ap/vim/patches/7.3.550160
1 files changed, 160 insertions, 0 deletions
diff --git a/source/ap/vim/patches/7.3.550 b/source/ap/vim/patches/7.3.550
new file mode 100644
index 00000000..6fba66cd
--- /dev/null
+++ b/source/ap/vim/patches/7.3.550
@@ -0,0 +1,160 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.550
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.3.550 (after 7.3.541)
+Problem: With "j" in 'formatoptions' a list leader is not removed. (Gary
+ Johnson)
+Solution: Don't ignore the start of a three part comment. (Lech Lorens)
+Files: src/ops.c, src/testdir/test29.in, src/testdir/test29.ok
+
+
+*** ../vim-7.3.549/src/ops.c 2012-06-07 21:09:35.000000000 +0200
+--- src/ops.c 2012-06-13 13:48:26.000000000 +0200
+***************
+*** 4250,4264 ****
+ return line;
+
+ /* Find:
+- * - COM_START,
+ * - COM_END,
+ * - colon,
+ * whichever comes first.
+ */
+ while (*comment_flags)
+ {
+! if (*comment_flags == COM_START
+! || *comment_flags == COM_END
+ || *comment_flags == ':')
+ {
+ break;
+--- 4250,4262 ----
+ return line;
+
+ /* Find:
+ * - COM_END,
+ * - colon,
+ * whichever comes first.
+ */
+ while (*comment_flags)
+ {
+! if (*comment_flags == COM_END
+ || *comment_flags == ':')
+ {
+ break;
+***************
+*** 4267,4275 ****
+ }
+
+ /* If we found a colon, it means that we are not processing a line
+! * starting with an opening or a closing part of a three-part
+! * comment. That's good, because we don't want to remove those as
+! * this would be annoying.
+ */
+ if (*comment_flags == ':' || *comment_flags == NUL)
+ line += lead_len;
+--- 4265,4272 ----
+ }
+
+ /* If we found a colon, it means that we are not processing a line
+! * starting with a closing part of a three-part comment. That's good,
+! * because we don't want to remove those as this would be annoying.
+ */
+ if (*comment_flags == ':' || *comment_flags == NUL)
+ line += lead_len;
+*** ../vim-7.3.549/src/testdir/test29.in 2012-06-06 16:12:54.000000000 +0200
+--- src/testdir/test29.in 2012-06-13 13:48:26.000000000 +0200
+***************
+*** 103,114 ****
+
+ STARTTEST
+ /^{/+1
+! :set comments=s1:/*,mb:*,ex:*/,://
+ :set comments+=s1:>#,mb:#,ex:#<,:<
+ :set cpoptions-=j joinspaces fo=j
+ :set backspace=eol,start
+ :.,+3join
+ j4J
+ :.,+2join
+ j3J
+ :.,+2join
+--- 103,117 ----
+
+ STARTTEST
+ /^{/+1
+! :set comments=sO:*\ -,mO:*\ \ ,exO:*/
+! :set comments+=s1:/*,mb:*,ex:*/,://
+ :set comments+=s1:>#,mb:#,ex:#<,:<
+ :set cpoptions-=j joinspaces fo=j
+ :set backspace=eol,start
+ :.,+3join
+ j4J
++ :.,+8join
++ j9J
+ :.,+2join
+ j3J
+ :.,+2join
+***************
+*** 132,137 ****
+--- 135,158 ----
+ * Make sure the previous comment leader is not removed.
+ */
+
++ /* List:
++ * - item1
++ * foo bar baz
++ * foo bar baz
++ * - item2
++ * foo bar baz
++ * foo bar baz
++ */
++
++ /* List:
++ * - item1
++ * foo bar baz
++ * foo bar baz
++ * - item2
++ * foo bar baz
++ * foo bar baz
++ */
++
+ // Should the next comment leader be left alone?
+ // Yes.
+
+*** ../vim-7.3.549/src/testdir/test29.ok 2012-06-06 16:12:54.000000000 +0200
+--- src/testdir/test29.ok 2012-06-13 13:48:26.000000000 +0200
+***************
+*** 66,71 ****
+--- 66,73 ----
+ {
+ /* Make sure the previous comment leader is not removed. */
+ /* Make sure the previous comment leader is not removed. */
++ /* List: item1 foo bar baz foo bar baz item2 foo bar baz foo bar baz */
++ /* List: item1 foo bar baz foo bar baz item2 foo bar baz foo bar baz */
+ // Should the next comment leader be left alone? Yes.
+ // Should the next comment leader be left alone? Yes.
+ /* Here the comment leader should be left intact. */ // And so should this one.
+*** ../vim-7.3.549/src/version.c 2012-06-13 13:40:45.000000000 +0200
+--- src/version.c 2012-06-13 13:50:23.000000000 +0200
+***************
+*** 716,717 ****
+--- 716,719 ----
+ { /* Add new patch number below this line */
++ /**/
++ 550,
+ /**/
+
+--
+If you put 7 of the most talented OSS developers in a room for a week
+and asked them to fix a bug in a spreadsheet program, in 1 week
+you'd have 2 new mail readers and a text-based web browser.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
+/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\ an exciting new programming language -- http://www.Zimbu.org ///
+ \\\ help me help AIDS victims -- http://ICCF-Holland.org ///