Mercurial > vim

changeset 18498:9e6d5a4abb1c v8.1.2243

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.2243: typos in comments Commit: https://github.com/vim/vim/commit/32aa10203bd0b4b270def03311a4599f9ffdecc4 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Nov 2 22:54:41 2019 +0100 patch 8.1.2243: typos in comments Problem: Typos in comments. Solution: Fix the typos. (Dominique Pelle, closes https://github.com/vim/vim/issues/5160) Also adjust formatting a bit.
author Bram Moolenaar <Bram@vim.org>
date Sat, 02 Nov 2019 23:00:06 +0100
parents 14e9f08eec14
children b27ed4764264
files src/autocmd.c src/buffer.c src/cindent.c src/crypt.c src/diff.c src/getchar.c src/globals.h src/gui_gtk_x11.c src/highlight.c src/insexpand.c src/macros.h src/map.c src/memline.c src/message.c src/option.c src/os_unix.c src/pty.c src/quickfix.c src/regexp_nfa.c src/register.c src/spellsuggest.c src/structs.h src/textprop.c src/ui.c src/undo.c src/version.c src/vim.h src/viminfo.c
diffstat 28 files changed, 47 insertions(+), 45 deletions(-) [+]
line wrap: on
line diff
--- a/src/autocmd.c
+++ b/src/autocmd.c
@@ -1584,8 +1584,8 @@ win_found:
 	    curbuf = curwin->w_buffer;
 	    if (win_valid(aco->save_prevwin))
 		prevwin = aco->save_prevwin;
-	    // In case the autocommand move the cursor to a position that that
-	    // not exist in curbuf.
+	    // In case the autocommand moves the cursor to a position that
+	    // does not exist in curbuf.
 	    check_cursor();
 	}
     }
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -4951,7 +4951,7 @@ fix_fname(char_u  *fname)
  * When resolving a link both "*sfname" and "*ffname" will point to the same
  * allocated memory.
  * The "*ffname" and "*sfname" pointer values on call will not be freed.
