To: vim-dev@vim.org

Subject: Patch 7.0.070

Fcc: outbox

From: Bram Moolenaar <Bram@moolenaar.net>

Mime-Version: 1.0

Content-Type: text/plain; charset=ISO-8859-1

Content-Transfer-Encoding: 8bit

------------

Patch 7.0.070

Problem:    Compiler warnings for shadowed variables and uninitialized

	    variables.

Solution:   Rename variables such as "index", "msg" and "dup".  Initialize

	    variables.

Files:	    src/edit.c, src/eval.c, src/ex_cmds.c, src/ex_cmds2.c,

	    src/ex_docmd.c, src/gui_beval.c, src/gui_gtk.c, src/gui_gtk_x11.c,

	    src/hardcopy.c, src/if_cscope.c, src/main.c, src/mbyte.c,

	    src/memline.c, src/netbeans.c, src/normal.c, src/option.c,

	    src/os_unix.c, src/quickfix.c, src/regexp.c, src/screen.c,

	    src/search.c, src/spell.c, src/ui.c, src/undo.c, src/window.c,

	    src/version.c

*** ../vim-7.0.069/src/edit.c	Tue Aug 29 16:33:23 2006

--- src/edit.c	Tue Aug 29 14:57:46 2006

***************

*** 129,135 ****

  static void ins_ctrl_x __ARGS((void));

  static int  has_compl_option __ARGS((int dict_opt));

! static int ins_compl_add __ARGS((char_u *str, int len, int icase, char_u *fname, char_u **cptext, int cdir, int flags, int dup));

  static int  ins_compl_equal __ARGS((compl_T *match, char_u *str, int len));

  static void ins_compl_longest_match __ARGS((compl_T *match));

  static void ins_compl_add_matches __ARGS((int num_matches, char_u **matches, int icase));

--- 129,135 ----

  static void ins_ctrl_x __ARGS((void));

  static int  has_compl_option __ARGS((int dict_opt));

! static int ins_compl_add __ARGS((char_u *str, int len, int icase, char_u *fname, char_u **cptext, int cdir, int flags, int adup));

  static int  ins_compl_equal __ARGS((compl_T *match, char_u *str, int len));

  static void ins_compl_longest_match __ARGS((compl_T *match));

  static void ins_compl_add_matches __ARGS((int num_matches, char_u **matches, int icase));

***************

*** 2118,2124 ****

   * maybe because alloc() returns NULL, then FAIL is returned.

   */

      static int

! ins_compl_add(str, len, icase, fname, cptext, cdir, flags, dup)

      char_u	*str;

      int		len;

      int		icase;

--- 2118,2124 ----

   * maybe because alloc() returns NULL, then FAIL is returned.

   */

      static int

! ins_compl_add(str, len, icase, fname, cptext, cdir, flags, adup)

      char_u	*str;

      int		len;

      int		icase;

***************

*** 2126,2132 ****

      char_u	**cptext;   /* extra text for popup menu or NULL */

      int		cdir;

      int		flags;

