• R/O
  • SSH

vim: コミット

Mirror of the Vim source from https://github.com/vim/vim


コミットメタ情報

リビジョンa66a49322b6bc2a82c6cc3e8092db7d502f64c4b (tree)
日時2007-08-15 05:16:42
作者vimboss
コミッターvimboss

ログメッセージ

updated for version 7.1-073

変更サマリ

差分

diff -r 9656552c468d -r a66a49322b6b src/misc1.c
--- a/src/misc1.c Tue Aug 14 15:55:42 2007 +0000
+++ b/src/misc1.c Tue Aug 14 20:16:42 2007 +0000
@@ -104,7 +104,7 @@
104104 int ind_done = 0; /* measured in spaces */
105105 int tab_pad;
106106 int retval = FALSE;
107- int orig_char_len = 0; /* number of initial whitespace chars when
107+ int orig_char_len = -1; /* number of initial whitespace chars when
108108 'et' and 'pi' are both set */
109109
110110 /*
@@ -159,7 +159,7 @@
159159
160160 /* Fill to next tabstop with a tab, if possible */
161161 tab_pad = (int)curbuf->b_p_ts - (ind_done % (int)curbuf->b_p_ts);
162- if (todo >= tab_pad && orig_char_len == 0)
162+ if (todo >= tab_pad && orig_char_len == -1)
163163 {
164164 doit = TRUE;
165165 todo -= tab_pad;
@@ -206,11 +206,15 @@
206206 /* If 'preserveindent' and 'expandtab' are both set keep the original
207207 * characters and allocate accordingly. We will fill the rest with spaces
208208 * after the if (!curbuf->b_p_et) below. */
209- if (orig_char_len != 0)
209+ if (orig_char_len != -1)
210210 {
211211 newline = alloc(orig_char_len + size - ind_done + line_len);
212212 if (newline == NULL)
213213 return FALSE;
214+ todo = size - ind_done;
215+ ind_len = orig_char_len + todo; /* Set total length of indent in
216+ * characters, which may have been
217+ * undercounted until now */
214218 p = oldline;
215219 s = newline;
216220 while (orig_char_len > 0)
@@ -222,9 +226,6 @@
222226 * than old) */
223227 while (vim_iswhite(*p))
224228 (void)*p++;
225- todo = size - ind_done;
226- ind_len += todo; /* Set total length of indent in characters,
227- * which may have been undercounted until now */
228229
229230 }
230231 else
diff -r 9656552c468d -r a66a49322b6b src/version.c
--- a/src/version.c Tue Aug 14 15:55:42 2007 +0000
+++ b/src/version.c Tue Aug 14 20:16:42 2007 +0000
@@ -667,6 +667,8 @@
667667 static int included_patches[] =
668668 { /* Add new patch number below this line */
669669 /**/
670+ 73,
671+/**/
670672 72,
671673 /**/
672674 71,
旧リポジトリブラウザで表示