summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominique Pelle <dominique.pelle@gmail.com>2021-12-27 17:21:41 +0000
committerBram Moolenaar <Bram@vim.org>2021-12-27 17:21:41 +0000
commitaf4a61a85d6e8cacc35324f266934bc463a21673 (patch)
tree3b2e75b8a36bc8e79d2bc407d929a84b69fd0e0c
parent5da36052a4bb0f3a9747ec3a8ab9d85e058e39fa (diff)
patch 8.2.3914: various spelling mistakes in commentsv8.2.3914
Problem: Various spelling mistakes in comments. Solution: Fix the mistakes. (Dominique Pellé, closes #9416)
-rw-r--r--src/alloc.c2
-rw-r--r--src/blowfish.c2
-rw-r--r--src/buffer.c4
-rw-r--r--src/cindent.c10
-rw-r--r--src/clipboard.c6
-rw-r--r--src/diff.c6
-rw-r--r--src/drawline.c4
-rw-r--r--src/edit.c4
-rw-r--r--src/ex_cmds.c2
-rw-r--r--src/ex_docmd.c4
-rw-r--r--src/findfile.c4
-rw-r--r--src/fold.c2
-rw-r--r--src/getchar.c6
-rw-r--r--src/gui.c16
-rw-r--r--src/gui_athena.c2
-rw-r--r--src/gui_gtk.c2
-rw-r--r--src/gui_motif.c2
-rw-r--r--src/gui_photon.c2
-rw-r--r--src/gui_w32.c10
-rw-r--r--src/gui_xmebw.c2
-rw-r--r--src/if_python.c4
-rw-r--r--src/if_python3.c2
-rw-r--r--src/if_xcmdsrv.c2
-rw-r--r--src/main.c2
-rw-r--r--src/memline.c2
-rw-r--r--src/menu.c6
-rw-r--r--src/message.c2
-rw-r--r--src/misc1.c2
-rw-r--r--src/move.c4
-rw-r--r--src/option.c4
-rw-r--r--src/os_amiga.c2
-rw-r--r--src/os_mac.h2
-rw-r--r--src/os_mac_conv.c2
-rw-r--r--src/os_mswin.c4
-rw-r--r--src/os_unix.c2
-rw-r--r--src/os_win32.c4
-rw-r--r--src/os_win32.h2
-rw-r--r--src/quickfix.c2
-rw-r--r--src/regexp_nfa.c4
-rw-r--r--src/screen.c22
-rw-r--r--src/scriptfile.c2
-rw-r--r--src/spell.c8
-rw-r--r--src/spellfile.c4
-rw-r--r--src/spellsuggest.c2
-rw-r--r--src/strings.c2
-rw-r--r--src/term.c2
-rw-r--r--src/terminal.c2
-rw-r--r--src/testdir/test_debugger.vim2
-rw-r--r--src/testdir/test_source.vim2
-rw-r--r--src/textformat.c2
-rw-r--r--src/userfunc.c2
-rw-r--r--src/version.c2
-rw-r--r--src/vim.h2
-rw-r--r--src/vim9.h2
-rw-r--r--src/vim9cmds.c2
-rw-r--r--src/vim9execute.c2
-rw-r--r--src/winclip.c4
-rw-r--r--src/window.c4
58 files changed, 109 insertions, 107 deletions
diff --git a/src/alloc.c b/src/alloc.c
index 84a1124f35..20df46c00d 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -236,7 +236,7 @@ lalloc(size_t size, int message)
// if some blocks are released call malloc again.
for (;;)
{
- // Handle three kind of systems:
+ // Handle three kinds of systems:
// 1. No check for available memory: Just return.
// 2. Slow check for available memory: call mch_avail_mem() after
// allocating KEEP_ROOM amount of memory.
diff --git a/src/blowfish.c b/src/blowfish.c
index 4502a1c5db..4f6ce01c10 100644
--- a/src/blowfish.c
+++ b/src/blowfish.c
@@ -651,7 +651,7 @@ crypt_blowfish_init(
state->method_state = bfs;
// "blowfish" uses a 64 byte buffer, causing it to repeat 8 byte groups 8
- // times. "blowfish2" uses a 8 byte buffer to avoid repeating.
+ // times. "blowfish2" uses an 8 byte buffer to avoid repeating.
bfs->cfb_len = state->method_nr == CRYPT_M_BF ? BF_MAX_CFB_LEN : BF_BLOCK;
if (blowfish_self_test() == FAIL)
diff --git a/src/buffer.c b/src/buffer.c
index cbb57efa51..5e41e644ff 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1823,7 +1823,7 @@ enter_buffer(buf_T *buf)
if (curbuf->b_ml.ml_mfp == NULL) // need to load the file
{
// If there is no filetype, allow for detecting one. Esp. useful for
- // ":ball" used in a autocommand. If there already is a filetype we
+ // ":ball" used in an autocommand. If there already is a filetype we
// might prefer to keep it.
if (*curbuf->b_p_ft == NUL)
did_filetype = FALSE;
@@ -5031,7 +5031,7 @@ build_stl_str_hl(
sp->userhl = 0;
}
- // When inside update_screen we do not want redrawing a stausline, ruler,
+ // When inside update_screen we do not want redrawing a statusline, ruler,
// title, etc. to trigger another redraw, it may cause an endless loop.
if (updating_screen)
{
diff --git a/src/cindent.c b/src/cindent.c
index 42b46e4016..9f1db03c59 100644
--- a/src/cindent.c
+++ b/src/cindent.c
@@ -1223,7 +1223,7 @@ cin_isfuncdecl(
if (*s == ')' && cin_nocode(s + 1))
{
// ')' at the end: may have found a match
- // Check for he previous line not to end in a backslash:
+ // Check for the previous line not to end in a backslash:
// #if defined(x) && {backslash}
// defined(y)
lnum = first_lnum - 1;
@@ -1792,7 +1792,7 @@ parse_cino(buf_T *buf)
buf->b_ind_unclosed2 = sw;
// Suppress ignoring spaces from the indent of a line starting with an
- // unclosed parentheses.
+ // unclosed parenthesis.
buf->b_ind_unclosed_noignore = 0;
// If the opening paren is the last nonwhite character on the line, and
@@ -1804,11 +1804,11 @@ parse_cino(buf_T *buf)
// an unclosed parenthesis.
buf->b_ind_unclosed_whiteok = 0;
- // Indent a closing parentheses under the line start of the matching
- // opening parentheses.
+ // Indent a closing parenthesis under the line start of the matching
+ // opening parenthesis.
buf->b_ind_matching_paren = 0;
- // Indent a closing parentheses under the previous line.
+ // Indent a closing parenthesis under the previous line.
buf->b_ind_paren_prev = 0;
// Extra indent for comments.
diff --git a/src/clipboard.c b/src/clipboard.c
index c0c21aeb6d..38596f589c 100644
--- a/src/clipboard.c
+++ b/src/clipboard.c
@@ -567,7 +567,7 @@ clip_get_word_boundaries(Clipboard_T *cb, int row, int col)
return;
p = ScreenLines + LineOffset[row];
- // Correct for starting in the right halve of a double-wide char
+ // Correct for starting in the right half of a double-wide char
if (enc_dbcs != 0)
col -= dbcs_screen_head_off(p, p + col);
else if (enc_utf8 && p[col] == 0)
@@ -1030,7 +1030,7 @@ clip_copy_modeless_selection(int both UNUSED)
if (row2 > clip_star.max_row)
row2 = clip_star.max_row;
#endif
- // correct starting point for being on right halve of double-wide char
+ // correct starting point for being on right half of double-wide char
p = ScreenLines + LineOffset[row1];
if (enc_dbcs != 0)
col1 -= (*mb_head_off)(p, p + col1);
@@ -1140,7 +1140,7 @@ clip_copy_modeless_selection(int both UNUSED)
bufp);
}
}
- // Skip right halve of double-wide character.
+ // Skip right half of double-wide character.
if (ScreenLines[off + i + 1] == 0)
++i;
}
diff --git a/src/diff.c b/src/diff.c
index 45c5e0b9d6..e9367b568a 100644
--- a/src/diff.c
+++ b/src/diff.c
@@ -693,11 +693,11 @@ diff_redraw(
if (wp_other != NULL && curwin->w_p_scb)
{
if (used_max_fill_curwin)
- // The current window was set to used the maximum number of filler
+ // The current window was set to use the maximum number of filler
// lines, may need to reduce them.
diff_set_topline(wp_other, curwin);
else if (used_max_fill_other)
- // The other window was set to used the maximum number of filler
+ // The other window was set to use the maximum number of filler
// lines, may need to reduce them.
diff_set_topline(curwin, wp_other);
}
@@ -1595,7 +1595,7 @@ ex_diffoff(exarg_T *eap)
diff_clear(curtab);
}
- // Remove "hor" from from 'scrollopt' if there are no diff windows left.
+ // Remove "hor" from 'scrollopt' if there are no diff windows left.
if (!diffwin && vim_strchr(p_sbo, 'h') != NULL)
do_cmdline_cmd((char_u *)"set sbo-=hor");
}
diff --git a/src/drawline.c b/src/drawline.c
index 7125b800f6..8a042ed3ea 100644
--- a/src/drawline.c
+++ b/src/drawline.c
@@ -2258,7 +2258,7 @@ win_line(
// Make sure, the highlighting for the tab char will be
// correctly set further below (effectively reverts the
- // FIX_FOR_BOGSUCOLS macro
+ // FIX_FOR_BOGSUCOLS macro).
if (n_extra == tab_len + vc_saved && wp->w_p_list
&& wp->w_lcs_chars.tab1)
tab_len += vc_saved;
@@ -2938,7 +2938,7 @@ win_line(
#if defined(FEAT_RIGHTLEFT)
if (has_mbyte && wp->w_p_rl && (*mb_char2cells)(mb_c) > 1)
{
- // A double-wide character is: put first halve in left cell.
+ // A double-wide character is: put first half in left cell.
--off;
--col;
}
diff --git a/src/edit.c b/src/edit.c
index 9ff1c184e2..f4e9327b6d 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -1657,8 +1657,8 @@ decodeModifyOtherKeys(int c)
*/
static int pc_status;
#define PC_STATUS_UNSET 0 // pc_bytes was not set
-#define PC_STATUS_RIGHT 1 // right halve of double-wide char
-#define PC_STATUS_LEFT 2 // left halve of double-wide char
+#define PC_STATUS_RIGHT 1 // right half of double-wide char
+#define PC_STATUS_LEFT 2 // left half of double-wide char
#define PC_STATUS_SET 3 // pc_bytes was filled
static char_u pc_bytes[MB_MAXBYTES + 1]; // saved bytes
static int pc_attr;
diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index ff978ad66d..8595e8be05 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -3378,7 +3378,7 @@ ex_append(exarg_T *eap)
// "start" is set to eap->line2+1 unless that position is invalid (when
// eap->line2 pointed to the end of the buffer and nothing was appended)
// "end" is set to lnum when something has been appended, otherwise
- // it is the same than "start" -- Acevedo
+ // it is the same as "start" -- Acevedo
if ((cmdmod.cmod_flags & CMOD_LOCKMARKS) == 0)
{
curbuf->b_op_start.lnum = (eap->line2 < curbuf->b_ml.ml_line_count) ?
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index ab0a146fba..20b24572ce 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -3744,7 +3744,7 @@ find_ex_command(
break;
}
- // Not not recognize ":*" as the star command unless '*' is in
+ // Do not recognize ":*" as the star command unless '*' is in
// 'cpoptions'.
if (eap->cmdidx == CMD_star && vim_strchr(p_cpo, CPO_STAR) == NULL)
p = eap->cmd;
@@ -6977,7 +6977,7 @@ do_exedit(
|| eap->cmdidx == CMD_tabedit
|| eap->cmdidx == CMD_vnew) && *eap->arg == NUL)
{
- // ":new" or ":tabnew" without argument: edit an new empty buffer
+ // ":new" or ":tabnew" without argument: edit a new empty buffer
setpcmark();
(void)do_ecmd(0, NULL, NULL, eap, ECMD_ONE,
ECMD_HIDE + (eap->forceit ? ECMD_FORCEIT : 0),
diff --git a/src/findfile.c b/src/findfile.c
index ab59776978..d3de9fc719 100644
--- a/src/findfile.c
+++ b/src/findfile.c
@@ -749,7 +749,7 @@ vim_findfile(void *search_ctx_arg)
// downward search loop
for (;;)
{
- // check if user user wants to stop the search
+ // check if user wants to stop the search
ui_breakcheck();
if (got_int)
break;
@@ -1376,7 +1376,7 @@ ff_check_visited(
int url = FALSE;
#endif
- // For an URL we only compare the name, otherwise we compare the
+ // For a URL we only compare the name, otherwise we compare the
// device/inode (unix) or the full path name (not Unix).
if (path_with_url(fname))
{
diff --git a/src/fold.c b/src/fold.c
index d4a6267539..7d993f70fd 100644
--- a/src/fold.c
+++ b/src/fold.c
@@ -2513,7 +2513,7 @@ foldUpdateIEMSRecurse(
*/
while (!got_int)
{
- // set concat to 1 if it's allowed to concatenated this fold
+ // set concat to 1 if it's allowed to concatenate this fold
// with a previous one that touches it.
if (flp->start != 0 || flp->had_end <= MAX_LEVEL)
concat = 0;
diff --git a/src/getchar.c b/src/getchar.c
index c3573547aa..102eb2f167 100644
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -76,7 +76,7 @@ static int KeyNoremap = 0; // remapping flags
// typebuf.tb_buf has three parts: room in front (for result of mappings), the
// middle for typeahead and room for new characters (which needs to be 3 *
-// MAXMAPLEN) for the Amiga).
+// MAXMAPLEN for the Amiga).
#define TYPELEN_INIT (5 * (MAXMAPLEN + 3))
static char_u typebuf_init[TYPELEN_INIT]; // initial typebuf.tb_buf
static char_u noremapbuf_init[TYPELEN_INIT]; // initial typebuf.tb_noremap
@@ -941,7 +941,7 @@ noremap_keys(void)
*
* If noremap is REMAP_YES, new string can be mapped again.
* If noremap is REMAP_NONE, new string cannot be mapped again.
- * If noremap is REMAP_SKIP, fist char of new string cannot be mapped again,
+ * If noremap is REMAP_SKIP, first char of new string cannot be mapped again,
* but abbreviations are allowed.
* If noremap is REMAP_SCRIPT, new string cannot be mapped again, except for
* script-local mappings.
@@ -3457,7 +3457,7 @@ vgetorpeek(int advance)
inchar(
char_u *buf,
int maxlen,
- long wait_time) // milli seconds
+ long wait_time) // milliseconds
{
int len = 0; // init for GCC
int retesc = FALSE; // return ESC with gotint
diff --git a/src/gui.c b/src/gui.c
index 74d681e7e1..9b19cefe36 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -490,7 +490,7 @@ gui_init(void)
static int recursive = 0;
/*
- * It's possible to use ":gui" in a .gvimrc file. The first halve of this
+ * It's possible to use ":gui" in a .gvimrc file. The first half of this
* function will then be executed at the first call, the rest by the
* recursive call. This allow the shell to be opened halfway reading a
* gvimrc file.
@@ -1371,10 +1371,10 @@ gui_update_cursor(
#ifdef FEAT_RIGHTLEFT
if (CURSOR_BAR_RIGHT)
{
- // gui.col points to the left halve of the character but
- // the vertical line needs to be on the right halve.
+ // gui.col points to the left half of the character but
+ // the vertical line needs to be on the right half.
// A double-wide horizontal line is also drawn from the
- // right halve in gui_mch_draw_part_cursor().
+ // right half in gui_mch_draw_part_cursor().
col_off = TRUE;
++gui.col;
}
@@ -2188,7 +2188,7 @@ gui_screenchar(
{
char_u buf[MB_MAXBYTES + 1];
- // Don't draw right halve of a double-width UTF-8 char. "cannot happen"
+ // Don't draw right half of a double-width UTF-8 char. "cannot happen"
if (enc_utf8 && ScreenLines[off] == 0)
return OK;
@@ -3074,7 +3074,7 @@ gui_wait_for_chars(long wtime, int tb_change_cnt)
gui_inchar(
char_u *buf,
int maxlen,
- long wtime, // milli seconds
+ long wtime, // milliseconds
int tb_change_cnt)
{
return gui_wait_for_chars_buf(buf, maxlen, wtime, tb_change_cnt);
@@ -3277,7 +3277,7 @@ button_set:
* selection. But if Visual is active, assume that only the Visual area
* will be selected.
* Exception: On the command line, both the selection is used and a mouse
- * key is send.
+ * key is sent.
*/
if (!mouse_has(checkfor) || checkfor == MOUSE_COMMAND)
{
@@ -5376,7 +5376,7 @@ gui_do_findrepl(
// When the screen is being updated we should not change buffers and
// windows structures, it may cause freed memory to be used. Also don't
- // do this recursively (pressing "Find" quickly several times.
+ // do this recursively (pressing "Find" quickly several times).
if (updating_screen || busy)
return FALSE;
diff --git a/src/gui_athena.c b/src/gui_athena.c
index f4aafcd94e..4da832b220 100644
--- a/src/gui_athena.c
+++ b/src/gui_athena.c
@@ -216,7 +216,7 @@ gui_athena_scroll_cb_scroll(
else if (value < 0)
value = 0;
- // Update the bottom scrollbar an extra time (why is this needed??
+ // Update the bottom scrollbar an extra time (why is this needed??)
if (sb->wp == NULL) // Bottom scrollbar
gui_mch_set_scrollbar_thumb(sb, value, sb->size, sb->max);
diff --git a/src/gui_gtk.c b/src/gui_gtk.c
index 2ea7a5e020..08290a56f4 100644
--- a/src/gui_gtk.c
+++ b/src/gui_gtk.c
@@ -2242,7 +2242,7 @@ find_replace_dialog_create(char_u *arg, int do_replace)
gtk_window_present(GTK_WINDOW(frdp->dialog));
// For :promptfind dialog, always give keyboard focus to 'what' entry.
- // For :promptrepl dialog, give it to 'with' entry if 'what' has an
+ // For :promptrepl dialog, give it to 'with' entry if 'what' has a
// non-empty entry; otherwise, to 'what' entry.
gtk_widget_grab_focus(frdp->what);
if (do_replace && entry_get_text_length(GTK_ENTRY(frdp->what)) > 0)
diff --git a/src/gui_motif.c b/src/gui_motif.c
index d79a414be7..1d95651fbb 100644
--- a/src/gui_motif.c
+++ b/src/gui_motif.c
@@ -2768,7 +2768,7 @@ gui_mch_dialog(
// Create the dialog message.
// Since LessTif is apparently having problems with the creation of
// properly localized string, we use LtoR here. The symptom is that the
- // string sill not show properly in multiple lines as it does in native
+ // string is not shown properly in multiple lines as it does in native
// Motif.
label = XmStringCreateLtoR((char *)message, STRING_TAG);
if (label == NULL)
diff --git a/src/gui_photon.c b/src/gui_photon.c
index c89d781056..ea8e5e463a 100644
--- a/src/gui_photon.c
+++ b/src/gui_photon.c
@@ -487,7 +487,7 @@ gui_ph_handle_keyboard(PtWidget_t *widget, void *data, PtCallbackInfo_t *info)
if (key->key_cap >= Pk_KP_Enter && key->key_cap <= Pk_KP_9
&& (key->key_mods & Pk_KM_Num_Lock))
{
- // FIXME: For now, just map the key to a ascii value
+ // FIXME: For now, just map the key to an ascii value
// (see <photon/PkKeyDef.h>)
ch = key->key_cap - 0xf080;
}
diff --git a/src/gui_w32.c b/src/gui_w32.c
index b879aa3c88..4edce2e29f 100644
--- a/src/gui_w32.c
+++ b/src/gui_w32.c
@@ -3041,7 +3041,7 @@ get_scroll_flags(void)
if (!is_window_onscreen(s_hwnd))
return SW_INVALIDATE;
- // Check if there is an window (partly) on top of us.
+ // Check if there is a window (partly) on top of us.
GetWindowRect(s_hwnd, &rcVim);
for (hwnd = s_hwnd; (hwnd = GetWindow(hwnd, GW_HWNDPREV)) != (HWND)0; )
if (IsWindowVisible(hwnd))
@@ -5740,7 +5740,7 @@ GetCompositionString_inUCS2(HIMC hIMC, DWORD GCS, int *lenp)
if (!pImmGetContext)
return NULL; // no imm32.dll
- // Try Unicode; this'll always work on NT regardless of codepage.
+ // Try Unicode; this will always work on NT regardless of codepage.
ret = pImmGetCompositionStringW(hIMC, GCS, NULL, 0);
if (ret == 0)
return NULL; // empty
@@ -5757,7 +5757,7 @@ GetCompositionString_inUCS2(HIMC hIMC, DWORD GCS, int *lenp)
return (short_u *)wbuf;
}
- // ret < 0; we got an error, so try the ANSI version. This'll work
+ // ret < 0; we got an error, so try the ANSI version. This will work
// on 9x/ME, but only if the codepage happens to be set to whatever
// we're inputting.
ret = pImmGetCompositionStringA(hIMC, GCS, NULL, 0);
@@ -7390,8 +7390,8 @@ add_dialog_element(
*p++ = 0; // advance pointer over nExtraStuff WORD - 2 more
- return p; //total = 15+ (strlen(caption)) words
- // = 30 + 2(strlen(caption) bytes reqd
+ return p; // total = 15 + strlen(caption) words
+ // bytes read = 2 * total
}
diff --git a/src/gui_xmebw.c b/src/gui_xmebw.c
index 3387fbe0b4..7ffa6f3fb4 100644
--- a/src/gui_xmebw.c
+++ b/src/gui_xmebw.c
@@ -970,7 +970,7 @@ set_size(XmEnhancedButtonWidget newtb)
}
else
{
- // FIXME: We should calculate an drawing offset for the pixmap here to
+ // FIXME: We should calculate a drawing offset for the pixmap here to
// adjust it.
}
diff --git a/src/if_python.c b/src/if_python.c
index a27098245a..1b7ff762f6 100644
--- a/src/if_python.c
+++ b/src/if_python.c
@@ -674,7 +674,7 @@ python_runtime_link_init(char *libname, int verbose)
# if !(defined(PY_NO_RTLD_GLOBAL) && defined(PY3_NO_RTLD_GLOBAL)) && defined(UNIX) && defined(FEAT_PYTHON3)
// Can't have Python and Python3 loaded at the same time.
- // It cause a crash, because RTLD_GLOBAL is needed for
+ // It causes a crash, because RTLD_GLOBAL is needed for
// standard C extension libraries of one or both python versions.
if (python3_loaded())
{
@@ -1461,7 +1461,7 @@ LineToString(const char *str)
PyInt len = strlen(str);
char *p;
- // Allocate an Python string object, with uninitialised contents. We
+ // Allocate a Python string object, with uninitialised contents. We
// must do it this way, so that we can modify the string in place
// later. See the Python source, Objects/stringobject.c for details.
result = PyString_FromStringAndSize(NULL, len);
diff --git a/src/if_python3.c b/src/if_python3.c
index 4944ab813c..db88527a5d 100644
--- a/src/if_python3.c
+++ b/src/if_python3.c
@@ -766,7 +766,7 @@ py3_runtime_link_init(char *libname, int verbose)
# if !(defined(PY_NO_RTLD_GLOBAL) && defined(PY3_NO_RTLD_GLOBAL)) && defined(UNIX) && defined(FEAT_PYTHON)
// Can't have Python and Python3 loaded at the same time.
- // It cause a crash, because RTLD_GLOBAL is needed for
+ // It causes a crash, because RTLD_GLOBAL is needed for
// standard C extension libraries of one or both python versions.
if (python_loaded())
{
diff --git a/src/if_xcmdsrv.c b/src/if_xcmdsrv.c
index 901afc4677..c814f213d6 100644
--- a/src/if_xcmdsrv.c
+++ b/src/if_xcmdsrv.c
@@ -345,7 +345,7 @@ serverChangeRegisteredWindow(
DeleteAnyLingerer(dpy, newwin);
if (serverName != NULL)
{
- // Reinsert name if we was already registered
+ // Reinsert name if it was already registered
(void)LookupName(dpy, serverName, /*delete=*/TRUE, NULL);
sprintf((char *)propInfo, "%x %.*s",
(int_u)newwin, MAX_NAME_LENGTH, serverName);
diff --git a/src/main.c b/src/main.c
index 6943c2f794..53322498c4 100644
--- a/src/main.c
+++ b/src/main.c
@@ -247,7 +247,7 @@ main
mch_dirname(start_dir, MAXPATHL);
// Temporarily add '(' and ')' to 'isfname'. These are valid
// filename characters but are excluded from 'isfname' to make
- // "gf" work on a file name in parenthesis (e.g.: see vim.h).
+ // "gf" work on a file name in parentheses (e.g.: see vim.h).
do_cmdline_cmd((char_u *)":set isf+=(,)");
alist_expand(NULL, 0);
do_cmdline_cmd((char_u *)":set isf&");
diff --git a/src/memline.c b/src/memline.c
index 119861e5d7..a072746463 100644
--- a/src/memline.c
+++ b/src/memline.c
@@ -4718,7 +4718,7 @@ findswapname(
* MSDOS compatible filesystem, it is possible that the file
* "test.doc.swp" which we create will be exactly the same file. To avoid
* this problem we temporarily create "test.doc". Don't do this when the
- * check below for a 8.3 file name is used.
+ * check below for an 8.3 file name is used.
*/
if (!(buf->b_p_sn || buf->b_shortname) && buf_fname != NULL
&& mch_getperm(buf_fname) < 0)
diff --git a/src/menu.c b/src/menu.c
index 2cd3270fe4..c0a1f3a71e 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -582,7 +582,7 @@ add_menu_path(
goto erret;
}
- // Not already there, so lets add it
+ // N