Merge branch '4207_tag_declaration'

* 4207_tag_declaration:
  Ticket # 4207: (editcmd_dialog_select_definition_show): fix "Find declaration" disrupting file's path.
This commit is contained in:
Andrew Borodin 2021-02-28 16:51:54 +03:00
commit 94588d2da6

View File

@ -483,7 +483,9 @@ editcmd_dialog_select_definition_show (WEdit * edit, char *match_expr, int max_l
{
vfs_path_free (edit_history_moveto[edit_stack_iterator].filename_vpath);
if (edit->dir_vpath != NULL)
/* Is file path absolute? Prepend with dir_vpath if necessary */
if (edit->filename_vpath != NULL && edit->filename_vpath->relative
&& edit->dir_vpath != NULL)
edit_history_moveto[edit_stack_iterator].filename_vpath =
vfs_path_append_vpath_new (edit->dir_vpath, edit->filename_vpath, NULL);
else