Mercurial > vim

comparison src/diff.c @ 26958:d92e0d85923f v8.2.4008

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.4008: error messages are spread out Commit: https://github.com/vim/vim/commit/677658ae49de31fe2e5b1fa6d93fdfab85a4362e Author: Bram Moolenaar <Bram@vim.org> Date: Wed Jan 5 16:09:06 2022 +0000 patch 8.2.4008: error messages are spread out Problem: Error messages are spread out. Solution: Move more error messages to errors.h.
author Bram Moolenaar <Bram@vim.org>
date Wed, 05 Jan 2022 17:15:05 +0100
parents 06a137af96f8
children 85866e069c24
comparison
equal deleted inserted replaced
26957:e5b81e2bed22 26958:d92e0d85923f
2680 found_not_ma = TRUE; 2680 found_not_ma = TRUE;
2681 } 2681 }
2682 if (idx_other == DB_COUNT) 2682 if (idx_other == DB_COUNT)
2683 { 2683 {
2684 if (found_not_ma) 2684 if (found_not_ma)
2685 emsg(_("E793: No other buffer in diff mode is modifiable")); 2685 emsg(_(e_no_other_buffer_in_diff_mode_is_modifiable));
2686 else 2686 else
2687 emsg(_(e_no_other_buffer_in_diff_mode)); 2687 emsg(_(e_no_other_buffer_in_diff_mode));
2688 return; 2688 return;
2689 } 2689 }
2690 2690
2767 if (!curbuf->b_changed) 2767 if (!curbuf->b_changed)
2768 { 2768 {
2769 change_warning(0); 2769 change_warning(0);
2770 if (diff_buf_idx(curbuf) != idx_to) 2770 if (diff_buf_idx(curbuf) != idx_to)
2771 { 2771 {
2772 emsg(_("E787: Buffer changed unexpectedly")); 2772 emsg(_(e_buffer_changed_unexpectedly));
2773 goto theend; 2773 goto theend;
2774 } 2774 }
2775 } 2775 }
2776 2776
2777 dprev = NULL; 2777 dprev = NULL;