Mercurial > vim

comparison src/fileio.c @ 26861:df2de1e63de0 v8.2.3959

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.3959: error messages are spread out Commit: https://github.com/vim/vim/commit/6d0570117ac86b7979bf249de5741088212d6e17 Author: Bram Moolenaar <Bram@vim.org> Date: Fri Dec 31 18:49:43 2021 +0000 patch 8.2.3959: error messages are spread out Problem: Error messages are spread out. Solution: Move more errors to errors.h.
author Bram Moolenaar <Bram@vim.org>
date Fri, 31 Dec 2021 20:00:05 +0100
parents aaec2028c8fc
children bce848ec8b1b
comparison
equal deleted inserted replaced
26860:07ad81bfab52 26861:df2de1e63de0
725 || (fd = mch_open((char *)fname, O_RDONLY | O_EXTRA, 0)) < 0)) 725 || (fd = mch_open((char *)fname, O_RDONLY | O_EXTRA, 0)) < 0))
726 { 726 {
727 --no_wait_return; 727 --no_wait_return;
728 msg_scroll = msg_save; 728 msg_scroll = msg_save;
729 if (fd < 0) 729 if (fd < 0)
730 emsg(_("E200: *ReadPre autocommands made the file unreadable")); 730 emsg(_(e_readpre_autocommands_made_file_unreadable));
731 else 731 else
732 emsg(_("E201: *ReadPre autocommands must not change current buffer")); 732 emsg(_(e_readpre_autocommands_must_not_change_current_buffer));
733 curbuf->b_p_ro = TRUE; // must use "w!" now 733 curbuf->b_p_ro = TRUE; // must use "w!" now
734 return FAIL; 734 return FAIL;
735 } 735 }
736 } 736 }
737 737
1051 // Conversion failed. Try another one. 1051 // Conversion failed. Try another one.
1052 advance_fenc = TRUE; 1052 advance_fenc = TRUE;
1053 if (fd < 0) 1053 if (fd < 0)
1054 { 1054 {
1055 // Re-opening the original file failed! 1055 // Re-opening the original file failed!
1056 emsg(_("E202: Conversion made file unreadable!")); 1056 emsg(_(e_conversion_mad_file_unreadable));
1057 error = TRUE; 1057 error = TRUE;
1058 goto failed; 1058 goto failed;
1059 } 1059 }
1060 goto retry; 1060 goto retry;
1061 } 1061 }
3871 } 3871 }
3872 3872
3873 while ((n = read_eintr(fd_in, buffer, WRITEBUFSIZE)) > 0) 3873 while ((n = read_eintr(fd_in, buffer, WRITEBUFSIZE)) > 0)
3874 if (write_eintr(fd_out, buffer, n) != n) 3874 if (write_eintr(fd_out, buffer, n) != n)
3875 { 3875 {
3876 errmsg = _("E208: Error writing to \"%s\""); 3876 errmsg = _(e_error_writing_to_str);
3877 break; 3877 break;
3878 } 3878 }
3879 3879
3880 vim_free(buffer); 3880 vim_free(buffer);
3881 close(fd_in); 3881 close(fd_in);
3882 if (close(fd_out) < 0) 3882 if (close(fd_out) < 0)
3883 errmsg = _("E209: Error closing \"%s\""); 3883 errmsg = _(e_error_closing_str);
3884 if (n < 0) 3884 if (n < 0)
3885 { 3885 {
3886 errmsg = _("E210: Error reading \"%s\""); 3886 errmsg = _(e_error_reading_str);
3887 to = from; 3887 to = from;
3888 } 3888 }
3889 #ifndef UNIX // for Unix mch_open() already set the permission 3889 #ifndef UNIX // for Unix mch_open() already set the permission
3890 mch_setperm(to, perm); 3890 mch_setperm(to, perm);
3891 #endif 3891 #endif
4170 { 4170 {
4171 if (*reason == 'd') 4171 if (*reason == 'd')
4172 { 4172 {
4173 // Only give the message once. 4173 // Only give the message once.
4174 if (prev_b_mtime != -1) 4174 if (prev_b_mtime != -1)
4175 mesg = _("E211: File \"%s\" no longer available"); 4175 mesg = _(e_file_str_no_longer_available);
4176 } 4176 }
4177 else 4177 else
4178 { 4178 {
4179 helpmesg = TRUE; 4179 helpmesg = TRUE;
4180 #if defined(FEAT_CON_DIALOG) || defined(FEAT_GUI_DIALOG) 4180 #if defined(FEAT_CON_DIALOG) || defined(FEAT_GUI_DIALOG)
5611 reg_pat[i++] = '$'; 5611 reg_pat[i++] = '$';
5612 reg_pat[i] = NUL; 5612 reg_pat[i] = NUL;
5613 if (nested != 0) 5613 if (nested != 0)
5614 { 5614 {
5615 if (nested < 0) 5615 if (nested < 0)
5616 emsg(_("E219: Missing {.")); 5616 emsg(_(e_missing_open_curly));
5617 else 5617 else
5618 emsg(_("E220: Missing }.")); 5618 emsg(_(e_missing_close_curly));
5619 VIM_CLEAR(reg_pat); 5619 VIM_CLEAR(reg_pat);
5620 } 5620 }
5621 return reg_pat; 5621 return reg_pat;
5622 } 5622 }
5623 5623