summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2007-05-10 17:44:18 +0000
committerBram Moolenaar <Bram@vim.org>2007-05-10 17:44:18 +0000
commit3d27a45f9a536be76175d5a6c4d0d9ed552f8ebb (patch)
tree2b16c46af3e6269ce446fae70131a1afb1b80a8a /src
parent044b68f42a945cdccb357ee6bb67d719ba532cd4 (diff)
downloadvim-git-3d27a45f9a536be76175d5a6c4d0d9ed552f8ebb.tar.gz
updated for version 7.1b
Diffstat (limited to 'src')
-rw-r--r--src/VisVim/DSAddIn.cpp2
-rw-r--r--src/feature.h4
-rw-r--r--src/os_unix.c2
-rw-r--r--src/os_unix.h2
-rw-r--r--src/tag.c6
5 files changed, 8 insertions, 8 deletions
diff --git a/src/VisVim/DSAddIn.cpp b/src/VisVim/DSAddIn.cpp
index 3e7254461..b16361b90 100644
--- a/src/VisVim/DSAddIn.cpp
+++ b/src/VisVim/DSAddIn.cpp
@@ -93,7 +93,7 @@ STDMETHODIMP CDSAddIn::OnDisconnection (VARIANT_BOOL bLastTime)
// Add a command to DevStudio
// Creates a toolbar button for the command also.
-// 'MethodName' is the name of the methode specified in the .odl file
+// 'MethodName' is the name of the method specified in the .odl file
// 'StrResId' the resource id of the descriptive string
// 'GlyphIndex' the image index into the command buttons bitmap
// Return true on success
diff --git a/src/feature.h b/src/feature.h
index 00dd014b8..aa694e66e 100644
--- a/src/feature.h
+++ b/src/feature.h
@@ -1096,7 +1096,7 @@
/*
* +termresponse send t_RV to obtain terminal response. Used for xterm
* to check if mouse dragging can be used and if term
- * codes can be obtaind.
+ * codes can be obtained.
*/
#if (defined(FEAT_NORMAL) || defined(FEAT_MOUSE)) && defined(HAVE_TGETENT)
# define FEAT_TERMRESPONSE
@@ -1155,7 +1155,7 @@
* +python Python interface: "--enable-pythoninterp"
* +tcl TCL interface: "--enable-tclinterp"
* +sniff Sniff interface: "--enable-sniff"
- * +sun_workshop Sun Workshop integegration
+ * +sun_workshop Sun Workshop integration
* +netbeans_intg Netbeans integration
*/
diff --git a/src/os_unix.c b/src/os_unix.c
index beeea3f9c..2d512b730 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -490,7 +490,7 @@ mch_total_mem(special)
/* avoid overflow as much as possible */
while (shiftright > 0 && (pagesize & 1) == 0)
{
- pagesize = pagesize >> 1;
+ pagesize = (long_u)pagesize >> 1;
--shiftright;
}
mem = (long_u)pagesize * pagecount;
diff --git a/src/os_unix.h b/src/os_unix.h
index 821462cd5..d99d1c8d3 100644
--- a/src/os_unix.h
+++ b/src/os_unix.h
@@ -483,7 +483,7 @@ int mch_rename __ARGS((const char *src, const char *dest));
# endif
# ifndef VMS
# ifdef __MVS__
- /* on OS390 Unix getenv() doesn't return a pointer to persistant
+ /* on OS390 Unix getenv() doesn't return a pointer to persistent
* storage -> use __getenv() */
# define mch_getenv(x) (char_u *)__getenv((char *)(x))
# else
diff --git a/src/tag.c b/src/tag.c
index aa1ab755e..d46239ca1 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -383,7 +383,7 @@ do_tag(tag, type, count, forceit, verbose)
/*
* Beyond the last one, just give an error message and
* go to the last one. Don't store the cursor
- * postition.
+ * position.
*/
tagstackidx = tagstacklen - 1;
EMSG(_(topmsg));
@@ -1330,7 +1330,7 @@ find_tags(pat, num_matches, matchesp, flags, mincount, buf_ffname)
} incstack[INCSTACK_SIZE];
int incstack_idx = 0; /* index in incstack */
- char_u *ebuf; /* aditional buffer for etag fname */
+ char_u *ebuf; /* additional buffer for etag fname */
int is_etag; /* current file is emaces style */
#endif
@@ -2812,7 +2812,7 @@ parse_tag_line(lbuf,
*
* Static tags produced by the older ctags program have the format:
* 'file:tag file /pattern'.
- * This is only recognized when both occurences of 'file' are the same, to
+ * This is only recognized when both occurrence of 'file' are the same, to
* avoid recognizing "string::string" or ":exit".
*
* Static tags produced by the new ctags program have the format: