kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-24 21:25:04 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge consecutive identical 'if' statements

Browse Source
This commit is contained in:
Anton Ovchinnikov 2015-03-14 23:20:54 +01:00 committed by Justin M. Keyes
parent 9927e99948
commit a62a2b6250
2 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/nvim/farsi.c
View File

@ -1561,9 +1561,6 @@ int fkmap(int c)
if (!curwin->w_cursor.col) {
return ALEF_U_H;
}
}
if (!p_ri) {
dec_cursor();
}
@ -1595,9 +1592,6 @@ int fkmap(int c)
if (!curwin->w_cursor.col) {
return ALEF;
}
}
if (!p_ri) {
dec_cursor();
}
@ -1673,9 +1667,6 @@ int fkmap(int c)
if (!curwin->w_cursor.col) {
return TEE;
}
}
if (!p_ri) {
dec_cursor();
}

14
src/nvim/fileio.c
View File

@ -1729,14 +1729,14 @@ failed:
}
}
if (set_options)
save_file_ff(curbuf); /* remember the current file format */
/* If editing a new file: set 'fenc' for the current buffer.
* Also for ":read ++edit file". */
if (set_options)
if (set_options) {
// Remember the current file format.
save_file_ff(curbuf);
// If editing a new file: set 'fenc' for the current buffer.
// Also for ":read ++edit file".
set_string_option_direct((char_u *)"fenc", -1, fenc,
OPT_FREE|OPT_LOCAL, 0);
OPT_FREE | OPT_LOCAL, 0);
}
if (fenc_alloced)
free(fenc);
# ifdef USE_ICONV