diff options
author | Bram Moolenaar <Bram@vim.org> | 2007-05-10 18:25:20 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2007-05-10 18:25:20 +0000 |
commit | ccc18222dd2b40397536703923842f026a6141f0 (patch) | |
tree | 5ebf27663225d11e70f382e51236b9f3f9890ed4 /src | |
parent | 2c7a763832663d5878ff37a58c81fbe95527084a (diff) |
updated for version 7.1b
Diffstat (limited to 'src')
-rw-r--r-- | src/ex_eval.c | 8 | ||||
-rw-r--r-- | src/ex_getln.c | 6 | ||||
-rw-r--r-- | src/gui_photon.c | 8 | ||||
-rw-r--r-- | src/termlib.c | 4 | ||||
-rw-r--r-- | src/version.c | 2 | ||||
-rw-r--r-- | src/version.h | 18 |
6 files changed, 22 insertions, 24 deletions
diff --git a/src/ex_eval.c b/src/ex_eval.c index 441e98dfeb..f0f42d224a 100644 --- a/src/ex_eval.c +++ b/src/ex_eval.c @@ -80,7 +80,7 @@ static void report_pending __ARGS((int action, int pending, void *value)); static int cause_abort = FALSE; /* - * Return TRUE when immdediately aborting on error, or when an interrupt + * Return TRUE when immediately aborting on error, or when an interrupt * occurred or an exception was thrown but not caught. Use for ":{range}call" * to check whether an aborted function that does not handle a range itself * should be called again for the next line in the range. Also used for @@ -2191,9 +2191,9 @@ cleanup_conditionals(cstack, searched_cond, inclusive) break; /* - * When leaving a try conditinal that reset "emsg_silent" on its entry - * after saving the original value, restore that value here and free the - * memory used to store it. + * When leaving a try conditional that reset "emsg_silent" on its + * entry after saving the original value, restore that value here and + * free the memory used to store it. */ if ((cstack->cs_flags[idx] & CSF_TRY) && (cstack->cs_flags[idx] & CSF_SILENT)) diff --git a/src/ex_getln.c b/src/ex_getln.c index a7de0503e2..b1afab55bc 100644 --- a/src/ex_getln.c +++ b/src/ex_getln.c @@ -2849,7 +2849,7 @@ save_cmdline(ccp) } /* - * Resture ccline after it has been saved with save_cmdline(). + * Restore ccline after it has been saved with save_cmdline(). */ static void restore_cmdline(ccp) @@ -3039,7 +3039,7 @@ cmdline_del(from) #endif /* - * this fuction is called when the screen size changes and with incremental + * this function is called when the screen size changes and with incremental * search */ void @@ -6026,7 +6026,7 @@ ex_window() apply_autocmds(EVENT_CMDWINLEAVE, typestr, typestr, FALSE, curbuf); # endif - /* Restore the comand line info. */ + /* Restore the command line info. */ ccline = save_ccline; cmdwin_type = 0; diff --git a/src/gui_photon.c b/src/gui_photon.c index 3408ba6e7f..a8ee1c4098 100644 --- a/src/gui_photon.c +++ b/src/gui_photon.c @@ -288,7 +288,7 @@ gui_ph_handle_menu_resize( height = sizes->new_dim.h; - /* Because vim treats the toolbar and menubar separatly, + /* Because vim treats the toolbar and menubar separately, * and here they're lumped together into a PtToolbarGroup, * we only need either menu_height or toolbar_height set at once */ if( gui.menu_is_active ) @@ -740,7 +740,7 @@ gui_ph_handle_raw_draw( PtWidget_t *widget, PhTile_t *damage ) #if 0 /* - * This causes some wierd probems, with drawing being done from + * This causes some weird problems, with drawing being done from * within this raw drawing function (rather than just simple clearing * and text drawing done by gui_redraw) * @@ -1116,7 +1116,7 @@ gui_mch_init(void) PtArg_t args[10]; int flags = 0, n = 0; - PhDim_t window_size = {100, 100}; /* Abitrary values */ + PhDim_t window_size = {100, 100}; /* Arbitrary values */ PhPoint_t pos = {0, 0}; gui.event_buffer = (PhEvent_t *) alloc( EVENT_BUFFER_SIZE ); @@ -1978,7 +1978,7 @@ hex_digit(int c) /* - * This should be split out into a seperate file, + * This should be split out into a separate file, * every port does basically the same thing. * * This is the gui_w32.c version (i think..) diff --git a/src/termlib.c b/src/termlib.c index a0036c64b7..2091115d77 100644 --- a/src/termlib.c +++ b/src/termlib.c @@ -8,7 +8,7 @@ /* Modified by Bram Moolenaar for use with VIM - Vi Improved. */ /* A few bugs removed by Olaf 'Rhialto' Seibert. */ -/* TERMLIB: Terminal independant database. */ +/* TERMLIB: Terminal independent database. */ #include "vim.h" #include "termlib.pro" @@ -155,7 +155,7 @@ getent(tbuf, term, termcap, buflen) { char *nexttptr; - while (*tptr == '|') /* | seperates names */ + while (*tptr == '|') /* | separates names */ tptr++; nexttptr = _find(tptr, ":|"); /* Rhialto */ if (tptr + tlen == nexttptr && diff --git a/src/version.c b/src/version.c index c0f9b4b693..ddee2077e2 100644 --- a/src/version.c +++ b/src/version.c @@ -667,8 +667,6 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ - 1, -/**/ 0 }; diff --git a/src/version.h b/src/version.h index 97500d08c3..4400863749 100644 --- a/src/version.h +++ b/src/version.h @@ -10,7 +10,7 @@ * Define the version number, name, etc. * The patchlevel is in included_patches[], in version.c. * - * This doesn't use string contatenation, some compilers don't support it. + * This doesn't use string concatenation, some compilers don't support it. */ #define VIM_VERSION_MAJOR 7 @@ -19,9 +19,9 @@ #define VIM_VERSION_MINOR_STR "1" #define VIM_VERSION_100 (VIM_VERSION_MAJOR * 100 + VIM_VERSION_MINOR) -#define VIM_VERSION_BUILD 263 -#define VIM_VERSION_BUILD_BCD 0x107 -#define VIM_VERSION_BUILD_STR "263" +#define VIM_VERSION_BUILD 264 +#define VIM_VERSION_BUILD_BCD 0x108 +#define VIM_VERSION_BUILD_STR "264" #define VIM_VERSION_PATCHLEVEL 0 #define VIM_VERSION_PATCHLEVEL_STR "0" /* Used by MacOS port should be one of: development, alpha, beta, final */ @@ -33,8 +33,8 @@ * VIM_VERSION_MEDIUM is used for the startup-screen. * VIM_VERSION_LONG is used for the ":version" command and "Vim -h". */ -#define VIM_VERSION_NODOT "vim71a" -#define VIM_VERSION_SHORT "7.1a" -#define VIM_VERSION_MEDIUM "7.1a BETA" -#define VIM_VERSION_LONG "VIM - Vi IMproved 7.1a BETA (2007 May 5)" -#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.1a BETA (2007 May 5, compiled " +#define VIM_VERSION_NODOT "vim71b" +#define VIM_VERSION_SHORT "7.1b" +#define VIM_VERSION_MEDIUM "7.1b BETA" +#define VIM_VERSION_LONG "VIM - Vi IMproved 7.1b BETA (2007 May 10)" +#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.1b BETA (2007 May 10, compiled " |