Hi,
please find attached a patch file fixing some typos that I found in
documentation and source files (comments).
I also have some patches (fixing it's => its) for several plugins etc.
that I sent to their maintainers. Some are bouncing, I will try to
find alternative addresses for these people. If they keep failing, can
I send the patches directly to the list?
Christ van Willegen
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
diff --git a/runtime/autoload/dist/ft.vim b/runtime/autoload/dist/ft.vim
index 160cdcff6..973d3b028 100644
--- a/runtime/autoload/dist/ft.vim
+++ b/runtime/autoload/dist/ft.vim
@@ -126,7 +126,7 @@ endfunc
" This function checks if one of the first ten lines start with a '@'. In
" that case it is probably a change file.
" If the first line starts with # or ! it's probably a ch file.
-" If a line has "main", "include", "//" ir "/*" it's probably ch.
+" If a line has "main", "include", "//" or "/*" it's probably ch.
" Otherwise CHILL is assumed.
func dist#ft#FTchange()
let lnum = 1
diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt
index a79bf4b08..d6b0242d2 100644
--- a/runtime/doc/change.txt
+++ b/runtime/doc/change.txt
@@ -850,7 +850,7 @@ the |substitute()| function with the following exceptions:
- magic is always set without regard to 'magic'.
- A ~ inserts a tilde literally.
- <CR> and \r inserts a carriage-return (CTRL-M).
- - \<CR> does not have a special meaning. it's just one of \x.
+ - \<CR> does not have a special meaning. It's just one of \x.
Examples: >
:s/a\|b/xxx\0xxx/g modifies "a b" to "xxxaxxx xxxbxxx"
diff --git a/runtime/indent/html.vim b/runtime/indent/html.vim
index 6c866594c..bece6614b 100644
--- a/runtime/indent/html.vim
+++ b/runtime/indent/html.vim
@@ -625,7 +625,7 @@ func! s:CSSIndent()
return eval(b:hi_css1indent)
endif
- " If the current line starts with "}" align with it's match.
+ " If the current line starts with "}" align with its match.
if curtext =~ '^\s*}'
call cursor(v:lnum, 1)
try
diff --git a/runtime/macros/life/life.vim b/runtime/macros/life/life.vim
index 552a49301..4c7e5ca46 100644
--- a/runtime/macros/life/life.vim
+++ b/runtime/macros/life/life.vim
@@ -138,7 +138,7 @@ map ,Id1 o# X .`a22lr
map ,Il0 o#XX .`a22lr
map ,Id0 o# .`a22lr
"
-" Patterns used to replace a germ with it's next generation
+" Patterns used to replace a germ with its next generation
map ,Iaa o=AB =BC =CD =DE =EF =FG =GH =HI =IJ =JK =KL =LM =MN =NO =OP =PQ =QR
map ,Iab o=RS =ST =TU =UV =VW =WX =XY =YZ =Z
"
@@ -232,7 +232,7 @@ map ,m p
" Delete the character under the cursor
map ,n x
"
-" Replace a character by it's next, A --> B, B --> C, etc.
+" Replace a character by its next, A --> B, B --> C, etc.
map ,a `a,jGi?=,ma
0,dll,j`a21l,ml,nh
"
" ----- END of Work out one germ -----
diff --git a/runtime/tools/ccfilter.1 b/runtime/tools/ccfilter.1
index e3de38da1..92fe624dc 100644
--- a/runtime/tools/ccfilter.1
+++ b/runtime/tools/ccfilter.1
@@ -23,7 +23,7 @@ line 2), which makes it impossible for the errorformat to correctly
display them !
When working on different platforms, and with different compilers,
-ccfilter eases the utilization of quickfix, due to it's standardized
+ccfilter eases the utilization of quickfix, due to its standardized
output, allowing to have in .vimrc a plain
.br
.B \ \ \ \ :set\ errorformat=%f:%l:%c:%t:%m
diff --git a/src/diff.c b/src/diff.c
index 054924e67..e07e811be 100644
--- a/src/diff.c
+++ b/src/diff.c
@@ -2850,7 +2850,7 @@ theend:
if (diff_need_update)
ex_diffupdate(NULL);
- // Check that the cursor is on a valid character and update it's
+ // Check that the cursor is on a valid character and update its
// position. When there were filler lines the topline has become
// invalid.
check_cursor();
diff --git a/src/edit.c b/src/edit.c
index 4b9bdffb4..f654fc2cc 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -2408,7 +2408,7 @@ has_compl_option(int dict_opt)
int
vim_is_ctrl_x_key(int c)
{
- /* Always allow ^R - let it's results then be checked */
+ /* Always allow ^R - let its results then be checked */
if (c == Ctrl_R)
return TRUE;
diff --git a/src/fileio.c b/src/fileio.c
index 90f8517db..7a5f07c90 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -8085,7 +8085,7 @@ aubuflocal_remove(buf_T *buf)
/*
* Add an autocmd group name.
- * Return it's ID. Returns AUGROUP_ERROR (< 0) for error.
+ * Return its ID. Returns AUGROUP_ERROR (< 0) for error.
*/
static int
au_new_group(char_u *name)
@@ -8152,7 +8152,7 @@ au_del_group(char_u *name)
/*
* Find the ID of an autocmd group name.
- * Return it's ID. Returns AUGROUP_ERROR (< 0) for error.
+ * Return its ID. Returns AUGROUP_ERROR (< 0) for error.
*/
static int
au_find_group(char_u *name)
diff --git a/src/gui.c b/src/gui.c
index 1341d505d..6154b48de 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -5501,7 +5501,7 @@ gui_handle_drop(
p = NULL;
/* Handle the drop, :edit or :split to get to the file. This also
- * frees fnames[]. Skip this if there is only one item it's a
+ * frees fnames[]. Skip this if there is only one item, it's a
* directory and Shift is held down. */
if (count == 1 && (modifiers & MOUSE_SHIFT) != 0
&& mch_isdir(fnames[0]))
diff --git a/src/gui_athena.c b/src/gui_athena.c
index 155509d1f..3620e65c9 100644
--- a/src/gui_athena.c
+++ b/src/gui_athena.c
@@ -900,7 +900,7 @@ gui_athena_menu_font(Widget id)
{
XtUnmanageChild(id);
XtVaSetValues(id, XtNfontSet, gui.menu_fontset, NULL);
- /* We should force the widget to recalculate it's
+ /* We should force the widget to recalculate its
* geometry now. */
XtManageChild(id);
}
@@ -929,7 +929,7 @@ gui_athena_menu_font(Widget id)
if (has_submenu(id))
XtVaSetValues(id, XtNrightBitmap, pullerBitmap, NULL);
- /* Force the widget to recalculate it's geometry now. */
+ /* Force the widget to recalculate its geometry now. */
if (managed)
XtManageChild(id);
}
@@ -989,7 +989,7 @@ gui_mch_new_menu_font(void)
}
}
/* Now, to simulate the window being resized. Only, this
- * will resize the window to it's current state.
+ * will resize the window to its current state.
*
* There has to be a better way, but I do not see one at this time.
* (David Harrison)
@@ -1071,7 +1071,7 @@ gui_mch_submenu_change(
}
# ifdef FEAT_BEVAL_GUI
- /* If we have a tooltip, then we need to change it's colors */
+ /* If we have a tooltip, then we need to change its colors */
if (mp->tip != NULL)
{
Arg args[2];
@@ -1089,7 +1089,7 @@ gui_mch_submenu_change(
{
gui_athena_menu_font(mp->id);
#ifdef FEAT_BEVAL_GUI
- /* If we have a tooltip, then we need to change it's font */
+ /* If we have a tooltip, then we need to change its font */
/* Assume XtNinternational == True (in createBalloonEvalWindow)
*/
if (mp->tip != NULL)
@@ -1552,7 +1552,7 @@ gui_mch_destroy_menu(vimmenu_T *menu)
* This is a hack to stop the Athena simpleMenuWidget from getting a
* BadValue error when a menu's last child is destroyed. We check to
* see if this is the last child and if so, don't delete it. The parent
- * will be deleted soon anyway, and it will delete it's children like
+ * will be deleted soon anyway, and it will delete its children like
* all good widgets do.
*/
/* NOTE: The cause of the BadValue X Protocol Error is because when the
diff --git a/src/gui_gtk.c b/src/gui_gtk.c
index 40b3db65e..3d0893484 100644
--- a/src/gui_gtk.c
+++ b/src/gui_gtk.c
@@ -925,7 +925,7 @@ gui_mch_destroy_menu(vimmenu_T *menu)
g_object_ref(menu->id);
/* Workaround for a spurious gtk warning in Ubuntu: "Trying to remove
- * a child that doesn't believe we're it's parent."
+ * a child that doesn't believe we're its parent."
* Remove widget from gui.menubar before destroying it. */
if (menu->id != NULL && gui.menubar != NULL
&& gtk_widget_get_parent(menu->id) == gui.menubar)
diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index 291d93c53..dbddb0ffb 100644
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -4284,7 +4284,7 @@ mainwin_destroy_cb(GObject *object UNUSED, gpointer data UNUSED)
* hints (and thus the required size from -geom), but that after that we
* put the hints back to normal (the actual minimum size) so we may
* subsequently be resized smaller. GtkSocket (the parent end) uses the
- * plug's window 'min hints to set *it's* minimum size, but that's also the
+ * plug's window 'min hints to set *its* minimum size, but that's also the
* only way we have of making ourselves bigger (by set lines/columns).
* Thus set hints at start-up to ensure correct init. size, then a
* second after the final attempt to reset the real minimum hints (done by
diff --git a/src/gui_mac.c b/src/gui_mac.c
index aa093a334..96f04c55a 100644
--- a/src/gui_mac.c
+++ b/src/gui_mac.c
@@ -2278,7 +2278,7 @@ gui_mac_doKeyEvent(EventRecord *theEvent)
if (p_mh)
ObscureCursor();
- /* Get the key code and it's ASCII representation */
+ /* Get the key code and its ASCII representation */
key_sym = ((theEvent->message & keyCodeMask) >> 8);
key_char = theEvent->message & charCodeMask;
num = 1;
@@ -2597,7 +2597,7 @@ gui_mac_mouse_wheel(EventHandlerCallRef nextHandler, EventRef theEvent,
bail:
/*
* when we fail give any additional callback handler a chance to perform
- * it's actions
+ * its actions
*/
return CallNextEventHandler(nextHandler, theEvent);
}
diff --git a/src/gui_motif.c b/src/gui_motif.c
index da97f1f49..8467c529d 100644
--- a/src/gui_motif.c
+++ b/src/gui_motif.c
@@ -1114,7 +1114,7 @@ gui_mch_compute_menu_height(
XtManageChild(id);
/*
- * Now find the menu item that is the furthest down, and get it's position.
+ * Now find the menu item that is the furthest down, and get its position.
*/
maxy = 0;
for (mp = root_menu; mp != NULL; mp = mp->next)
@@ -1550,7 +1550,7 @@ submenu_change(
XtSetValues(mp->id, args, n);
}
# ifdef FEAT_BEVAL_GUI
- /* If we have a tooltip, then we need to change it's font */
+ /* If we have a tooltip, then we need to change its font */
if (mp->tip != NULL)
{
Arg args[2];
@@ -1568,7 +1568,7 @@ submenu_change(
{
gui_motif_menu_fontlist(mp->id);
#ifdef FEAT_BEVAL_GUI
- /* If we have a tooltip, then we need to change it's font */
+ /* If we have a tooltip, then we need to change its font */
if (mp->tip != NULL)
{
Arg args[1];
@@ -2089,7 +2089,7 @@ set_fontlist(Widget id)
{
XtUnmanageChild(id);
XtVaSetValues(id, XmNfontList, fl, NULL);
- /* We should force the widget to recalculate it's
+ /* We should force the widget to recalculate its
* geometry now. */
XtManageChild(id);
}
@@ -2108,7 +2108,7 @@ set_fontlist(Widget id)
{
XtUnmanageChild(id);
XtVaSetValues(id, XmNfontList, fl, NULL);
- /* We should force the widget to recalculate it's
+ /* We should force the widget to recalculate its
* geometry now. */
XtManageChild(id);
}
@@ -3407,7 +3407,7 @@ gui_motif_menu_fontlist(Widget id UNUSED)
{
XtUnmanageChild(id);
XtVaSetValues(id, XmNfontList, fl, NULL);
- /* We should force the widget to recalculate it's
+ /* We should force the widget to recalculate its
* geometry now. */
XtManageChild(id);
}
@@ -3428,7 +3428,7 @@ gui_motif_menu_fontlist(Widget id UNUSED)
{
XtUnmanageChild(id);
XtVaSetValues(id, XmNfontList, fl, NULL);
- /* We should force the widget to recalculate it's
+ /* We should force the widget to recalculate its
* geometry now. */
XtManageChild(id);
}
diff --git a/src/gui_w32.c b/src/gui_w32.c
index 95fe0cbd6..0db57acc9 100644
--- a/src/gui_w32.c
+++ b/src/gui_w32.c
@@ -5658,7 +5658,7 @@ get_work_area(RECT *spi_rect)
HMONITOR mon;
MONITORINFO moninfo;
- /* work out which monitor the window is on, and get *it's* work area */
+ /* work out which monitor the window is on, and get *its* work area */
mon = MonitorFromWindow(s_hwnd, MONITOR_DEFAULTTOPRIMARY);
if (mon != NULL)
{
diff --git a/src/gui_xmebw.c b/src/gui_xmebw.c
index 9ea020f91..b09b1e64c 100644
--- a/src/gui_xmebw.c
+++ b/src/gui_xmebw.c
@@ -50,7 +50,7 @@
* implementation. Also missing in Motif 1.2 and earlier.
*
* We neither use XmeGetPixmapData or _XmGetPixmapData, since with LessTif the
- * pixmap will not appear in it's caches properly. We cache the interesting
+ * pixmap will not appear in its caches properly. We cache the interesting
* values in XmEnhancedButtonPart instead ourself.
*/
#if defined(LESSTIF_VERSION) || (XmVersion <= 1002)
diff --git a/src/if_tcl.c b/src/if_tcl.c
index 228936554..7fb917482 100644
--- a/src/if_tcl.c
+++ b/src/if_tcl.c
@@ -113,7 +113,7 @@ static tcl_info tclinfo = { NULL, 0, 0, 0, 0, NULL, NULL };
/*
* List of Tcl interpreters who reference a vim window or buffer.
- * Each buffer and window has it's own list in the w_tcl_ref or b_tcl_ref
+ * Each buffer and window has its own list in the w_tcl_ref or b_tcl_ref
* struct member. We need this because Tcl can create sub-interpreters with
* the "interp" command, and each interpreter can reference all windows and
* buffers.
diff --git a/src/macros.h b/src/macros.h
index 1654e3e55..e651d2b12 100644
--- a/src/macros.h
+++ b/src/macros.h
@@ -192,7 +192,7 @@
# define mch_access(n, p) access((n), (p))
# endif
# define mch_fstat(n, p) fstat((n), (p))
-# ifdef MSWIN /* has it's own mch_stat() function */
+# ifdef MSWIN /* has its own mch_stat() function */
# define mch_stat(n, p) vim_stat((n), (p))
# else
# ifdef STAT_IGNORES_SLASH
diff --git a/src/os_amiga.c b/src/os_amiga.c
index 767cbfaf3..7623f8220 100644
--- a/src/os_amiga.c
+++ b/src/os_amiga.c
@@ -941,7 +941,7 @@ mch_exit(int r)
* getch() will return immediately rather than wait for a return. You
* lose editing features though.
*
- * Cooked: This function returns the designate file pointer to it's normal,
+ * Cooked: This function returns the designate file pointer to its normal,
* wait for a <CR> mode. This is exactly like raw() except that
* it sends a 0 to the console to make it back into a CON: from a RAW:
*/
@@ -1387,7 +1387,7 @@ mch_breakcheck(int force)
got_int = TRUE;
}
-/* this routine causes manx to use this Chk_Abort() rather than it's own */
+/* this routine causes manx to use this Chk_Abort() rather than its own */
/* otherwise it resets our ^C when doing any I/O (even when Enable_Abort */
/* is zero). Since we want to check for our own ^C's */
diff --git a/src/os_vms_fix.com b/src/os_vms_fix.com
index 8355a352d..5dd4d2ba7 100644
--- a/src/os_vms_fix.com
+++ b/src/os_vms_fix.com
@@ -15,7 +15,7 @@ $! and call/subroutine/endsubroutine constructs, because I can still
$! remember when DCL didn't have them, and I wanted this to be as
$! portable as possible, so... If you want to structure it nicer for
$! your own use, please feel free to do so. However, please only
-$! distribute it in it's original form.
+$! distribute it in its original form.
$!
$! I wrote it in DCL for portability and ease of use - a C version
$! would definitely run faster, but then I'd have to deal with compiler
diff --git a/src/screen.c b/src/screen.c
index 69f755844..1cf90ee05 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -6223,7 +6223,7 @@ screen_line(
* first highlighted character. The stop-highlighting code must
* be written with the cursor just after the last highlighted
* character.
- * Overwriting a character doesn't remove it's highlighting. Need
+ * Overwriting a character doesn't remove its highlighting. Need
* to clear the rest of the line, and force redrawing it
* completely.
*/
diff --git a/src/search.c b/src/search.c
index dff532d8f..98665f795 100644
--- a/src/search.c
+++ b/src/search.c
@@ -357,9 +357,9 @@ free_search_patterns(void)
* Save and restore the search pattern for incremental highlight search
* feature.
*
- * It's similar but differnt from save_search_patterns() and
+ * It's similar to but different from save_search_patterns() and
* restore_search_patterns(), because the search pattern must be restored when
- * cannceling incremental searching even if it's called inside user functions.
+ * canceling incremental searching even if it's called inside user functions.
*/
void
save_last_search_pattern(void)
@@ -2869,7 +2869,7 @@ findpar(
}
#endif
- /* POSIX has it's own ideas of what a paragraph boundary is and it
+ /* POSIX has its own ideas of what a paragraph boundary is and it
* doesn't match historical Vi: It also stops at a "{" in the
* first column and at an empty line. */
if (!first && did_skip && (startPS(curr, what, both)
diff --git a/src/spell.c b/src/spell.c
index 6fc0601b7..1ca1f9eb2 100644
--- a/src/spell.c
+++ b/src/spell.c
@@ -2686,7 +2686,7 @@ use_midword(slang_T *lp, win_T *wp)
/*
* Find the region "region[2]" in "rp" (points to "sl_regions").
- * Each region is simply stored as the two characters of it's name.
+ * Each region is simply stored as the two characters of its name.
* Returns the index if found (first is 0), REGION_ALL if not found.
*/
static int
diff --git a/src/spellfile.c b/src/spellfile.c
index 71447087f..27b9e858e 100644
--- a/src/spellfile.c
+++ b/src/spellfile.c
@@ -3784,7 +3784,7 @@ get_pfxlist(
if (get_affitem(affile->af_flagtype, &p) != 0)
{
/* A flag is a postponed prefix flag if it appears in "af_pref"
- * and it's ID is not zero. */
+ * and its ID is not zero. */
vim_strncpy(key, prevp, p - prevp);
hi = hash_find(&affile->af_pref, key);
if (!HASHITEM_EMPTY(hi))
diff --git a/src/syntax.c b/src/syntax.c
index e00746ec0..3ab2a30b8 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -352,7 +352,7 @@ static reg_extmatch_T *next_match_extmatch = NULL;
/*
* A state stack is an array of integers or stateitem_T, stored in a
- * garray_T. A state stack is invalid if it's itemsize entry is zero.
+ * garray_T. A state stack is invalid if its itemsize entry is zero.
*/
#define INVALID_STATE(ssp) ((ssp)->ga_itemsize == 0)
#define VALID_STATE(ssp) ((ssp)->ga_itemsize != 0)
