ps
/
4coder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

misc fixes

This commit is contained in:
Allen Webster 2019-04-08 12:21:04 -07:00
parent c4117c86a0
commit 79e04a54c7
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
4ed_api_implementation.cpp
View File

@ -1869,6 +1869,9 @@ DOC_SEE(Buffer_Seek)
Editing_File *file = view->file; Editing_File *file = view->file;
Assert(file != 0); Assert(file != 0);
if (api_check_buffer(file)){ if (api_check_buffer(file)){
if (file->settings.unwrapped_lines && seek.type == buffer_seek_wrapped_xy){
seek.type = buffer_seek_unwrapped_xy;
}
Full_Cursor cursor = file_compute_cursor(models->system, file, seek); Full_Cursor cursor = file_compute_cursor(models->system, file, seek);
view_set_cursor(models->system, models, view, cursor, set_preferred_x); view_set_cursor(models->system, models, view, cursor, set_preferred_x);
result = true; result = true;

6
platform_win32/win32_4ed_functions.cpp
View File

@ -127,8 +127,8 @@ Sys_Log_Sig(system_log){
internal String internal String
win32_remove_unc_prefix_characters(String path){ win32_remove_unc_prefix_characters(String path){
if (match_part(path, make_lit_string("\\\\?\\UNC"))){ if (match_part(path, make_lit_string("\\\\?\\UNC"))){
path.size -= 6; path.size -= 7;
memmove(path.str, path.str + 6, path.size); memmove(path.str, path.str + 7, path.size);
path.str[0] = '\\'; path.str[0] = '\\';
} }
else if (match_part(path, make_lit_string("\\\\?\\"))){ else if (match_part(path, make_lit_string("\\\\?\\"))){
@ -168,7 +168,7 @@ Sys_Set_File_List_Sig(system_set_file_list){
c_str_dir[final_length + 2] = 0; c_str_dir[final_length + 2] = 0;
if (canon_directory_out != 0){ if (canon_directory_out != 0){
if (final_length+1 < canon_directory_max){ if (final_length + 1 < canon_directory_max){
memcpy(canon_directory_out, c_str_dir, final_length); memcpy(canon_directory_out, c_str_dir, final_length);
if (canon_directory_out[final_length-1] != '\\'){ if (canon_directory_out[final_length-1] != '\\'){
canon_directory_out[final_length++] = '\\'; canon_directory_out[final_length++] = '\\';