Revision: 1228 http://svn.sourceforge.net/geany/?rev=1228&view=rev Author: eht16 Date: 2007-01-24 14:48:52 -0800 (Wed, 24 Jan 2007)

Log Message: ----------- Oops. Revert the change to ignore --line setting when opening session files.

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

Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-01-24 22:38:53 UTC (rev 1227) +++ trunk/ChangeLog 2007-01-24 22:48:52 UTC (rev 1228) @@ -11,6 +11,16 @@ open tabs. Removed Zoom items from popup menu. * tagmanager/latex.c: Allow \section*{} and other commands with *. + * doc/geany.1.in, doc/geany.docbook, src/document.c, src/main.c, + src/main.h, src/socket.c: + Added command line option --column to allow setting the initial + column for the first opened file on command line. + Don't apply the --line and --column options to the first opened + session file. + Make --line and --column options work for opening files in an already + running instance. + * src/document.c: Oops. Revert the change to ignore --line setting when + opening session files.

2007-01-24 Nick Treleaven nick.treleaven@btinternet.com

Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2007-01-24 22:38:53 UTC (rev 1227) +++ trunk/src/document.c 2007-01-24 22:48:52 UTC (rev 1228) @@ -737,7 +737,7 @@ // update line number margin width sci_set_line_numbers(doc_list[idx].sci, app->show_linenumber_margin, 0);

- if (! app->opening_session_files && cl_options.goto_line >= 0) + if (cl_options.goto_line >= 0) { // goto line which was specified on command line and then undefine the line sci_goto_line(doc_list[idx].sci, cl_options.goto_line - 1, TRUE); sci_scroll_to_line(doc_list[idx].sci, cl_options.goto_line - 1, 0.5); @@ -749,7 +749,7 @@ if (reload) sci_scroll_to_line(doc_list[idx].sci, -1, 0.5); } - if (! app->opening_session_files && cl_options.goto_column >= 0) + if (cl_options.goto_column >= 0) { // goto column which was specified on command line and then undefine the column gint cur_pos = sci_get_current_position(doc_list[idx].sci); sci_set_current_position(doc_list[idx].sci, cur_pos + cl_options.goto_column);

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