[Monodevelop-patches-list] r2080 - in trunk/MonoDevelop/Core: build/AddIns src/AddIns/DisplayBindings/SourceEditor src/AddIns/DisplayBindings/SourceEditor/Gui

[commit-watcher at mono-cvs.ximian.com]

Author: tberman
Date: 2004-12-15 00:53:13 -0500 (Wed, 15 Dec 2004)
New Revision: 2080

Modified:
   trunk/MonoDevelop/Core/build/AddIns/SharpDevelopCore.addin.xml
   trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog
   trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorBuffer.cs
Log:
2004-12-14  Todd Berman  <tberman at off.net>
	
	* Gui/SourceEditorBuffer.cs: Single line commenting changed a bit.
	Fixed bug #70574.



Modified: trunk/MonoDevelop/Core/build/AddIns/SharpDevelopCore.addin.xml
===================================================================
--- trunk/MonoDevelop/Core/build/AddIns/SharpDevelopCore.addin.xml	2004-12-14 05:31:00 UTC (rev 2079)
+++ trunk/MonoDevelop/Core/build/AddIns/SharpDevelopCore.addin.xml	2004-12-15 05:53:13 UTC (rev 2080)
@@ -705,11 +705,11 @@
 			                <MenuItem id = "Separator4" _label = "-" />
 					<MenuItem id = "CommentCode"
 						shortcut = "Control|Alt|C"
-						_label = "C_omment Code"
+						_label = "C_omment Line(s)"
 						class = "MonoDevelop.Commands.CommentCode"/>
 					<MenuItem id = "UncommentCode"
 						shortcut = "Control|Alt|U"
-						_label = "_Uncomment Code"
+						_label = "_Uncomment Line(s)"
 						class = "MonoDevelop.Commands.UncommentCode"/>
 					<MenuItem id = "IndentSelection"
 						shortcut = "Control|Alt|Home"

Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog	2004-12-14 05:31:00 UTC (rev 2079)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog	2004-12-15 05:53:13 UTC (rev 2080)
@@ -1,3 +1,8 @@
+2004-12-14  Todd Berman  <tberman at off.net>
+	
+	* Gui/SourceEditorBuffer.cs: Single line commenting changed a bit.
+	Fixed bug #70574.
+
 2004-12-13  Lluis Sanchez Gual  <lluis at novell.com>
 
 	* Search/SearchReplaceUtilities.cs: 

Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorBuffer.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorBuffer.cs	2004-12-14 05:31:00 UTC (rev 2079)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorBuffer.cs	2004-12-15 05:53:13 UTC (rev 2080)
@@ -375,10 +375,10 @@
 		[DllImport("gtksourceview-1.0")]
 		static extern void gtk_source_buffer_delete_marker(IntPtr raw, IntPtr marker);
 		
-		[DllImport("glibsharpglue")]
+		[DllImport("glibsharpglue-2")]
 		static extern IntPtr gtksharp_slist_get_data (IntPtr l);
 
-		[DllImport("glibsharpglue")]
+		[DllImport("glibsharpglue-2")]
 		static extern IntPtr gtksharp_slist_get_next (IntPtr l);
 		
 		[DllImport("gtksourceview-1.0")]
@@ -700,6 +700,7 @@
 			GetSelectionBounds (out textStart, out textEnd);
 			if (textStart.Line == textEnd.Line)
 			{ // all the code is in one line, just comment the select text
+				textStart.LineOffset = 0;
 				Insert (ref textStart, commentTag);
 			}
 			else
@@ -732,6 +733,7 @@
 			GetSelectionBounds (out textStart, out textEnd);
 			if (textStart.Line == textEnd.Line)
 			{ // all the code is in one line, just umcomment is text starts with comment tag
+				textStart.LineOffset = 0;
 				textEnd = textStart;
 				textEnd.ForwardChars (commentTag.Length);
 				if (textStart.GetText (textEnd) == commentTag)