SF.net SVN: geany:[4197] trunk

[ntrel at users.sourceforge.net]

Revision: 4197
          http://geany.svn.sourceforge.net/geany/?rev=4197&view=rev
Author:   ntrel
Date:     2009-09-16 13:56:58 +0000 (Wed, 16 Sep 2009)

Log Message:
-----------
Don't move the cursor when reloading.

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-09-16 12:23:50 UTC (rev 4196)
+++ trunk/ChangeLog	2009-09-16 13:56:58 UTC (rev 4197)
@@ -4,6 +4,8 @@
    Make Goto Tag commands use the current selection if present (useful
    for selecting part of a tag or for ReST section names with spaces
    in).
+ * src/document.c:
+   Don't move the cursor when reloading.
 
 
 2009-09-15  Frank Lanitz  <frank(at)frank(dot)uvena(dot)de>

Modified: trunk/src/document.c
===================================================================
--- trunk/src/document.c	2009-09-16 12:23:50 UTC (rev 4196)
+++ trunk/src/document.c	2009-09-16 13:56:58 UTC (rev 4197)
@@ -1234,7 +1234,7 @@
 			document_check_disk_status(doc, TRUE);	/* force a file changed check */
 		}
 	}
-	if (reload || (!reload && doc == NULL))
+	if (reload || doc == NULL)
 	{	/* doc possibly changed */
 		display_filename = utils_str_middle_truncate(utf8_filename, 100);
 
@@ -1290,9 +1290,6 @@
 		doc->priv->line_count = sci_get_line_count(doc->editor->sci);
 		sci_set_line_numbers(doc->editor->sci, editor_prefs.show_linenumber_margin, 0);
 
-		/* set the cursor position according to pos, cl_options.goto_line and cl_options.goto_column */
-		pos = set_cursor_position(doc->editor, pos);
-
 		if (! reload)
 		{
 
@@ -1346,6 +1343,8 @@
 	 * based on a configurable interval */
 	/*g_timeout_add(10000, auto_update_tag_list, doc);*/
 
+	/* set the cursor position according to pos, cl_options.goto_line and cl_options.goto_column */
+	pos = set_cursor_position(doc->editor, pos);
 	/* now bring the file in front */
 	editor_goto_pos(doc->editor, pos, FALSE);
 


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