To: vim_dev@googlegroups.com Subject: Patch 8.2.4022 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.4022 Problem: Two error messages in the wrong file. Solution: Use the error message from errors.h. Files: src/popupwin.c, src/usercmd.c *** ../vim-8.2.4021/src/popupwin.c 2022-01-05 17:49:10.881225127 +0000 --- src/popupwin.c 2022-01-05 20:11:27.830678092 +0000 *************** *** 1917,1923 **** tp = find_tabpage(tabnr); if (tp == NULL) { ! semsg(_("E997: Tabpage not found: %d"), tabnr); return NULL; } } --- 1917,1923 ---- tp = find_tabpage(tabnr); if (tp == NULL) { ! semsg(_(e_tabpage_not_found_nr), tabnr); return NULL; } } *************** *** 2525,2531 **** if (wp != NULL && !WIN_IS_POPUP(wp)) { ! semsg(_("E993: window %d is not a popup window"), id); return NULL; } return wp; --- 2525,2531 ---- if (wp != NULL && !WIN_IS_POPUP(wp)) { ! semsg(_(e_window_nr_is_not_popup_window), id); return NULL; } return wp; *************** *** 2671,2677 **** static void error_for_popup_window(void) { ! emsg(_("E994: Not allowed in a popup window")); } int --- 2671,2677 ---- static void error_for_popup_window(void) { ! emsg(_(e_not_allowed_in_popup_window)); } int *** ../vim-8.2.4021/src/usercmd.c 2022-01-05 17:49:10.881225127 +0000 --- src/usercmd.c 2022-01-05 20:22:35.228310446 +0000 *************** *** 618,624 **** for (i = 0; err[i] != NUL && !VIM_ISWHITE(err[i]); i++) ; err[i] = NUL; ! semsg(_("E180: Invalid address type value: %s"), err); return FAIL; } --- 618,624 ---- for (i = 0; err[i] != NUL && !VIM_ISWHITE(err[i]); i++) ; err[i] = NUL; ! semsg(_(e_invalid_address_type_value_str), err); return FAIL; } *** ../vim-8.2.4021/src/version.c 2022-01-06 21:38:07.822094822 +0000 --- src/version.c 2022-01-06 21:40:44.117658233 +0000 *************** *** 752,753 **** --- 752,755 ---- { /* Add new patch number below this line */ + /**/ + 4022, /**/ -- Married is a three ring circus: First comes the engagement ring. Then comes the wedding ring. Then comes the suffering. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///