!     int		dup;	    /* accept duplicate match */

  {

      compl_T	*match;

      int		dir = (cdir == 0 ? compl_direction : cdir);

--- 2126,2132 ----

      char_u	**cptext;   /* extra text for popup menu or NULL */

      int		cdir;

      int		flags;

!     int		adup;	    /* accept duplicate match */

  {

      compl_T	*match;

      int		dir = (cdir == 0 ? compl_direction : cdir);

***************

*** 2140,2146 ****

      /*

       * If the same match is already present, don't add it.

       */

!     if (compl_first_match != NULL && !dup)

      {

  	match = compl_first_match;

  	do

--- 2140,2146 ----

      /*

       * If the same match is already present, don't add it.

       */

!     if (compl_first_match != NULL && !adup)

      {

  	match = compl_first_match;

  	do

***************

*** 3608,3614 ****

  {

      char_u	*word;

      int		icase = FALSE;

!     int		dup = FALSE;

      char_u	*(cptext[CPT_COUNT]);

      if (tv->v_type == VAR_DICT && tv->vval.v_dict != NULL)

--- 3608,3614 ----

  {

      char_u	*word;

      int		icase = FALSE;

!     int		adup = FALSE;

      char_u	*(cptext[CPT_COUNT]);

      if (tv->v_type == VAR_DICT && tv->vval.v_dict != NULL)

***************

*** 3625,3631 ****

  	if (get_dict_string(tv->vval.v_dict, (char_u *)"icase", FALSE) != NULL)

  	    icase = get_dict_number(tv->vval.v_dict, (char_u *)"icase");

  	if (get_dict_string(tv->vval.v_dict, (char_u *)"dup", FALSE) != NULL)

! 	    dup = get_dict_number(tv->vval.v_dict, (char_u *)"dup");

      }

      else

      {

--- 3625,3631 ----

  	if (get_dict_string(tv->vval.v_dict, (char_u *)"icase", FALSE) != NULL)

  	    icase = get_dict_number(tv->vval.v_dict, (char_u *)"icase");

  	if (get_dict_string(tv->vval.v_dict, (char_u *)"dup", FALSE) != NULL)

! 	    adup = get_dict_number(tv->vval.v_dict, (char_u *)"dup");

      }

      else

      {

***************

*** 3634,3640 ****

      }

      if (word == NULL || *word == NUL)

  	return FAIL;

!     return ins_compl_add(word, -1, icase, NULL, cptext, dir, 0, dup);

  }

  #endif

--- 3634,3640 ----

      }

      if (word == NULL || *word == NUL)

  	return FAIL;

!     return ins_compl_add(word, -1, icase, NULL, cptext, dir, 0, adup);

  }

  #endif

*** ../vim-7.0.069/src/eval.c	Wed Aug 16 22:03:35 2006

--- src/eval.c	Thu Aug 24 22:00:09 2006

***************

*** 454,460 ****

  static char_u *deref_func_name __ARGS((char_u *name, int *lenp));

  static int get_func_tv __ARGS((char_u *name, int len, typval_T *rettv, char_u **arg, linenr_T firstline, linenr_T lastline, int *doesrange, int evaluate, dict_T *selfdict));

  static int call_func __ARGS((char_u *name, int len, typval_T *rettv, int argcount, typval_T *argvars, linenr_T firstline, linenr_T lastline, int *doesrange, int evaluate, dict_T *selfdict));

! static void emsg_funcname __ARGS((char *msg, char_u *name));

  static void f_add __ARGS((typval_T *argvars, typval_T *rettv));

  static void f_append __ARGS((typval_T *argvars, typval_T *rettv));

--- 454,460 ----

  static char_u *deref_func_name __ARGS((char_u *name, int *lenp));

  static int get_func_tv __ARGS((char_u *name, int len, typval_T *rettv, char_u **arg, linenr_T firstline, linenr_T lastline, int *doesrange, int evaluate, dict_T *selfdict));

  static int call_func __ARGS((char_u *name, int len, typval_T *rettv, int argcount, typval_T *argvars, linenr_T firstline, linenr_T lastline, int *doesrange, int evaluate, dict_T *selfdict));

! static void emsg_funcname __ARGS((char *ermsg, char_u *name));

  static void f_add __ARGS((typval_T *argvars, typval_T *rettv));

  static void f_append __ARGS((typval_T *argvars, typval_T *rettv));

***************

*** 2260,2266 ****

  	    EMSG(_(e_letunexp));

  	else

  	{

! 	    char_u	*tofree = NULL;

  	    char_u	*s;

  	    p = get_tv_string_chk(tv);

--- 2260,2266 ----

  	    EMSG(_(e_letunexp));

  	else

  	{

! 	    char_u	*ptofree = NULL;

  	    char_u	*s;

  	    p = get_tv_string_chk(tv);

***************

*** 2269,2275 ****

  		s = get_reg_contents(*arg == '@' ? '"' : *arg, TRUE, TRUE);

  		if (s != NULL)

  		{

! 		    p = tofree = concat_str(s, p);

  		    vim_free(s);

  		}

  	    }

--- 2269,2275 ----

  		s = get_reg_contents(*arg == '@' ? '"' : *arg, TRUE, TRUE);

  		if (s != NULL)

  		{

! 		    p = ptofree = concat_str(s, p);

  		    vim_free(s);

  		}

  	    }

***************

*** 2278,2284 ****

  		write_reg_contents(*arg == '@' ? '"' : *arg, p, -1, FALSE);

  		arg_end = arg + 1;

  	    }

! 	    vim_free(tofree);

  	}

      }

--- 2278,2284 ----

  		write_reg_contents(*arg == '@' ? '"' : *arg, p, -1, FALSE);

  		arg_end = arg + 1;

  	    }

! 	    vim_free(ptofree);

  	}

      }

***************

*** 7595,7602 ****

   * Give an error message with a function name.  Handle <SNR> things.

   */

      static void

! emsg_funcname(msg, name)

!     char	*msg;

      char_u	*name;

  {

      char_u	*p;

--- 7595,7602 ----

   * Give an error message with a function name.  Handle <SNR> things.

   */

      static void

! emsg_funcname(ermsg, name)

!     char	*ermsg;

      char_u	*name;

  {

      char_u	*p;

***************

*** 7605,7611 ****

  	p = concat_str((char_u *)"<SNR>", name + 3);

      else

  	p = name;

!     EMSG2(_(msg), p);

      if (p != name)

  	vim_free(p);

  }

--- 7605,7611 ----

  	p = concat_str((char_u *)"<SNR>", name + 3);

      else

  	p = name;

!     EMSG2(_(ermsg), p);

      if (p != name)

  	vim_free(p);

  }

***************

*** 9179,9203 ****

      typval_T	save_key;

      int		rem;

      int		todo;

!     char_u	*msg = map ? (char_u *)"map()" : (char_u *)"filter()";

      int		save_did_emsg;

      rettv->vval.v_number = 0;

      if (argvars[0].v_type == VAR_LIST)

      {

  	if ((l = argvars[0].vval.v_list) == NULL

! 		|| (map && tv_check_lock(l->lv_lock, msg)))

  	    return;

      }

      else if (argvars[0].v_type == VAR_DICT)

      {

  	if ((d = argvars[0].vval.v_dict) == NULL

! 		|| (map && tv_check_lock(d->dv_lock, msg)))

  	    return;

      }

      else

      {

! 	EMSG2(_(e_listdictarg), msg);

  	return;

      }

--- 9179,9203 ----

      typval_T	save_key;

      int		rem;

      int		todo;

!     char_u	*ermsg = map ? (char_u *)"map()" : (char_u *)"filter()";

      int		save_did_emsg;

      rettv->vval.v_number = 0;

      if (argvars[0].v_type == VAR_LIST)

      {

  	if ((l = argvars[0].vval.v_list) == NULL

! 		|| (map && tv_check_lock(l->lv_lock, ermsg)))

  	    return;

      }

      else if (argvars[0].v_type == VAR_DICT)

      {

  	if ((d = argvars[0].vval.v_dict) == NULL

! 		|| (map && tv_check_lock(d->dv_lock, ermsg)))

  	    return;

      }

      else

      {

! 	EMSG2(_(e_listdictarg), ermsg);

  	return;

      }

***************

