summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-09-29 16:27:47 +0200
committerBram Moolenaar <Bram@vim.org>2013-09-29 16:27:47 +0200
commit386dcde30d677c26a596cf7479f8dd9ee498978b (patch)
tree7bf2df823936a384c65035de9390a5ad30625cd0
parent7a18fdc8a4d3c1408f54074ff9268735a277093a (diff)
downloadvim-git-386dcde30d677c26a596cf7479f8dd9ee498978b.tar.gz
updated for version 7.4.043v7.4.043
Problem: VMS can't handle long function names. Solution: Shorten may_req_ambiguous_character_width. (Samuel Ferencik)
-rw-r--r--src/main.c2
-rw-r--r--src/proto/term.pro2
-rw-r--r--src/term.c2
-rw-r--r--src/version.c2
4 files changed, 5 insertions, 3 deletions
diff --git a/src/main.c b/src/main.c
index 7d01a232b..04077957c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -812,7 +812,7 @@ vim_main2(int argc UNUSED, char **argv UNUSED)
starttermcap(); /* start termcap if not done by wait_return() */
TIME_MSG("start termcap");
#if defined(FEAT_TERMRESPONSE) && defined(FEAT_MBYTE)
- may_req_ambiguous_character_width();
+ may_req_ambiguous_char_width();
#endif
#ifdef FEAT_MOUSE
diff --git a/src/proto/term.pro b/src/proto/term.pro
index 25d9b96a0..b3d0df39d 100644
--- a/src/proto/term.pro
+++ b/src/proto/term.pro
@@ -35,7 +35,7 @@ void settmode __ARGS((int tmode));
void starttermcap __ARGS((void));
void stoptermcap __ARGS((void));
void may_req_termresponse __ARGS((void));
-void may_req_ambiguous_character_width __ARGS((void));
+void may_req_ambiguous_char_width __ARGS((void));
int swapping_screen __ARGS((void));
void setmouse __ARGS((void));
int mouse_has __ARGS((int c));
diff --git a/src/term.c b/src/term.c
index d4e4e0d9a..763f8e782 100644
--- a/src/term.c
+++ b/src/term.c
@@ -3356,7 +3356,7 @@ may_req_termresponse()
* it must be called immediately after entering termcap mode.
*/
void
-may_req_ambiguous_character_width()
+may_req_ambiguous_char_width()
{
if (u7_status == U7_GET
&& cur_tmode == TMODE_RAW
diff --git a/src/version.c b/src/version.c
index 74a3e7276..1411943b5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 43,
+/**/
42,
/**/
41,