修訂 | b76f033c1ab3821c930df740716f73da125f3d45 (tree) |
---|---|
時間 | 2016-03-23 11:41:11 |
作者 | NARUSE, Yui <nurse@user...> |
Commiter | NARUSE, Yui |
Merge pull request #2 from shyouhei/eliminate_branch_cond
eliminate needless branch condition
@@ -3834,8 +3834,8 @@ fold_conv(nkf_char c2, nkf_char c1) | ||
3834 | 3834 | f_prev = c1; |
3835 | 3835 | f_line = 0; |
3836 | 3836 | fold_state = CR; |
3837 | - } else if ((f_prev == c1 && !fold_preserve_f) | |
3838 | - || (f_prev == LF && fold_preserve_f) | |
3837 | + } else if ((f_prev == c1) | |
3838 | + || (f_prev == LF) | |
3839 | 3839 | ) { /* duplicate newline */ |
3840 | 3840 | if (f_line) { |
3841 | 3841 | f_line = 0; |