From 63d2d1620670a7b331a938577a18ce7859b049c8 Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Wed, 9 Mar 2011 11:48:19 +0100
Subject: [PATCH] Avoid error message with external vi on Ubuntu.

Ubuntu comes with only a stripped down version of vim by default which
doesn't support setting the column. So we don't do it.

Task-number: QTCREATORBUG-3850
---
 src/share/qtcreator/externaltools/vi.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/share/qtcreator/externaltools/vi.xml b/src/share/qtcreator/externaltools/vi.xml
index a93771dfeac..1e1a7d49254 100644
--- a/src/share/qtcreator/externaltools/vi.xml
+++ b/src/share/qtcreator/externaltools/vi.xml
@@ -38,7 +38,7 @@
     <category xml:lang="de">Text</category>
     <executable modifiesdocument="yes">
         <path>xterm</path>
-        <arguments>-geom %{CurrentDocument:ColumnCount}x%{CurrentDocument:RowCount}+%{CurrentDocument:XPos}+%{CurrentDocument:YPos} -e vi "%{CurrentDocument:FilePath}" +%{CurrentDocument:Row} +"normal %{CurrentDocument:Column}|"</arguments>
+        <arguments>-geom %{CurrentDocument:ColumnCount}x%{CurrentDocument:RowCount}+%{CurrentDocument:XPos}+%{CurrentDocument:YPos} -e vi "%{CurrentDocument:FilePath}" +%{CurrentDocument:Row}</arguments>
         <workingdirectory>%{CurrentDocument:Path}</workingdirectory>
     </executable>
 </externaltool>