mirror of
https://github.com/vim/vim
synced 2025-03-30 22:46:45 +02:00
patch 8.1.0528: various typos in comments
Problem: Various typos in comments. Solution: Fix the typos.
This commit is contained in:
parent
f0d58efc9d
commit
c4568ab37e
22 changed files with 47 additions and 45 deletions
|
@ -11,10 +11,10 @@ Contents:
|
|||
|
||||
See INSTALLami.txt for Amiga
|
||||
See INSTALLmac.txt for Macintosh
|
||||
See INSTALLpc.txt for PC (Windows 95/98/NT/XP/Vista/7/8/10)
|
||||
See INSTALLpc.txt for PC (Windows XP/Vista/7/8/10)
|
||||
See INSTALLvms.txt for VMS
|
||||
See INSTALLx.txt for cross-compiling on Unix
|
||||
See ../README_390.txt for OS/390 Unix
|
||||
See ../READMEdir/README_390.txt for z/OS and OS/390 Unix
|
||||
See ../runtime/doc/os_beos.txt for BeBox
|
||||
|
||||
|
||||
|
|
|
@ -8086,7 +8086,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)
|
||||
|
@ -8153,7 +8153,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)
|
||||
|
|
|
@ -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]))
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 */
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -5035,9 +5035,9 @@ mch_call_shell(
|
|||
{
|
||||
/* Use a terminal window to run the command in. */
|
||||
x = mch_call_shell_terminal(cmd, options);
|
||||
#ifdef FEAT_TITLE
|
||||
# ifdef FEAT_TITLE
|
||||
resettitle();
|
||||
#endif
|
||||
# endif
|
||||
return x;
|
||||
}
|
||||
#endif
|
||||
|
@ -7341,7 +7341,7 @@ mch_copy_file_attribute(char_u *from, char_u *to)
|
|||
*/
|
||||
|
||||
/* These magic numbers are from the MS header files */
|
||||
#define MIN_STACK_WINNT 2
|
||||
# define MIN_STACK_WINNT 2
|
||||
|
||||
/*
|
||||
* This function does the same thing as _resetstkoflw(), which is only
|
||||
|
@ -7586,7 +7586,7 @@ fix_arg_enc(void)
|
|||
{
|
||||
int literal = used_file_literal;
|
||||
|
||||
#ifdef FEAT_DIFF
|
||||
# ifdef FEAT_DIFF
|
||||
/* When using diff mode may need to concatenate file name to
|
||||
* directory name. Just like it's done in main(). */
|
||||
if (used_file_diff_mode && mch_isdir(str) && GARGCOUNT > 0
|
||||
|
@ -7601,7 +7601,7 @@ fix_arg_enc(void)
|
|||
str = r;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
# endif
|
||||
/* Re-use the old buffer by renaming it. When not using literal
|
||||
* names it's done by alist_expand() below. */
|
||||
if (used_file_literal)
|
||||
|
@ -7679,9 +7679,9 @@ mch_setenv(char *var, char *value, int x)
|
|||
#endif
|
||||
{
|
||||
_putenv((char *)envbuf);
|
||||
# ifdef libintl_putenv
|
||||
#ifdef libintl_putenv
|
||||
libintl_putenv((char *)envbuf);
|
||||
# endif
|
||||
#endif
|
||||
/* Unlike Un*x systems, we can free the string for _putenv(). */
|
||||
vim_free(envbuf);
|
||||
}
|
||||
|
@ -7742,7 +7742,7 @@ vtp_init(void)
|
|||
fg = (GetRValue(fg) << 16) | (GetGValue(fg) << 8) | GetBValue(fg);
|
||||
default_console_color_bg = bg;
|
||||
default_console_color_fg = fg;
|
||||
#endif
|
||||
# endif
|
||||
|
||||
set_console_color_rgb();
|
||||
}
|
||||
|
|
|
@ -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.
|
||||
*/
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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))
|
||||
|
|
|
@ -54,7 +54,7 @@ What you can use (see test_assert.vim for an example):
|
|||
|
||||
TO ADD A SCREEN DUMP TEST:
|
||||
|
||||
Mostly the same as writing a new style test. Additonally, see help on
|
||||
Mostly the same as writing a new style test. Additionally, see help on
|
||||
"terminal-dumptest". Put the reference dump in "dumps/Test_func_name.dump".
|
||||
|
||||
|
||||
|
|
|
@ -792,6 +792,8 @@ static char *(features[]) =
|
|||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
528,
|
||||
/**/
|
||||
527,
|
||||
/**/
|
||||
|
|
|
@ -1270,7 +1270,7 @@ enum auto_event
|
|||
EVENT_BUFWRITECMD, // write buffer using command
|
||||
EVENT_BUFWRITEPOST, // after writing a buffer
|
||||
EVENT_BUFWRITEPRE, // before writing a buffer
|
||||
EVENT_CMDLINECHANGED, // command line was modified*/
|
||||
EVENT_CMDLINECHANGED, // command line was modified
|
||||
EVENT_CMDLINEENTER, // after entering the command line
|
||||
EVENT_CMDLINELEAVE, // before leaving the command line
|
||||
EVENT_CMDUNDEFINED, // command undefined
|
||||
|
|
Loading…
Add table
Reference in a new issue