To: vim_dev@googlegroups.com
Subject: Patch 8.2.3750
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 8.2.3750
Problem:    Error messages are everywhere.
Solution:   Move more error messages to errors.h and adjust the names.
Files:      src/globals.h, src/errors.h, src/blob.c, src/buffer.c,
            src/channel.c, src/ex_docmd.c, src/job.c, src/list.c, src/mark.c,
            src/misc1.c, src/os_unix.c, src/popupwin.c, src/register.c,
            src/session.c, src/spellfile.c, src/term.c, src/userfunc.c


*** ../vim-8.2.3749/src/globals.h	2021-12-05 21:46:31.172891155 +0000
--- src/globals.h	2021-12-05 22:05:11.815122647 +0000
***************
*** 1717,1730 ****
  #endif
  EXTERN char e_trailing[]	INIT(= N_("E488: Trailing characters"));
  EXTERN char e_trailing_arg[]	INIT(= N_("E488: Trailing characters: %s"));
- EXTERN char e_umark[]		INIT(= N_("E78: Unknown mark"));
- EXTERN char e_wildexpand[]	INIT(= N_("E79: Cannot expand wildcards"));
  EXTERN char e_winheight[]	INIT(= N_("E591: 'winheight' cannot be smaller than 'winminheight'"));
  EXTERN char e_winwidth[]	INIT(= N_("E592: 'winwidth' cannot be smaller than 'winminwidth'"));
- EXTERN char e_write[]		INIT(= N_("E80: Error while writing"));
  EXTERN char e_zerocount[]	INIT(= N_("E939: Positive count required"));
  #ifdef FEAT_EVAL
- EXTERN char e_usingsid[]	INIT(= N_("E81: Using <SID> not in a script context"));
  EXTERN char e_missing_paren[]	INIT(= N_("E107: Missing parentheses: %s"));
  EXTERN char e_missing_close[]	INIT(= N_("E110: Missing ')'"));
  EXTERN char e_missing_dict_colon[] INIT(= N_("E720: Missing colon in Dictionary: %s"));
--- 1717,1726 ----
***************
*** 1741,1747 ****
  #endif
  EXTERN char e_maxmempat[]	INIT(= N_("E363: pattern uses more memory than 'maxmempattern'"));
  EXTERN char e_emptybuf[]	INIT(= N_("E749: empty buffer"));
- EXTERN char e_nobufnr[]	INIT(= N_("E86: Buffer %ld does not exist"));
  
  EXTERN char e_invalpat[]	INIT(= N_("E682: Invalid search pattern or delimiter"));
  EXTERN char e_bufloaded[]	INIT(= N_("E139: File is loaded in another buffer"));
--- 1737,1742 ----
*** ../vim-8.2.3749/src/errors.h	2021-12-05 21:46:31.168891156 +0000
--- src/errors.h	2021-12-05 22:14:36.623813872 +0000
***************
*** 168,173 ****
--- 168,201 ----
  	INIT(= N_("E76: Too many ["));
  EXTERN char e_too_many_file_names[]
  	INIT(= N_("E77: Too many file names"));
+ EXTERN char e_unknown_mark[]
+ 	INIT(= N_("E78: Unknown mark"));
+ EXTERN char e_cannot_expand_wildcards[]
+ 	INIT(= N_("E79: Cannot expand wildcards"));
+ EXTERN char e_error_while_writing[]
+ 	INIT(= N_("E80: Error while writing"));
+ #ifdef FEAT_EVAL
+ EXTERN char e_using_sid_not_in_script_context[]
+ 	INIT(= N_("E81: Using <SID> not in a script context"));
+ #endif
+ EXTERN char e_cannot_allocate_any_buffer_exiting[]
+ 	INIT(= N_("E82: Cannot allocate any buffer, exiting..."));
+ EXTERN char e_cannot_allocate_buffer_using_other_one[]
+ 	INIT(= N_("E83: Cannot allocate buffer, using other one..."));
+ EXTERN char e_no_modified_buffer_found[]
+ 	INIT(= N_("E84: No modified buffer found"));
+ EXTERN char e_there_is_no_listed_buffer[]
+ 	INIT(= N_("E85: There is no listed buffer"));
+ EXTERN char e_buffer_nr_does_not_exist[]
+ 	INIT(= N_("E86: Buffer %ld does not exist"));
+ EXTERN char e_cannot_go_beyond_last_buffer[]
+ 	INIT(= N_("E87: Cannot go beyond last buffer"));
+ EXTERN char e_cannot_go_before_first_buffer[]
+ 	INIT(= N_("E88: Cannot go before first buffer"));
+ EXTERN char e_no_write_since_last_change_for_buffer_nr_add_bang_to_override[]
+ 	INIT(= N_("E89: No write since last change for buffer %d (add ! to override)"));
+ EXTERN char e_cannot_unload_last_buffer[]
+ 	INIT(= N_("E90: Cannot unload last buffer"));
  
  #ifdef FEAT_EVAL
  EXTERN char e_undefined_variable_str[]