*** 9229,9235 ****

  		{

  		    --todo;

  		    di = HI2DI(hi);

! 		    if (tv_check_lock(di->di_tv.v_lock, msg))

  			break;

  		    vimvars[VV_KEY].vv_str = vim_strsave(di->di_key);

  		    if (filter_map_one(&di->di_tv, expr, map, &rem) == FAIL

--- 9229,9235 ----

  		{

  		    --todo;

  		    di = HI2DI(hi);

! 		    if (tv_check_lock(di->di_tv.v_lock, ermsg))

  			break;

  		    vimvars[VV_KEY].vv_str = vim_strsave(di->di_key);

  		    if (filter_map_one(&di->di_tv, expr, map, &rem) == FAIL

***************

*** 9248,9254 ****

  	{

  	    for (li = l->lv_first; li != NULL; li = nli)

  	    {

! 		if (tv_check_lock(li->li_tv.v_lock, msg))

  		    break;

  		nli = li->li_next;

  		if (filter_map_one(&li->li_tv, expr, map, &rem) == FAIL

--- 9248,9254 ----

  	{

  	    for (li = l->lv_first; li != NULL; li = nli)

  	    {

! 		if (tv_check_lock(li->li_tv.v_lock, ermsg))

  		    break;

  		nli = li->li_next;

  		if (filter_map_one(&li->li_tv, expr, map, &rem) == FAIL

***************

*** 19789,19795 ****

  	    if (p_verbose >= 14)

  	    {

  		char_u	buf[MSG_BUF_LEN];

! 		char_u	numbuf[NUMBUFLEN];

  		char_u	*tofree;

  		msg_puts((char_u *)"(");

--- 19789,19795 ----

  	    if (p_verbose >= 14)

  	    {

  		char_u	buf[MSG_BUF_LEN];

! 		char_u	numbuf2[NUMBUFLEN];

  		char_u	*tofree;

  		msg_puts((char_u *)"(");

***************

*** 19801,19808 ****

  			msg_outnum((long)argvars[i].vval.v_number);

  		    else

  		    {

! 			trunc_string(tv2string(&argvars[i], &tofree, numbuf, 0),

! 							    buf, MSG_BUF_CLEN);

  			msg_puts(buf);

  			vim_free(tofree);

  		    }

--- 19801,19808 ----

  			msg_outnum((long)argvars[i].vval.v_number);

  		    else

  		    {

! 			trunc_string(tv2string(&argvars[i], &tofree,

! 					      numbuf2, 0), buf, MSG_BUF_CLEN);

  			msg_puts(buf);

  			vim_free(tofree);

  		    }

***************

*** 19880,19892 ****

  	else

  	{

  	    char_u	buf[MSG_BUF_LEN];

! 	    char_u	numbuf[NUMBUFLEN];

  	    char_u	*tofree;

  	    /* The value may be very long.  Skip the middle part, so that we

  	     * have some idea how it starts and ends. smsg() would always

  	     * truncate it at the end. */

! 	    trunc_string(tv2string(fc.rettv, &tofree, numbuf, 0),

  							   buf, MSG_BUF_CLEN);

  	    smsg((char_u *)_("%s returning %s"), sourcing_name, buf);

  	    vim_free(tofree);

--- 19880,19892 ----

  	else

  	{

  	    char_u	buf[MSG_BUF_LEN];

! 	    char_u	numbuf2[NUMBUFLEN];

  	    char_u	*tofree;

  	    /* The value may be very long.  Skip the middle part, so that we

  	     * have some idea how it starts and ends. smsg() would always

  	     * truncate it at the end. */

! 	    trunc_string(tv2string(fc.rettv, &tofree, numbuf2, 0),

  							   buf, MSG_BUF_CLEN);

  	    smsg((char_u *)_("%s returning %s"), sourcing_name, buf);

  	    vim_free(tofree);

*** ../vim-7.0.069/src/ex_cmds.c	Sun Apr 23 00:33:23 2006

--- src/ex_cmds.c	Mon Aug 28 21:42:29 2006

***************

*** 185,190 ****

--- 185,191 ----

  	    new_indent = indent;

  	else

  	{

+ 	    has_tab = FALSE;	/* avoid uninit warnings */

  	    len = linelen(eap->cmdidx == CMD_right ? &has_tab

  						   : NULL) - get_indent();

***************

*** 1772,1781 ****

  				? (st_old.st_mode & 0020)

  				: (st_old.st_mode & 0002))))

  	{

! 	    int	tt;

  	    /* avoid a wait_return for this message, it's annoying */

- 	    tt = msg_didany;

  	    EMSG2(_("E137: Viminfo file is not writable: %s"), fname);

  	    msg_didany = tt;

  	    fclose(fp_in);

--- 1773,1781 ----

  				? (st_old.st_mode & 0020)

  				: (st_old.st_mode & 0002))))

  	{

! 	    int	tt = msg_didany;

  	    /* avoid a wait_return for this message, it's annoying */

  	    EMSG2(_("E137: Viminfo file is not writable: %s"), fname);

  	    msg_didany = tt;

  	    fclose(fp_in);

*** ../vim-7.0.069/src/ex_cmds2.c	Tue Apr 18 00:10:47 2006

--- src/ex_cmds2.c	Thu Aug 24 22:01:44 2006

***************

*** 3648,3660 ****

   * Return FALSE when not sourcing a file.

   */

      int

! source_finished(getline, cookie)

!     char_u	*(*getline) __ARGS((int, void *, int));

      void	*cookie;

  {

!     return (getline_equal(getline, cookie, getsourceline)

  	    && ((struct source_cookie *)getline_cookie(

! 						 getline, cookie))->finished);

  }

  #endif

--- 3648,3660 ----

   * Return FALSE when not sourcing a file.

   */

      int

! source_finished(fgetline, cookie)

!     char_u	*(*fgetline) __ARGS((int, void *, int));

      void	*cookie;

  {

!     return (getline_equal(fgetline, cookie, getsourceline)

  	    && ((struct source_cookie *)getline_cookie(

! 						fgetline, cookie))->finished);

  }

  #endif

*** ../vim-7.0.069/src/ex_docmd.c	Wed Aug 16 17:06:22 2006

--- src/ex_docmd.c	Thu Aug 24 22:03:17 2006

***************

*** 58,66 ****

  #endif

  #ifdef FEAT_EVAL

! static char_u	*do_one_cmd __ARGS((char_u **, int, struct condstack *, char_u *(*getline)(int, void *, int), void *cookie));

  #else

! static char_u	*do_one_cmd __ARGS((char_u **, int, char_u *(*getline)(int, void *, int), void *cookie));

  static int	if_level = 0;		/* depth in :if */

  #endif

  static char_u	*find_command __ARGS((exarg_T *eap, int *full));

--- 58,66 ----

  #endif

  #ifdef FEAT_EVAL

! static char_u	*do_one_cmd __ARGS((char_u **, int, struct condstack *, char_u *(*fgetline)(int, void *, int), void *cookie));

  #else

! static char_u	*do_one_cmd __ARGS((char_u **, int, char_u *(*fgetline)(int, void *, int), void *cookie));

  static int	if_level = 0;		/* depth in :if */

  #endif

  static char_u	*find_command __ARGS((exarg_T *eap, int *full));

***************

*** 831,840 ****

      /*

       * If requested, store and reset the global values controlling the

!      * exception handling (used when debugging).

       */

      if (flags & DOCMD_EXCRESET)

  	save_dbg_stuff(&debug_saved);

      initial_trylevel = trylevel;

--- 831,843 ----

      /*

       * If requested, store and reset the global values controlling the

!      * exception handling (used when debugging).  Otherwise clear it to avoid

!      * a bogus compiler warning when the optimizer uses inline functions...

       */

      if (flags & DOCMD_EXCRESET)

  	save_dbg_stuff(&debug_saved);

+     else

+ 	memset(&debug_saved, 0, 1);

      initial_trylevel = trylevel;

***************

*** 1574,1597 ****

  #endif

  /*

!  * If "getline" is get_loop_line(), return TRUE if the getline it uses equals

!  * "func".  * Otherwise return TRUE when "getline" equals "func".

   */

  /*ARGSUSED*/

      int

! getline_equal(getline, cookie, func)

!     char_u	*(*getline) __ARGS((int, void *, int));

!     void	*cookie;		/* argument for getline() */

      char_u	*(*func) __ARGS((int, void *, int));

  {

  #ifdef FEAT_EVAL

      char_u		*(*gp) __ARGS((int, void *, int));

      struct loop_cookie *cp;

!     /* When "getline" is "get_loop_line()" use the "cookie" to find the

       * function that's orignally used to obtain the lines.  This may be nested

       * several levels. */

!     gp = getline;

      cp = (struct loop_cookie *)cookie;

      while (gp == get_loop_line)

      {

--- 1577,1600 ----

  #endif

  /*

!  * If "fgetline" is get_loop_line(), return TRUE if the getline it uses equals

!  * "func".  * Otherwise return TRUE when "fgetline" equals "func".

   */

  /*ARGSUSED*/

      int

! getline_equal(fgetline, cookie, func)

!     char_u	*(*fgetline) __ARGS((int, void *, int));

!     void	*cookie;		/* argument for fgetline() */

      char_u	*(*func) __ARGS((int, void *, int));

  {

  #ifdef FEAT_EVAL

      char_u		*(*gp) __ARGS((int, void *, int));

      struct loop_cookie *cp;

!     /* When "fgetline" is "get_loop_line()" use the "cookie" to find the

       * function that's orignally used to obtain the lines.  This may be nested

       * several levels. */

!     gp = fgetline;

      cp = (struct loop_cookie *)cookie;

      while (gp == get_loop_line)

      {

***************

*** 1600,1628 ****

      }

      return gp == func;

  #else

!     return getline == func;

  #endif

  }

  #if defined(FEAT_EVAL) || defined(FEAT_MBYTE) || defined(PROTO)

  /*

!  * If "getline" is get_loop_line(), return the cookie used by the original

   * getline function.  Otherwise return "cookie".

   */

  /*ARGSUSED*/

      void *

! getline_cookie(getline, cookie)

!     char_u	*(*getline) __ARGS((int, void *, int));

!     void	*cookie;		/* argument for getline() */

  {

  # ifdef FEAT_EVAL

      char_u		*(*gp) __ARGS((int, void *, int));

      struct loop_cookie *cp;

!     /* When "getline" is "get_loop_line()" use the "cookie" to find the

       * cookie that's orignally used to obtain the lines.  This may be nested

       * several levels. */

!     gp = getline;

      cp = (struct loop_cookie *)cookie;

      while (gp == get_loop_line)

      {

--- 1603,1631 ----

      }

      return gp == func;

  #else

!     return fgetline == func;

  #endif

  }

  #if defined(FEAT_EVAL) || defined(FEAT_MBYTE) || defined(PROTO)

  /*

!  * If "fgetline" is get_loop_line(), return the cookie used by the original

   * getline function.  Otherwise return "cookie".

   */

  /*ARGSUSED*/

      void *

! getline_cookie(fgetline, cookie)

!     char_u	*(*fgetline) __ARGS((int, void *, int));

!     void	*cookie;		/* argument for fgetline() */

  {

  # ifdef FEAT_EVAL

      char_u		*(*gp) __ARGS((int, void *, int));

      struct loop_cookie *cp;

!     /* When "fgetline" is "get_loop_line()" use the "cookie" to find the

       * cookie that's orignally used to obtain the lines.  This may be nested

       * several levels. */

!     gp = fgetline;

      cp = (struct loop_cookie *)cookie;

      while (gp == get_loop_line)

      {

***************

*** 1648,1654 ****

   * 5. parse arguments

   * 6. switch on command name

   *

!  * Note: "getline" can be NULL.

   *

   * This function may be called recursively!

   */

--- 1651,1657 ----

   * 5. parse arguments

   * 6. switch on command name

   *

!  * Note: "fgetline" can be NULL.

   *

   * This function may be called recursively!

   */

***************

*** 1663,1676 ****

  #ifdef FEAT_EVAL

  			    cstack,

  #endif

! 				    getline, cookie)

      char_u		**cmdlinep;

      int			sourcing;

  #ifdef FEAT_EVAL

      struct condstack	*cstack;

  #endif

!     char_u		*(*getline) __ARGS((int, void *, int));

!     void		*cookie;		/* argument for getline() */

  {

      char_u		*p;

      linenr_T		lnum;

--- 1666,1679 ----

  #ifdef FEAT_EVAL

  			    cstack,

  #endif

! 				    fgetline, cookie)

      char_u		**cmdlinep;

      int			sourcing;

  #ifdef FEAT_EVAL

      struct condstack	*cstack;

  #endif

!     char_u		*(*fgetline) __ARGS((int, void *, int));

!     void		*cookie;		/* argument for fgetline() */

  {

      char_u		*p;

      linenr_T		lnum;

***************

*** 1698,1704 ****

      if (quitmore

  #ifdef FEAT_EVAL

  	    /* avoid that a function call in 'statusline' does this */

! 	    && !getline_equal(getline, cookie, get_func_line)

  #endif

  	    )

  	--quitmore;

--- 1701,1707 ----

      if (quitmore

  #ifdef FEAT_EVAL

  	    /* avoid that a function call in 'statusline' does this */

! 	    && !getline_equal(fgetline, cookie, get_func_line)

  #endif

  	    )

  	--quitmore;

***************

*** 1728,1735 ****

  	/* in ex mode, an empty line works like :+ */

  	if (*ea.cmd == NUL && exmode_active

! 			&& (getline_equal(getline, cookie, getexmodeline)

! 			    || getline_equal(getline, cookie, getexline))

  			&& curwin->w_cursor.lnum < curbuf->b_ml.ml_line_count)

  	{

  	    ea.cmd = (char_u *)"+";

--- 1731,1738 ----

  	/* in ex mode, an empty line works like :+ */

  	if (*ea.cmd == NUL && exmode_active

! 			&& (getline_equal(fgetline, cookie, getexmodeline)

! 			    || getline_equal(fgetline, cookie, getexline))

  			&& curwin->w_cursor.lnum < curbuf->b_ml.ml_line_count)

  	{

  	    ea.cmd = (char_u *)"+";

***************

*** 1918,1926 ****

      /* Count this line for profiling if ea.skip is FALSE. */

      if (do_profiling == PROF_YES && !ea.skip)

      {

! 	if (getline_equal(getline, cookie, get_func_line))

! 	    func_line_exec(getline_cookie(getline, cookie));

! 	else if (getline_equal(getline, cookie, getsourceline))

  	    script_line_exec();

      }

  #endif

--- 1921,1929 ----

      /* Count this line for profiling if ea.skip is FALSE. */

      if (do_profiling == PROF_YES && !ea.skip)

      {

! 	if (getline_equal(fgetline, cookie, get_func_line))

! 	    func_line_exec(getline_cookie(fgetline, cookie));

! 	else if (getline_equal(fgetline, cookie, getsourceline))

  	    script_line_exec();

      }

  #endif

***************

*** 2589,2595 ****

   * The "ea" structure holds the arguments that can be used.

   */

      ea.cmdlinep = cmdlinep;

!     ea.getline = getline;

      ea.cookie = cookie;

  #ifdef FEAT_EVAL

      ea.cstack = cstack;

--- 2592,2598 ----

   * The "ea" structure holds the arguments that can be used.

   */

      ea.cmdlinep = cmdlinep;

!     ea.getline = fgetline;

      ea.cookie = cookie;

  #ifdef FEAT_EVAL

      ea.cstack = cstack;

***************

*** 2627,2635 ****

  	do_throw(cstack);

      else if (check_cstack)

      {

! 	if (source_finished(getline, cookie))

  	    do_finish(&ea, TRUE);

! 	else if (getline_equal(getline, cookie, get_func_line)

  						   && current_func_returned())

  	    do_return(&ea, TRUE, FALSE, NULL);

      }

--- 2630,2638 ----

  	do_throw(cstack);

      else if (check_cstack)

      {

! 	if (source_finished(fgetline, cookie))

  	    do_finish(&ea, TRUE);

! 	else if (getline_equal(fgetline, cookie, get_func_line)

  						   && current_func_returned())

  	    do_return(&ea, TRUE, FALSE, NULL);

      }

*** ../vim-7.0.069/src/gui_beval.c	Thu May  4 23:57:11 2006

--- src/gui_beval.c	Thu Aug 24 22:39:50 2006

***************

*** 926,932 ****

  #  define IS_NONPRINTABLE(c) (((c) < 0x20 && (c) != TAB && (c) != NL) \

  			      || (c) == DEL)

      static void

! set_printable_label_text(GtkLabel *label, char_u *msg)

  {

      char_u	    *convbuf = NULL;

      char_u	    *buf;

--- 926,932 ----

  #  define IS_NONPRINTABLE(c) (((c) < 0x20 && (c) != TAB && (c) != NL) \

  			      || (c) == DEL)

      static void

! set_printable_label_text(GtkLabel *label, char_u *text)

  {

      char_u	    *convbuf = NULL;

      char_u	    *buf;

***************

*** 940,953 ****

      /* Convert to UTF-8 if it isn't already */

      if (output_conv.vc_type != CONV_NONE)

      {

! 	convbuf = string_convert(&output_conv, msg, NULL);

  	if (convbuf != NULL)

! 	    msg = convbuf;

      }

      /* First let's see how much we need to allocate */

      len = 0;

!     for (p = msg; *p != NUL; p += charlen)

      {

  	if ((*p & 0x80) == 0)	/* be quick for ASCII */

  	{

--- 940,953 ----

      /* Convert to UTF-8 if it isn't already */

      if (output_conv.vc_type != CONV_NONE)

      {

! 	convbuf = string_convert(&output_conv, text, NULL);

  	if (convbuf != NULL)

! 	    text = convbuf;

      }

      /* First let's see how much we need to allocate */

      len = 0;

!     for (p = text; *p != NUL; p += charlen)

      {

  	if ((*p & 0x80) == 0)	/* be quick for ASCII */

  	{

***************

*** 992,998 ****

  				     (unsigned long)pixel, &color;;

  	pdest = buf;

! 	p = msg;

  	while (*p != NUL)

  	{

  	    /* Be quick for ASCII */

--- 992,998 ----

  				     (unsigned long)pixel, &color;;

  	pdest = buf;

! 	p = text;

  	while (*p != NUL)

  	{

  	    /* Be quick for ASCII */

*** ../vim-7.0.069/src/gui_gtk.c	Fri May  5 23:13:49 2006

--- src/gui_gtk.c	Thu Aug 24 22:34:30 2006

***************

*** 957,971 ****

  get_menu_position(vimmenu_T *menu)

  {

      vimmenu_T	*node;

!     int		index = 0;

      for (node = menu->parent->children; node != menu; node = node->next)

      {

  	g_return_val_if_fail(node != NULL, -1);

! 	++index;

      }

!     return index;

  }

  #endif /* FEAT_TOOLBAR && HAVE_GTK2 */

--- 957,971 ----

  get_menu_position(vimmenu_T *menu)

  {

      vimmenu_T	*node;

!     int		idx = 0;

      for (node = menu->parent->children; node != menu; node = node->next)

      {

  	g_return_val_if_fail(node != NULL, -1);

! 	++idx;

      }

!     return idx;

  }

  #endif /* FEAT_TOOLBAR && HAVE_GTK2 */

***************

*** 2127,2133 ****

      char    **ync;  /* "yes no cancel" */

      char    **buttons;

      int	    n_buttons = 0;

!     int	    index;