mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-08 20:41:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3668_mcedit_load_bookmarks'

Browse Source 
* 3668_mcedit_load_bookmarks:
  Ticket #3669: mcedit: don't kill bookmarks when open file from "Find File" dialog.
This commit is contained in:
Andrew Borodin 2016-08-26 15:07:46 +03:00
commit 03742623de
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/editor/edit.c
View File

@ -455,10 +455,16 @@ edit_load_file (WEdit * edit)
} }
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */
/** Restore saved cursor position in the file */ /**
* Restore saved cursor position and/or bookmarks in the file
*
* @param edit editor object
* @param load_position If TRUE, load bookmarks and cursor position and aply them.
* If FALSE, load bookmarks only.
*/
static void static void
edit_load_position (WEdit * edit) edit_load_position (WEdit * edit, gboolean load_position)
{ {
long line, column; long line, column;
off_t offset; off_t offset;
@ -468,6 +474,11 @@ edit_load_position (WEdit * edit)
return; return;
load_file_position (edit->filename_vpath, &line, &column, &offset, &edit->serialized_bookmarks); load_file_position (edit->filename_vpath, &line, &column, &offset, &edit->serialized_bookmarks);
/* apply bookmarks in any case */
book_mark_restore (edit, BOOK_MARK_COLOR);
if (!load_position)
return;
if (line > 0) if (line > 0)
{ {
@ -481,8 +492,6 @@ edit_load_position (WEdit * edit)
edit->search_start = edit->buffer.curs1; edit->search_start = edit->buffer.curs1;
} }
book_mark_restore (edit, BOOK_MARK_COLOR);
edit_move_to_prev_col (edit, edit_buffer_get_current_bol (&edit->buffer)); edit_move_to_prev_col (edit, edit_buffer_get_current_bol (&edit->buffer));
edit_move_display (edit, line - (WIDGET (edit)->lines / 2)); edit_move_display (edit, line - (WIDGET (edit)->lines / 2));
} }
@ -2146,11 +2155,12 @@ edit_init (WEdit * edit, int y, int x, int lines, int cols, const vfs_path_t * f
edit_load_syntax (edit, NULL, NULL); edit_load_syntax (edit, NULL, NULL);
edit_get_syntax_color (edit, -1); edit_get_syntax_color (edit, -1);
/* load saved cursor position */ /* load saved cursor position and/or boolmarks */
if ((line == 0) && option_save_position) if ((line == 0) && option_save_position)
edit_load_position (edit); edit_load_position (edit, TRUE);
else else
{ {
edit_load_position (edit, FALSE);
if (line <= 0) if (line <= 0)
line = 1; line = 1;
edit_move_display (edit, line - 1); edit_move_display (edit, line - 1);