*** ../vim-8.2.3749/src/blob.c	2021-12-03 13:56:57.195519128 +0000
--- src/blob.c	2021-12-05 21:58:29.219810228 +0000
***************
*** 209,215 ****
      if (fwrite(blob->bv_ga.ga_data, 1, blob->bv_ga.ga_len, fd)
  						  < (size_t)blob->bv_ga.ga_len)
      {
! 	emsg(_(e_write));
  	return FAIL;
      }
      return OK;
--- 209,215 ----
      if (fwrite(blob->bv_ga.ga_data, 1, blob->bv_ga.ga_len, fd)
  						  < (size_t)blob->bv_ga.ga_len)
      {
! 	emsg(_(e_error_while_writing));
  	return FAIL;
      }
      return OK;
*** ../vim-8.2.3749/src/buffer.c	2021-12-03 11:08:34.256842709 +0000
--- src/buffer.c	2021-12-05 22:10:30.307143877 +0000
***************
*** 193,199 ****
  	// This is OK, since there are no changes to lose.
  	if (curbuf == NULL)
  	{
! 	    emsg(_("E82: Cannot allocate any buffer, exiting..."));
  
  	    // Don't try to do any saving, with "curbuf" NULL almost nothing
  	    // will work.
--- 193,199 ----
  	// This is OK, since there are no changes to lose.
  	if (curbuf == NULL)
  	{
! 	    emsg(_(e_cannot_allocate_any_buffer_exiting));
  
  	    // Don't try to do any saving, with "curbuf" NULL almost nothing
  	    // will work.
***************
*** 201,207 ****
  	    getout(2);
  	}
  
! 	emsg(_("E83: Cannot allocate buffer, using other one..."));
  	enter_buffer(curbuf);
  #ifdef FEAT_SYN_HL
  	if (old_tw != curbuf->b_p_tw)
--- 201,207 ----
  	    getout(2);
  	}
  
! 	emsg(_(e_cannot_allocate_buffer_using_other_one));
  	enter_buffer(curbuf);
  #ifdef FEAT_SYN_HL
  	if (old_tw != curbuf->b_p_tw)
***************
*** 1182,1188 ****
  
      if (action == DOBUF_UNLOAD)
      {
! 	emsg(_("E90: Cannot unload last buffer"));
  	return FAIL;
      }
  
--- 1182,1188 ----
  
      if (action == DOBUF_UNLOAD)
      {
! 	emsg(_(e_cannot_unload_last_buffer));
  	return FAIL;
      }
  
***************
*** 1255,1261 ****
  	}
  	if (!bufIsChanged(buf))
  	{
! 	    emsg(_("E84: No modified buffer found"));
  	    return FAIL;
  	}
      }
--- 1255,1261 ----
  	}
  	if (!bufIsChanged(buf))
  	{
! 	    emsg(_(e_no_modified_buffer_found));
  	    return FAIL;
  	}
      }
***************
*** 1294,1300 ****
  	    if (bp == buf)
  	    {
  		// back where we started, didn't find anything.
! 		emsg(_("E85: There is no listed buffer"));
  		return FAIL;
  	    }
  	}
