[SCM] Vim packaging branch, master, updated. debian/7.2.010-2-64-g928d30b

James Vega jamessan at debian.org
Sun Oct 12 21:33:33 UTC 2008


The following commit has been merged in the master branch:
commit 2752928243e9bd4b04dbe03d984b9affd949a61f
Merge: 2cd74df5094ff71492903b4670897afd9c16169c 50002c0e2e6b6ebcf1c35e810ba8f57f6e9c4f50
Author: James Vega <jamessan at debian.org>
Date:   Sun Oct 12 02:50:41 2008 -0400

    Merge branch 'deb/runtime'
    
    Conflicts:
    	src/normal.c
    	src/version.c
    
    Signed-off-by: James Vega <jamessan at debian.org>

diff --combined src/main.c
index e4acabf,0fc5941..dbdbfe7
--- a/src/main.c
+++ b/src/main.c
@@@ -87,9 -87,6 +87,9 @@@ typedef struc
  #ifdef FEAT_DIFF
      int		diff_mode;		/* start with 'diff' set */
  #endif
 +#ifdef SYS_TINYRC_FILE
 +    int		vi_mode;		/* started as "vi" */
 +#endif
  } mparm_T;
  
  /* Values for edit_type. */
@@@ -1460,7 -1457,8 +1460,8 @@@ parse_command_name(parmp
  	++initstr;
      }
  
-     if (TOLOWER_ASC(initstr[0]) == 'g' || initstr[0] == 'k')
+     /* "gvim" starts the GUI.  Also accept "Gvim" for MS-Windows. */
+     if (TOLOWER_ASC(initstr[0]) == 'g')
      {
  	main_start_gui();
  #ifdef FEAT_GUI
@@@ -1477,10 -1475,6 +1478,10 @@@
      }
      else if (STRNICMP(initstr, "vim", 3) == 0)
  	initstr += 3;
 +#ifdef SYS_TINYRC_FILE
 +    else if (STRNICMP(initstr, "vi", 2) == 0)
 +	parmp->vi_mode = TRUE;
 +#endif
  
      /* Catch "[r][g]vimdiff" and "[r][g]viewdiff". */
      if (STRICMP(initstr, "diff") == 0)
@@@ -2763,12 -2757,7 +2764,12 @@@ source_startup_scripts(parmp
  	 * Get system wide defaults, if the file name is defined.
  	 */
  #ifdef SYS_VIMRC_FILE
 -	(void)do_source((char_u *)SYS_VIMRC_FILE, FALSE, DOSO_NONE);
 +# if defined(SYS_TINYRC_FILE) && defined(TINY_VIMRC)
 +	if (parmp->vi_mode)
 +	    (void)do_source((char_u *)SYS_TINYRC_FILE, FALSE, DOSO_NONE);
 +	else
 +# endif
 +	    (void)do_source((char_u *)SYS_VIMRC_FILE, FALSE, DOSO_NONE);
  #endif
  #ifdef MACOS_X
  	(void)do_source((char_u *)"$VIMRUNTIME/macmap.vim", FALSE, DOSO_NONE);
diff --combined src/normal.c
index f7feac6,c1e630a..785de7c
--- a/src/normal.c
+++ b/src/normal.c
@@@ -1132,7 -1132,8 +1132,8 @@@ getcount
  	out_flush();
  #endif
  #ifdef FEAT_AUTOCMD
-     did_cursorhold = FALSE;
+     if (ca.cmdchar != K_IGNORE)
+ 	did_cursorhold = FALSE;
  #endif
  
      State = NORMAL;
@@@ -5518,11 -5519,8 +5519,11 @@@ nv_ident(cap
       */
      if (cmdchar == 'K' && !kp_help)
      {
 +	/* Use only the chars in the identifier, instead of the whole line */
 +	char_u s[n+1];
 +	vim_strncpy(s, ptr, n);
  	/* Escape the argument properly for a shell command */
 -	p = vim_strsave_shellescape(ptr, TRUE);
 +	p = vim_strsave_shellescape(s, TRUE);
  	if (p == NULL)
  	{
  	    vim_free(buf);
diff --combined src/option.c
index b1b3405,20fef41..da542e0
--- a/src/option.c
+++ b/src/option.c
@@@ -7974,6 -7974,11 +7974,11 @@@ set_num_option(opt_idx, varp, value, er
  	else /* curwin->w_p_scr > curwin->w_height */
  	    curwin->w_p_scr = curwin->w_height;
      }
+     if (p_hi < 0)
+     {
+ 	errmsg = e_positive;
+ 	p_hi = 0;
+     }
      if (p_report < 0)
      {
  	errmsg = e_positive;
@@@ -10123,7 -10128,7 +10128,7 @@@ langmap_set(
  {
      char_u  *p;
      char_u  *p2;
 -    int	    from, to;
 +    int	    from=NUL, to=NUL;
  
      langmap_init();			    /* back to one-to-one map first */
  
@@@ -10141,11 -10146,6 +10146,11 @@@
  	    p2 = NULL;	    /* aAbBcCdD form, p2 is NULL */
  	while (p[0])
  	{
 +	    if (p[0] == ',')
 +	    {
 +		++p;
 +		break;
 +	    }
  	    if (p[0] == '\\' && p[1] != NUL)
  		++p;
  #ifdef FEAT_MBYTE
@@@ -10156,29 -10156,23 +10161,29 @@@
  	    if (p2 == NULL)
  	    {
  		mb_ptr_adv(p);
 -		if (p[0] == '\\')
 -		    ++p;
 +		if (p[0] != ',')
 +		{
 +		    if (p[0] == '\\')
 +			++p;
  #ifdef FEAT_MBYTE
 -		to = (*mb_ptr2char)(p);
 +		    to = (*mb_ptr2char)(p);
  #else
 -		to = p[0];
 +		    to = p[0];
  #endif
 +		}
  	    }
  	    else
  	    {
 -		if (p2[0] == '\\')
 -		    ++p2;
 +		if (p2[0] != ',')
 +		{
 +		    if (p2[0] == '\\')
 +			++p2;
  #ifdef FEAT_MBYTE
 -		to = (*mb_ptr2char)(p2);
 +		    to = (*mb_ptr2char)(p2);
  #else
 -		to = p2[0];
 +		    to = p2[0];
  #endif
 +		}
  	    }
  	    if (to == NUL)
  	    {

-- 
Vim packaging



More information about the pkg-vim-maintainers mailing list