diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2021-10-23 13:05:19 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-23 13:05:19 -0400 |
| commit | bb9e6a15834dcab2cb58afe22fedd0a4d818d9a8 (patch) | |
| tree | 0367fad361ebed9832d7d9bd9018dff1a670dc39 /src/nvim/memline.c | |
| parent | fa4b24072e13dc7303e896701f0bb6d0227caf0c (diff) | |
| parent | e59c0009a76cee92bedf72fbd1db04e4a16ed24b (diff) | |
| download | rneovim-bb9e6a15834dcab2cb58afe22fedd0a4d818d9a8.tar.gz rneovim-bb9e6a15834dcab2cb58afe22fedd0a4d818d9a8.tar.bz2 rneovim-bb9e6a15834dcab2cb58afe22fedd0a4d818d9a8.zip | |
Merge pull request #16111 from dundargoc/vim-patch/comments
vim-patch:8.1.2368,8.1.2378,8.1.2379,8.1.2380,8.1.2387,8.1.2388,8.1.2392,8.1.2394,8.1.2395,8.1.2396
Diffstat (limited to 'src/nvim/memline.c')
| -rw-r--r-- | src/nvim/memline.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/nvim/memline.c b/src/nvim/memline.c index 29e4a03d51..b4e9869b17 100644 --- a/src/nvim/memline.c +++ b/src/nvim/memline.c @@ -106,8 +106,8 @@ struct pointer_block { uint16_t pb_id; // ID for pointer block: PTR_ID uint16_t pb_count; // number of pointers in this block uint16_t pb_count_max; // maximum value for pb_count - PTR_EN pb_pointer[1]; /* list of pointers to blocks (actually longer) - * followed by empty space until end of page */ + PTR_EN pb_pointer[1]; // list of pointers to blocks (actually longer) + // followed by empty space until end of page }; /* @@ -1333,8 +1333,8 @@ int recover_names(char_u *fname, int list, int nr, char_u **fname_out) if (dir_name[0] == '.' && dir_name[1] == NUL) { // check current dir if (fname == NULL) { names[0] = vim_strsave((char_u *)"*.sw?"); - /* For Unix names starting with a dot are special. MS-Windows - * supports this too, on some file systems. */ + // For Unix names starting with a dot are special. MS-Windows + // supports this too, on some file systems. names[1] = vim_strsave((char_u *)".*.sw?"); names[2] = vim_strsave((char_u *)".sw?"); num_names = 3; @@ -1343,11 +1343,11 @@ int recover_names(char_u *fname, int list, int nr, char_u **fname_out) } } else { // check directory dir_name if (fname == NULL) { - names[0] = (char_u *)concat_fnames((char *)dir_name, "*.sw?", TRUE); - /* For Unix names starting with a dot are special. MS-Windows - * supports this too, on some file systems. */ - names[1] = (char_u *)concat_fnames((char *)dir_name, ".*.sw?", TRUE); - names[2] = (char_u *)concat_fnames((char *)dir_name, ".sw?", TRUE); + names[0] = (char_u *)concat_fnames((char *)dir_name, "*.sw?", true); + // For Unix names starting with a dot are special. MS-Windows + // supports this too, on some file systems. + names[1] = (char_u *)concat_fnames((char *)dir_name, ".*.sw?", true); + names[2] = (char_u *)concat_fnames((char *)dir_name, ".sw?", true); num_names = 3; } else { int len = (int)STRLEN(dir_name); @@ -3377,8 +3377,8 @@ static void attention_message(buf_T *buf, char_u *fname) MSG_PUTS(_(" NEWER than swap file!\n")); } } - /* Some of these messages are long to allow translation to - * other languages. */ + // Some of these messages are long to allow translation to + // other languages. MSG_PUTS(_("\n(1) Another program may be editing the same file. If this is" " the case,\n be careful not to end up with two different" " instances of the same\n file when making changes." @@ -3551,7 +3551,7 @@ static char *findswapname(buf_T *buf, char **dirp, char *old_fname, bool *found_ } // give the ATTENTION message when there is an old swap file - // for the current file, and the buffer was not recovered. */ + // for the current file, and the buffer was not recovered. if (differ == false && !(curbuf->b_flags & BF_RECOVERED) && vim_strchr(p_shm, SHM_ATTENTION) == NULL) { int choice = 0; |