--- 1294,1300 ----
  	    if (bp == buf)
  	    {
  		// back where we started, didn't find anything.
! 		emsg(_(e_there_is_no_listed_buffer));
  		return FAIL;
  	    }
  	}
***************
*** 1306,1317 ****
  	{
  	    // don't warn when deleting
  	    if (!unload)
! 		semsg(_(e_nobufnr), count);
  	}
  	else if (dir == FORWARD)
! 	    emsg(_("E87: Cannot go beyond last buffer"));
  	else
! 	    emsg(_("E88: Cannot go before first buffer"));
  	return FAIL;
      }
  #ifdef FEAT_PROP_POPUP
--- 1306,1317 ----
  	{
  	    // don't warn when deleting
  	    if (!unload)
! 		semsg(_(e_buffer_nr_does_not_exist), count);
  	}
  	else if (dir == FORWARD)
! 	    emsg(_(e_cannot_go_beyond_last_buffer));
  	else
! 	    emsg(_(e_cannot_go_before_first_buffer));
  	return FAIL;
      }
  #ifdef FEAT_PROP_POPUP
***************
*** 1364,1370 ****
  	    else
  #endif
  	    {
! 		semsg(_("E89: No write since last change for buffer %d (add ! to override)"),
  								 buf->b_fnum);
  		return FAIL;
  	    }
--- 1364,1370 ----
  	    else
  #endif
  	    {
! 		semsg(_(e_no_write_since_last_change_for_buffer_nr_add_bang_to_override),
  								 buf->b_fnum);
  		return FAIL;
  	    }
*** ../vim-8.2.3749/src/channel.c	2021-11-21 14:51:09.925191591 +0000
--- src/channel.c	2021-12-05 22:06:27.122991356 +0000
***************
*** 1210,1216 ****
  	{
  	    buf = buflist_findnr(opt->jo_io_buf[PART_OUT]);
  	    if (buf == NULL)
! 		semsg(_(e_nobufnr), (long)opt->jo_io_buf[PART_OUT]);
  	}
  	else
  	{
--- 1210,1217 ----
  	{
  	    buf = buflist_findnr(opt->jo_io_buf[PART_OUT]);
  	    if (buf == NULL)
! 		semsg(_(e_buffer_nr_does_not_exist),
! 					       (long)opt->jo_io_buf[PART_OUT]);
  	}
  	else
  	{
***************
*** 1257,1263 ****
  	{
  	    buf = buflist_findnr(opt->jo_io_buf[PART_ERR]);
  	    if (buf == NULL)
! 		semsg(_(e_nobufnr), (long)opt->jo_io_buf[PART_ERR]);
  	}
  	else
  	{
--- 1258,1265 ----
  	{
  	    buf = buflist_findnr(opt->jo_io_buf[PART_ERR]);
  	    if (buf == NULL)
! 		semsg(_(e_buffer_nr_does_not_exist),
! 					       (long)opt->jo_io_buf[PART_ERR]);
  	}
  	else
  	{
*** ../vim-8.2.3749/src/ex_docmd.c	2021-12-05 12:06:18.887815813 +0000
--- src/ex_docmd.c	2021-12-05 22:00:41.243588159 +0000
***************
*** 9167,9173 ****
  	case SPEC_SID:
  		if (current_sctx.sc_sid <= 0)
  		{
! 		    *errormsg = _(e_usingsid);
  		    return NULL;
  		}
  		sprintf((char *)strbuf, "<SNR>%d_", current_sctx.sc_sid);
--- 9167,9173 ----
  	case SPEC_SID:
  		if (current_sctx.sc_sid <= 0)
  		{
! 		    *errormsg = _(e_using_sid_not_in_script_context);
  		    return NULL;
  		}
  		sprintf((char *)strbuf, "<SNR>%d_", current_sctx.sc_sid);
*** ../vim-8.2.3749/src/job.c	2021-11-13 10:27:34.387764064 +0000
--- src/job.c	2021-12-05 22:06:44.782960483 +0000
***************
*** 225,231 ****
  		}
  		if (buflist_findnr(opt->jo_io_buf[part]) == NULL)
  		{
! 		    semsg(_(e_nobufnr), (long)opt->jo_io_buf[part]);
  		    return FAIL;
  		}
  	    }
--- 225,232 ----
  		}
  		if (buflist_findnr(opt->jo_io_buf[part]) == NULL)
  		{
! 		    semsg(_(e_buffer_nr_does_not_exist),
! 						   (long)opt->jo_io_buf[part]);
  		    return FAIL;
  		}
  	    }
