Merge branch '3285_mcedit_full_path'

* 3285_mcedit_full_path:
  Ticket #3285: mcedit: show full path to file in the status line.
This commit is contained in:
Andrew Borodin 2015-03-15 07:52:45 +03:00
commit 920403884d

View File

@ -210,7 +210,7 @@ edit_status_fullscreen (WEdit * edit, int color)
status_len = (int) str_term_width1 (status); status_len = (int) str_term_width1 (status);
if (edit->filename_vpath != NULL) if (edit->filename_vpath != NULL)
fname = x_basename (vfs_path_get_last_path_str (edit->filename_vpath)); fname = vfs_path_get_last_path_str (edit->filename_vpath);
fname_len = str_term_width1 (fname); fname_len = str_term_width1 (fname);
if (fname_len < preferred_fname_len) if (fname_len < preferred_fname_len)
@ -263,9 +263,7 @@ edit_status_window (WEdit * edit)
const char *fname = N_("NoName"); const char *fname = N_("NoName");
if (edit->filename_vpath != NULL) if (edit->filename_vpath != NULL)
{ fname = vfs_path_get_last_path_str (edit->filename_vpath);
fname = x_basename (vfs_path_as_str (edit->filename_vpath));
}
#ifdef ENABLE_NLS #ifdef ENABLE_NLS
else else
fname = _(fname); fname = _(fname);