Mirror of the Vim source from https://github.com/vim/vim
リビジョン | 21ce954cbdcac9dea2aa826ff40adc2fb2184600 (tree) |
---|---|
日時 | 2007-02-20 12:43:38 |
作者 | vimboss |
コミッター | vimboss |
updated for version 7.0-201
@@ -2014,6 +2014,7 @@ | ||
2014 | 2014 | int start_skip, end_skip; |
2015 | 2015 | int new_count; |
2016 | 2016 | int buf_empty; |
2017 | + int found_not_ma = FALSE; | |
2017 | 2018 | |
2018 | 2019 | /* Find the current buffer in the list of diff buffers. */ |
2019 | 2020 | idx_cur = diff_buf_idx(curbuf); |
@@ -2028,13 +2029,19 @@ | ||
2028 | 2029 | /* No argument: Find the other buffer in the list of diff buffers. */ |
2029 | 2030 | for (idx_other = 0; idx_other < DB_COUNT; ++idx_other) |
2030 | 2031 | if (curtab->tp_diffbuf[idx_other] != curbuf |
2031 | - && curtab->tp_diffbuf[idx_other] != NULL | |
2032 | - && (eap->cmdidx != CMD_diffput | |
2033 | - || curtab->tp_diffbuf[idx_other]->b_p_ma)) | |
2034 | - break; | |
2032 | + && curtab->tp_diffbuf[idx_other] != NULL) | |
2033 | + { | |
2034 | + if (eap->cmdidx != CMD_diffput | |
2035 | + || curtab->tp_diffbuf[idx_other]->b_p_ma) | |
2036 | + break; | |
2037 | + found_not_ma = TRUE; | |
2038 | + } | |
2035 | 2039 | if (idx_other == DB_COUNT) |
2036 | 2040 | { |
2037 | - EMSG(_("E100: No other buffer in diff mode")); | |
2041 | + if (found_not_ma) | |
2042 | + EMSG(_("E793: No other buffer in diff mode is modifiable")); | |
2043 | + else | |
2044 | + EMSG(_("E100: No other buffer in diff mode")); | |
2038 | 2045 | return; |
2039 | 2046 | } |
2040 | 2047 |
@@ -667,6 +667,8 @@ | ||
667 | 667 | static int included_patches[] = |
668 | 668 | { /* Add new patch number below this line */ |
669 | 669 | /**/ |
670 | + 201, | |
671 | +/**/ | |
670 | 672 | 200, |
671 | 673 | /**/ |
672 | 674 | 199, |