***************
*** 475,481 ****
  		opt->jo_bufnr_buf = buflist_findnr(nr);
  		if (opt->jo_bufnr_buf == NULL)
  		{
! 		    semsg(_(e_nobufnr), (long)nr);
  		    return FAIL;
  		}
  		if (opt->jo_bufnr_buf->b_nwindows == 0
--- 476,482 ----
  		opt->jo_bufnr_buf = buflist_findnr(nr);
  		if (opt->jo_bufnr_buf == NULL)
  		{
! 		    semsg(_(e_buffer_nr_does_not_exist), (long)nr);
  		    return FAIL;
  		}
  		if (opt->jo_bufnr_buf->b_nwindows == 0
***************
*** 1332,1338 ****
  	{
  	    buf = buflist_findnr(opt.jo_io_buf[PART_IN]);
  	    if (buf == NULL)
! 		semsg(_(e_nobufnr), (long)opt.jo_io_buf[PART_IN]);
  	}
  	else if (!(opt.jo_set & JO_IN_NAME))
  	{
--- 1333,1340 ----
  	{
  	    buf = buflist_findnr(opt.jo_io_buf[PART_IN]);
  	    if (buf == NULL)
! 		semsg(_(e_buffer_nr_does_not_exist),
! 						 (long)opt.jo_io_buf[PART_IN]);
  	}
  	else if (!(opt.jo_set & JO_IN_NAME))
  	{
*** ../vim-8.2.3749/src/list.c	2021-09-19 16:01:35.502496563 +0100
--- src/list.c	2021-12-05 21:58:32.711804401 +0000
***************
*** 1603,1609 ****
  	    }
  	if (ret == FAIL)
  	{
! 	    emsg(_(e_write));
  	    break;
  	}
      }
--- 1603,1609 ----
  	    }
  	if (ret == FAIL)
  	{
! 	    emsg(_(e_error_while_writing));
  	    break;
  	}
      }
*** ../vim-8.2.3749/src/mark.c	2021-10-17 21:53:54.588481239 +0100
--- src/mark.c	2021-12-05 21:56:23.744016947 +0000
***************
*** 578,584 ****
  {
      if (pos == NULL)
      {
! 	emsg(_(e_umark));
  	return FAIL;
      }
      if (pos->lnum <= 0)
--- 578,584 ----
  {
      if (pos == NULL)
      {
! 	emsg(_(e_unknown_mark));
  	return FAIL;
      }
      if (pos->lnum <= 0)
*** ../vim-8.2.3749/src/misc1.c	2021-12-04 17:20:22.535448236 +0000
--- src/misc1.c	2021-12-05 22:05:51.911052819 +0000
***************
*** 2403,2409 ****
  	    buf = buflist_findnr(argvars[1].vval.v_number);
  	    if (buf == NULL)
  	    {
! 		semsg(_(e_nobufnr), argvars[1].vval.v_number);
  		fclose(fd);
  		goto errret;
  	    }
--- 2403,2409 ----
  	    buf = buflist_findnr(argvars[1].vval.v_number);
  	    if (buf == NULL)
  	    {
! 		semsg(_(e_buffer_nr_does_not_exist), argvars[1].vval.v_number);
  		fclose(fd);
  		goto errret;
  	    }
*** ../vim-8.2.3749/src/os_unix.c	2021-11-29 20:39:06.678101624 +0000
--- src/os_unix.c	2021-12-05 21:57:13.767935080 +0000
***************
*** 6797,6803 ****
  	    if (!(flags & EW_SILENT))
  #endif
  	    {
! 		msg(_(e_wildexpand));
  		msg_start();		// don't overwrite this message
  	    }
  	}
--- 6797,6803 ----
  	    if (!(flags & EW_SILENT))
  #endif
  	    {
! 		msg(_(e_cannot_expand_wildcards));
  		msg_start();		// don't overwrite this message
  	    }
  	}
