diff options
| -rw-r--r-- | runtime/doc/options.txt | 6 | ||||
| -rw-r--r-- | src/nvim/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/nvim/buffer_defs.h | 34 |
3 files changed, 21 insertions, 22 deletions
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 606e148a83..9aaae6a527 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1865,7 +1865,7 @@ A jump table for the options with a short description can be found at |Q_op|. security reasons. *'dip'* *'diffopt'* -'diffopt' 'dip' string (default "filler") +'diffopt' 'dip' string (default "internal,filler") global Option settings for diff mode. It can consist of the following items. All are optional. Items must be separated by a comma. @@ -1933,8 +1933,8 @@ A jump table for the options with a short description can be found at |Q_op|. option to see when this happens. indent-heuristic - Use the indent heuristic for the internal - diff library. + Use the indent heuristic for the internal + diff library. algorithm:{text} Use the specified diff algorithm with the internal diff engine. Currently supported diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt index e4505f7484..a2c4e677d4 100644 --- a/src/nvim/CMakeLists.txt +++ b/src/nvim/CMakeLists.txt @@ -150,13 +150,12 @@ set(CONV_SOURCES syntax.c tag.c window.c) - foreach(sfile ${CONV_SOURCES}) if(NOT EXISTS "${CMAKE_CURRENT_LIST_DIR}/${sfile}") message(FATAL_ERROR "${sfile} doesn't exist (it was added to CONV_SOURCES)") endif() endforeach() - +# xdiff: inlined external project, we don't maintain it. #9306 list(APPEND CONV_SOURCES ${XDIFF_SOURCES}) if(NOT MSVC) diff --git a/src/nvim/buffer_defs.h b/src/nvim/buffer_defs.h index e8975f0622..d270714611 100644 --- a/src/nvim/buffer_defs.h +++ b/src/nvim/buffer_defs.h @@ -412,13 +412,13 @@ typedef struct { * syntax state too often. * b_sst_array[] is allocated to hold the state for all displayed lines, * and states for 1 out of about 20 other lines. - * b_sst_array pointer to an array of synstate_T - * b_sst_len number of entries in b_sst_array[] - * b_sst_first pointer to first used entry in b_sst_array[] or NULL + * b_sst_array pointer to an array of synstate_T + * b_sst_len number of entries in b_sst_array[] + * b_sst_first pointer to first used entry in b_sst_array[] or NULL * b_sst_firstfree pointer to first free entry in b_sst_array[] or NULL * b_sst_freecount number of free entries in b_sst_array[] * b_sst_check_lnum entries after this lnum need to be checked for - * validity (MAXLNUM means no check needed) + * validity (MAXLNUM means no check needed) */ synstate_T *b_sst_array; int b_sst_len; @@ -475,15 +475,15 @@ struct file_buffer { int b_locked; // Buffer is being closed or referenced, don't // let autocommands wipe it out. - /* - * b_ffname has the full path of the file (NULL for no name). - * b_sfname is the name as the user typed it (or NULL). - * b_fname is the same as b_sfname, unless ":cd" has been done, - * then it is the same as b_ffname (NULL for no name). - */ - char_u *b_ffname; /* full path file name */ - char_u *b_sfname; /* short file name */ - char_u *b_fname; /* current file name */ + // + // b_ffname has the full path of the file (NULL for no name). + // b_sfname is the name as the user typed it (or NULL). + // b_fname is the same as b_sfname, unless ":cd" has been done, + // then it is the same as b_ffname (NULL for no name). + // + char_u *b_ffname; // full path file name + char_u *b_sfname; // short file name + char_u *b_fname; // current file name bool file_id_valid; FileID file_id; @@ -760,7 +760,7 @@ struct file_buffer { /* Two special kinds of buffers: * help buffer - used for help files, won't use a swap file. * spell buffer - used for spell info, never displayed and doesn't have a - * file name. + * file name. */ bool b_help; /* TRUE for help file buffer (when set b_p_bt is "help") */ @@ -930,9 +930,9 @@ typedef struct posmatch posmatch_T; struct posmatch { llpos_T pos[MAXPOSMATCH]; ///< array of positions - int cur; ///< internal position counter - linenr_T toplnum; ///< top buffer line - linenr_T botlnum; ///< bottom buffer line + int cur; ///< internal position counter + linenr_T toplnum; ///< top buffer line + linenr_T botlnum; ///< bottom buffer line }; /* |