- * Note that the resulting "*ffname" pointer should be considered not allocaed.
+ * Note that the resulting "*ffname" pointer should be considered not allocated.
  */
     void
 fname_expand(
--- a/src/cindent.c
+++ b/src/cindent.c
@@ -1778,10 +1778,10 @@ parse_cino(buf_T *buf)
     // should be located.
     buf->b_ind_continuation = sw;
 
-    // Spaces from the indent of the line with an unclosed parentheses.
+    // Spaces from the indent of the line with an unclosed parenthesis.
     buf->b_ind_unclosed = sw * 2;
 
-    // Spaces from the indent of the line with an unclosed parentheses, which
+    // Spaces from the indent of the line with an unclosed parenthesis, which
     // itself is also unclosed.
     buf->b_ind_unclosed2 = sw;
 
@@ -1795,7 +1795,7 @@ parse_cino(buf_T *buf)
     buf->b_ind_unclosed_wrapped = 0;
 
     // Suppress ignoring white space when lining up with the character after
-    // an unclosed parentheses.
+    // an unclosed parenthesis.
     buf->b_ind_unclosed_whiteok = 0;
 
     // Indent a closing parentheses under the line start of the matching
@@ -2725,7 +2725,7 @@ get_c_indent(void)
 		if (curwin->w_cursor.lnum <= ourscope)
 		{
 		    // We reached end of scope:
-		    // If looking for a enum or structure initialization
+		    // If looking for an enum or structure initialization
 		    // go further back:
 		    // If it is an initializer (enum xxx or xxx =), then
 		    // don't add ind_continuation, otherwise it is a variable
@@ -2785,7 +2785,7 @@ get_c_indent(void)
 			    if (terminated == ',')
 				break;
 
-			    // if it es a enum declaration or an assignment,
+			    // if it is an enum declaration or an assignment,
 			    // we are done.
 			    if (terminated != ';' && cin_isinit())
 				break;
@@ -3083,7 +3083,7 @@ get_c_indent(void)
 		//   123,
 		//   sizeof
 		//	  here
-		// Otherwise check whether it is a enumeration or structure
+		// Otherwise check whether it is an enumeration or structure
 		// initialisation (not indented) or a variable declaration
 		// (indented).
 		terminated = cin_isterminated(l, FALSE, TRUE);
--- a/src/crypt.c
+++ b/src/crypt.c
@@ -206,7 +206,7 @@ crypt_whole_undofile(int method_nr)
 }
 
 /*
- * Get crypt method specifc length of the file header in bytes.
+ * Get crypt method specific length of the file header in bytes.
  */
     int
 crypt_get_header_len(int method_nr)
--- a/src/diff.c
+++ b/src/diff.c
@@ -419,7 +419,7 @@ diff_mark_adjust_tp(
 			off = 0;
 			if (last < line2)
 			{
-			    /* 2. delete at end of of diff */
+			    /* 2. delete at end of diff */
 			    dp->df_count[idx] -= last - lnum_deleted + 1;
 			    if (dp->df_next != NULL
 				    && dp->df_next->df_lnum[idx] - 1 <= line2)
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -1504,7 +1504,7 @@ before_blocking(void)
 }
 
 /*
- * updatescipt() is called when a character can be written into the script file
+ * updatescript() is called when a character can be written into the script file
  * or when we have waited some time for a character (c == 0)
  *
  * All the changed memfiles are synced if c == 0 or when the number of typed
--- a/src/globals.h
+++ b/src/globals.h
@@ -99,7 +99,7 @@ EXTERN short	*TabPageIdxs INIT(= NULL);
 // Array with size Rows x Columns containing zindex of popups.
 EXTERN short	*popup_mask INIT(= NULL);
 EXTERN short	*popup_mask_next INIT(= NULL);
-// Array with flags for tansparent cells of current popup.
+// Array with flags for transparent cells of current popup.
 EXTERN char	*popup_transparent INIT(= NULL);
 
 // Flag set to TRUE when popup_mask needs to be updated.
@@ -393,7 +393,7 @@ EXTERN int include_link INIT(= 0);	// wh
  * character just after the match in the last line.
  */
 EXTERN int	highlight_match INIT(= FALSE);	// show search match pos
-EXTERN linenr_T	search_match_lines;		// lines of of matched string
+EXTERN linenr_T	search_match_lines;		// lines of matched string
 EXTERN colnr_T	search_match_endcol;		// col nr of match end
 #ifdef FEAT_SEARCH_EXTRA
 EXTERN linenr_T	search_first_line INIT(= 0);	  // for :{FIRST},{last}s/pat
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -2895,7 +2895,7 @@ drawarea_configure_event_cb(GtkWidget	  
      *
      * Naturally, configure events propagated to here like that are fallacious
      * and, as a matter of fact, they trigger a geometric collapse of
-     * gui.drawarea in fullscreen and miximized modes.
+     * gui.drawarea in fullscreen and maximized modes.
      *
      * To filter out such nuisance events, we are making use of the fact that
      * the field send_event of such GdkEventConfigures is set to FALSE in
--- a/src/highlight.c
+++ b/src/highlight.c
@@ -3682,7 +3682,8 @@ match_add(
 	return -1;
     if (id < -1 || id == 0)
     {
-	semsg(_("E799: Invalid ID: %d (must be greater than or equal to 1)"), id);
+	semsg(_("E799: Invalid ID: %d (must be greater than or equal to 1)"),
+									   id);
 	return -1;
     }
     if (id != -1)
@@ -4346,7 +4347,7 @@ prepare_search_hl_line(
  * After end, check for start/end of next match.
  * When another match, have to check for start again.
  * Watch out for matching an empty string!
- * Return the udpated search_attr.
+ * Return the updated search_attr.
  */
     int
 update_search_hl(
--- a/src/insexpand.c
+++ b/src/insexpand.c
@@ -1612,7 +1612,7 @@ ins_compl_new_leader(void)
 #ifdef FEAT_SPELL
 	spell_bad_len = 0;	// need to redetect bad word
 #endif
-	// Matches were cleared, need to search for them now.  Befor drawing
+	// Matches were cleared, need to search for them now.  Before drawing
 	// the popup menu display the changed text before the cursor.  Set
 	// "compl_restarting" to avoid that the first match is inserted.
 	pum_call_update_screen();
@@ -2858,7 +2858,7 @@ ins_compl_get_exp(pos_T *ini)
 
 	    //	Buffers other than curbuf are scanned from the beginning or the
 	    //	end but never from the middle, thus setting nowrapscan in this
-	    //	buffers is a good idea, on the other hand, we always set
+	    //	buffer is a good idea, on the other hand, we always set
 	    //	wrapscan for curbuf to avoid missing matches -- Acevedo,Webb
 	    save_p_ws = p_ws;
 	    if (ins_buf != curbuf)
--- a/src/macros.h
+++ b/src/macros.h
@@ -335,7 +335,7 @@
 	} \
     } while (0)
 
-/* Wether a command index indicates a user command. */
+/* Whether a command index indicates a user command. */
 #define IS_USER_CMDIDX(idx) ((int)(idx) < 0)
 
 // Give an error in curwin is a popup window and evaluate to TRUE.
--- a/src/map.c
+++ b/src/map.c
@@ -1924,7 +1924,7 @@ check_map_keycodes(void)
     save_name = sourcing_name;
     sourcing_name = (char_u *)"mappings"; // avoids giving error messages
 
-    // This this once for each buffer, and then once for global
+    // Do this once for each buffer, and then once for global
     // mappings/abbreviations with bp == NULL
     for (bp = firstbuf; ; bp = bp->b_next)
     {
--- a/src/memline.c
+++ b/src/memline.c
@@ -2318,7 +2318,7 @@ swapfile_unchanged(char_u *fname)
 	ret = FALSE;
 
 #if defined(UNIX) || defined(MSWIN)
-    // process must known and not be running
+    // process must be known and not be running
     pid = char_to_long(b0.b0_pid);
     if (pid == 0L || mch_process_running(pid))
 	ret = FALSE;
--- a/src/message.c
+++ b/src/message.c
@@ -1616,7 +1616,7 @@ msg_make(char_u *arg)
 msg_outtrans_special(
     char_u	*strstart,
     int		from,	// TRUE for lhs of a mapping
-    int		maxlen) // screen columns, 0 for unlimeted
+    int		maxlen) // screen columns, 0 for unlimited
 {
     char_u	*str = strstart;
     int		retval = 0;
--- a/src/option.c
+++ b/src/option.c
@@ -4877,7 +4877,7 @@ put_setstring(
 	    home_replace(NULL, *valuep, buf, size, FALSE);
 
 	    // If the option value is longer than MAXPATHL, we need to append
-	    // earch comma separated part of the option separately, so that it
+	    // each comma separated part of the option separately, so that it
 	    // can be expanded when read back.
 	    if (size >= MAXPATHL && (flags & P_COMMA) != 0
 					   && vim_strchr(*valuep, ',') != NULL)
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -877,7 +877,7 @@ sig_alarm SIGDEFARG(sigarg)
 static JMP_BUF lc_jump_env;
 
 # ifdef SIGHASARG
-// Caught signal number, 0 when no was signal caught; used for mch_libcall().
+// Caught signal number, 0 when no signal was caught; used for mch_libcall().
 // Volatile because it is used in signal handlers.
 static volatile sig_atomic_t lc_signal;
 # endif
@@ -3067,7 +3067,7 @@ executable_file(char_u *name)
 	return 0;
 #ifdef VMS
     /* Like on Unix system file can have executable rights but not necessarily
-     * be an executable, but on Unix is not a default for an ordianry file to
+     * be an executable, but on Unix is not a default for an ordinary file to
      * have an executable flag - on VMS it is in most cases.
      * Therefore, this check does not have any sense - let keep us to the
      * conventions instead:
--- a/src/pty.c
+++ b/src/pty.c
@@ -15,7 +15,7 @@
  * The parts that are not used in Vim have been deleted.
  * See the "screen" sources for the complete stuff.
  *
- * This specific version is distibuted under the Vim license (attribution by
+ * This specific version is distributed under the Vim license (attribution by
  * Juergen Weigert), the GPL applies to the original version, see the
  * copyright notice below.
  */
--- a/src/quickfix.c
+++ b/src/quickfix.c
@@ -1861,7 +1861,7 @@ qf_new_list(qf_info_T *qi, char_u *qf_ti
 
     // If the current entry is not the last entry, delete entries beyond
     // the current entry.  This makes it possible to browse in a tree-like
-    // way with ":grep'.
+    // way with ":grep".
     while (qi->qf_listcount > qi->qf_curlist + 1)
 	qf_free(&qi->qf_lists[--qi->qf_listcount]);
 
@@ -5224,7 +5224,7 @@ qf_find_entry_after_pos(
 	int		*errornr)
 {
     if (qf_entry_after_pos(qfp, pos, linewise))
-	// First entry is after postion 'pos'
+	// First entry is after position 'pos'
 	return qfp;
 
     // Find the entry just before or at the position 'pos'
--- a/src/regexp_nfa.c
+++ b/src/regexp_nfa.c
@@ -3213,7 +3213,7 @@ post2nfa(int *postfix, int *end, int nfa
 
     if (nfa_calc_size == FALSE)
     {
-	// Allocate space for the stack. Max states on the stack: "nstate'.
+	// Allocate space for the stack. Max states on the stack: "nstate".
 	stack = ALLOC_MULT(Frag_T, nstate + 1);
 	if (stack == NULL)
 	    return NULL;
--- a/src/register.c
+++ b/src/register.c
@@ -899,8 +899,8 @@ adjust_clip_reg(int *rp)
 	    *rp = ((clip_unnamed & CLIP_UNNAMED_PLUS) && clip_plus.available)
 								  ? '+' : '*';
 	else
-	    *rp = ((clip_unnamed_saved & CLIP_UNNAMED_PLUS) && clip_plus.available)
-								  ? '+' : '*';
+	    *rp = ((clip_unnamed_saved & CLIP_UNNAMED_PLUS)
+					   && clip_plus.available) ? '+' : '*';
     }
     if (!clip_star.available && *rp == '*')
 	*rp = 0;
@@ -1288,7 +1288,7 @@ op_yank(oparg_T *oap, int deleting, int 
 		&& !oap->block_mode
 		&& yanklines == 1)
 	    yanklines = 0;
-	// Some versions of Vi use ">=" here, some don't... 
+	// Some versions of Vi use ">=" here, some don't...
 	if (yanklines > p_report)
 	{
 	    char namebuf[100];
--- a/src/spellsuggest.c
+++ b/src/spellsuggest.c
@@ -990,7 +990,7 @@ spell_suggest_intern(suginfo_T *su, int 
     {
 	if (sps_flags & SPS_BEST)
 	    // Adjust the word score for the suggestions found so far for how
-	    // they sounds like.
+	    // they sound like.
 	    rescore_suggestions(su);
 
 	// While going through the soundfold tree "su_maxscore" is the score
--- a/src/structs.h
+++ b/src/structs.h
@@ -3497,7 +3497,7 @@ struct VimMenu
 #ifdef FEAT_GUI_MAC
 //  MenuHandle	id;
 //  short	index;		    // the item index within the father menu
-    short	menu_id;	    // the menu id to which this item belong
+    short	menu_id;	    // the menu id to which this item belongs
     short	submenu_id;	    // the menu id of the children (could be
 				    // get through some tricks)
     MenuHandle	menu_handle;
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -12,13 +12,12 @@
  *
  * TODO:
  * - Adjust text property column and length when text is inserted/deleted.
- *   -> :substitute with multiple matches, issue #4427
  *   -> a :substitute with a multi-line match
  *   -> search for changed_bytes() from misc1.c
  *   -> search for mark_col_adjust()
  * - Perhaps we only need TP_FLAG_CONT_NEXT and can drop TP_FLAG_CONT_PREV?
- * - Add an arrray for global_proptypes, to quickly lookup a prop type by ID
- * - Add an arrray for b_proptypes, to quickly lookup a prop type by ID
+ * - Add an array for global_proptypes, to quickly lookup a prop type by ID
+ * - Add an array for b_proptypes, to quickly lookup a prop type by ID
  * - Checking the text length to detect text properties is slow.  Use a flag in
  *   the index, like DB_MARKED?
  * - Also test line2byte() with many lines, so that ml_updatechunk() is taken
@@ -126,7 +125,7 @@ lookup_prop_type(char_u *name, buf_T *bu
  * When the argument is not used or "bufnr" is not present then "buf" is
  * unchanged.
  * If "bufnr" is valid or not present return OK.
- * When "arg" is not a dict or "bufnr" is invalide return FAIL.
+ * When "arg" is not a dict or "bufnr" is invalid return FAIL.
  */
     static int
 get_bufnr_from_arg(typval_T *arg, buf_T **buf)
--- a/src/ui.c
+++ b/src/ui.c
@@ -913,7 +913,7 @@ start_global_changes(void)
 
     if (clip_did_set_selection)
     {
-	clip_unnamed = FALSE;
+	clip_unnamed = 0;
 	clip_did_set_selection = FALSE;
     }
 }
@@ -941,7 +941,7 @@ end_global_changes(void)
     {
 	clip_did_set_selection = TRUE;
 	clip_unnamed = clip_unnamed_saved;
-	clip_unnamed_saved = FALSE;
+	clip_unnamed_saved = 0;
 	if (clipboard_needs_update)
 	{
 	    /* only store something in the clipboard,
--- a/src/undo.c
+++ b/src/undo.c
@@ -341,7 +341,7 @@ undo_allowed(void)
 }
 
 /*
- * Get the undolevle value for the current buffer.
+ * Get the undolevel value for the current buffer.
  */
     static long
 get_undolevel(void)
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2243,
+/**/
     2242,
 /**/
     2241,
--- a/src/vim.h
+++ b/src/vim.h
@@ -325,7 +325,7 @@ typedef unsigned short	short_u;
 typedef unsigned int	int_u;
 
 // Older systems do not have support for long long
-// use a typedef instead of hadcoded long long
+// use a typedef instead of hard-coded long long
 #ifdef HAVE_NO_LONG_LONG
  typedef long long_long_T;
  typedef long unsigned long_long_u_T;
--- a/src/viminfo.c
+++ b/src/viminfo.c
@@ -2307,7 +2307,7 @@ copy_viminfo_marks(
 			else
 			{
 			    // No timestamp, must be written by an older Vim.
-			    // Assume all remaining buffers are older then
+			    // Assume all remaining buffers are older than
 			    // ours.
 			    while (count < num_marked_files
 					    && buflist_used < buflist->ga_len)
@@ -3201,7 +3201,7 @@ write_viminfo(char_u *file, int forceit)
 	    {
 		if (st_old.st_uid != tmp_st.st_uid)
 		    // Changing the owner might fail, in which case the
-		    // file will now owned by the current user, oh well.
+		    // file will now be owned by the current user, oh well.
 		    vim_ignored = fchown(fileno(fp_out), st_old.st_uid, -1);
 		if (st_old.st_gid != tmp_st.st_gid
 			&& fchown(fileno(fp_out), -1, st_old.st_gid) == -1)