***************
*** 6817,6823 ****
  	// Something went wrong, perhaps a file name with a special char.
  	if (!(flags & EW_SILENT))
  	{
! 	    msg(_(e_wildexpand));
  	    msg_start();		// don't overwrite this message
  	}
  	vim_free(tempname);
--- 6817,6823 ----
  	// Something went wrong, perhaps a file name with a special char.
  	if (!(flags & EW_SILENT))
  	{
! 	    msg(_(e_cannot_expand_wildcards));
  	    msg_start();		// don't overwrite this message
  	}
  	vim_free(tempname);
*** ../vim-8.2.3749/src/popupwin.c	2021-11-29 17:37:38.063265208 +0000
--- src/popupwin.c	2021-12-05 22:05:54.439048417 +0000
***************
*** 1877,1883 ****
  	    buf = buflist_findnr(argvars[0].vval.v_number);
  	    if (buf == NULL)
  	    {
! 		semsg(_(e_nobufnr), argvars[0].vval.v_number);
  		return NULL;
  	    }
  #ifdef FEAT_TERMINAL
--- 1877,1883 ----
  	    buf = buflist_findnr(argvars[0].vval.v_number);
  	    if (buf == NULL)
  	    {
! 		semsg(_(e_buffer_nr_does_not_exist), argvars[0].vval.v_number);
  		return NULL;
  	    }
  #ifdef FEAT_TERMINAL
*** ../vim-8.2.3749/src/register.c	2021-12-02 18:55:10.714678843 +0000
--- src/register.c	2021-12-05 22:05:57.691042746 +0000
***************
*** 2836,2842 ****
  
  	    buf = buflist_findnr(num);
  	    if (buf == NULL)
