SF.net SVN: geany: [1891] trunk

[ntrel at users.sourceforge.net]

Revision: 1891
          http://geany.svn.sourceforge.net/geany/?rev=1891&view=rev
Author:   ntrel
Date:     2007-09-21 09:37:19 -0700 (Fri, 21 Sep 2007)

Log Message:
-----------
Make 'Delete lines' not include an extra line when whole lines are
selected.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/editor.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-09-19 11:24:30 UTC (rev 1890)
+++ trunk/ChangeLog	2007-09-21 16:37:19 UTC (rev 1891)
@@ -1,3 +1,10 @@
+2007-09-20  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/editor.c:
+   Make 'Delete lines' not include an extra line when whole lines are
+   selected.
+
+
 2007-09-18  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
 
  * src/keyfile.c:

Modified: trunk/src/editor.c
===================================================================
--- trunk/src/editor.c	2007-09-19 11:24:30 UTC (rev 1890)
+++ trunk/src/editor.c	2007-09-21 16:37:19 UTC (rev 1891)
@@ -2324,10 +2324,14 @@
 	start = sci_get_selection_start(sci);
 	start = sci_get_line_from_position(sci, start);
 	start = sci_get_position_from_line(sci, start);
+
 	end = sci_get_selection_end(sci);
-	end = sci_get_line_from_position(sci, end);
-	end = sci_get_position_from_line(sci, end + 1);
+	if (start == end || sci_get_col_from_position(sci, end) > 0)	// partially selected line
+	{
+		gint line = sci_get_line_from_position(sci, end);
 
+		end = sci_get_position_from_line(sci, line + 1);
+	}
 	SSM(sci, SCI_SETSEL, start, end);
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.