! 		semsg(_(e_nobufnr), (long)num);
  	}
  	else
  	    buf = buflist_findnr(buflist_findpat(str, str + STRLEN(str),
--- 2836,2842 ----
  
  	    buf = buflist_findnr(num);
  	    if (buf == NULL)
! 		semsg(_(e_buffer_nr_does_not_exist), (long)num);
  	}
  	else
  	    buf = buflist_findnr(buflist_findpat(str, str + STRLEN(str),
*** ../vim-8.2.3749/src/session.c	2021-10-17 17:20:20.399745698 +0100
--- src/session.c	2021-12-05 21:58:35.387799953 +0000
***************
*** 1331,1337 ****
  	failed |= fclose(fd);
  
  	if (failed)
! 	    emsg(_(e_write));
  #if defined(FEAT_SESSION)
  	else if (eap->cmdidx == CMD_mksession)
  	{
--- 1331,1337 ----
  	failed |= fclose(fd);
  
  	if (failed)
! 	    emsg(_(e_error_while_writing));
  #if defined(FEAT_SESSION)
  	else if (eap->cmdidx == CMD_mksession)
  	{
*** ../vim-8.2.3749/src/spellfile.c	2021-08-11 14:54:55.807732100 +0100
--- src/spellfile.c	2021-12-05 21:58:49.375776597 +0000
***************
*** 5259,5265 ****
      if (fwv != (size_t)1)
  	retval = FAIL;
      if (retval == FAIL)
! 	emsg(_(e_write));
  
      return retval;
  }
--- 5259,5265 ----
      if (fwv != (size_t)1)
  	retval = FAIL;
      if (retval == FAIL)
! 	emsg(_(e_error_while_writing));
  
      return retval;
  }
***************
*** 5404,5410 ****
  	    if (fd != NULL)
  		if (putc(np->wn_byte, fd) == EOF) // <byte> or <xbyte>
  		{
! 		    emsg(_(e_write));
  		    return 0;
  		}
  	}
--- 5404,5410 ----
  	    if (fd != NULL)
  		if (putc(np->wn_byte, fd) == EOF) // <byte> or <xbyte>
  		{
! 		    emsg(_(e_error_while_writing));
  		    return 0;
  		}
  	}
***************
*** 5815,5821 ****
       */
      if (fwrite(VIMSUGMAGIC, VIMSUGMAGICL, (size_t)1, fd) != 1) // <fileID>
      {
! 	emsg(_(e_write));
  	goto theend;
      }
      putc(VIMSUGVERSION, fd);				// <versionnr>
--- 5815,5821 ----
       */
      if (fwrite(VIMSUGMAGIC, VIMSUGMAGICL, (size_t)1, fd) != 1) // <fileID>
      {
! 	emsg(_(e_error_while_writing));
  	goto theend;
      }
      putc(VIMSUGVERSION, fd);				// <versionnr>
***************
*** 5857,5863 ****
  	len = (int)STRLEN(line) + 1;
  	if (fwrite(line, (size_t)len, (size_t)1, fd) == 0)
  	{
! 	    emsg(_(e_write));
  	    goto theend;
  	}
  	spin->si_memtot += len;
--- 5857,5863 ----
  	len = (int)STRLEN(line) + 1;
  	if (fwrite(line, (size_t)len, (size_t)1, fd) == 0)
  	{
! 	    emsg(_(e_error_while_writing));
  	    goto theend;
  	}
  	spin->si_memtot += len;
***************
*** 5865,5871 ****
  
      // Write another byte to check for errors.
      if (putc(0, fd) == EOF)
! 	emsg(_(e_write));
  
      vim_snprintf((char *)IObuff, IOSIZE,
  		 _("Estimated runtime memory use: %d bytes"), spin->si_memtot);
--- 5865,5871 ----
  
      // Write another byte to check for errors.
      if (putc(0, fd) == EOF)
! 	emsg(_(e_error_while_writing));
  
      vim_snprintf((char *)IObuff, IOSIZE,
  		 _("Estimated runtime memory use: %d bytes"), spin->si_memtot);
*** ../vim-8.2.3749/src/term.c	2021-12-03 20:43:20.088234242 +0000
--- src/term.c	2021-12-05 22:00:44.379582840 +0000
***************
*** 6021,6027 ****
  	    if (STRNICMP(src, "<SID>", 5) == 0)
  	    {
  		if (current_sctx.sc_sid <= 0)
! 		    emsg(_(e_usingsid));
  		else
  		{
  		    src += 5;
--- 6021,6027 ----
  	    if (STRNICMP(src, "<SID>", 5) == 0)
  	    {
  		if (current_sctx.sc_sid <= 0)
! 		    emsg(_(e_using_sid_not_in_script_context));
  		else
  		{
  		    src += 5;
*** ../vim-8.2.3749/src/userfunc.c	2021-12-03 11:08:34.260842706 +0000
--- src/userfunc.c	2021-12-05 22:00:46.875578591 +0000
***************
*** 3763,3769 ****
  	    // It's script-local, "s:" or "<SID>"
  	    if (current_sctx.sc_sid <= 0)
  	    {
! 		emsg(_(e_usingsid));
  		goto theend;
  	    }
  	    sprintf((char *)sid_buf, "%ld_", (long)current_sctx.sc_sid);
--- 3763,3769 ----
  	    // It's script-local, "s:" or "<SID>"
  	    if (current_sctx.sc_sid <= 0)
  	    {
! 		emsg(_(e_using_sid_not_in_script_context));
  		goto theend;
  	    }
  	    sprintf((char *)sid_buf, "%ld_", (long)current_sctx.sc_sid);
*** ../vim-8.2.3749/src/version.c	2021-12-05 21:46:31.172891155 +0000
--- src/version.c	2021-12-05 22:11:02.251257641 +0000
***************
*** 755,756 ****
--- 755,758 ----
  {   /* Add new patch number below this line */
+ /**/
+     3750,
  /**/

-- 
Normal people believe that if it ain't broke, don't fix it.  Engineers believe
that if it ain't broke, it doesn't have enough features yet.
				(Scott Adams - The Dilbert principle)

 /// 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    ///