• R/O
  • SSH

vim: Commit

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


Commit MetaInfo

Révision1f93fbcb4e0cf1dcd8682242f40aa5f2906c42ac (tree)
l'heure2008-01-05 00:31:21
Auteurvimboss
Commitervimboss

Message de Log

updated for version 7.1-201

Change Summary

Modification

diff -r 6d95d8976b00 -r 1f93fbcb4e0c src/fileio.c
--- a/src/fileio.c Fri Jan 04 15:01:07 2008 +0000
+++ b/src/fileio.c Fri Jan 04 15:31:21 2008 +0000
@@ -221,11 +221,12 @@
221221 {
222222 int fd = 0;
223223 int newfile = (flags & READ_NEW);
224- int set_options = newfile || (eap != NULL && eap->read_edit);
225224 int check_readonly;
226225 int filtering = (flags & READ_FILTER);
227226 int read_stdin = (flags & READ_STDIN);
228227 int read_buffer = (flags & READ_BUFFER);
228+ int set_options = newfile || read_buffer
229+ || (eap != NULL && eap->read_edit);
229230 linenr_T read_buf_lnum = 1; /* next line to read from curbuf */
230231 colnr_T read_buf_col = 0; /* next char to read from this line */
231232 char_u c;
@@ -650,8 +651,13 @@
650651
651652 if (set_options)
652653 {
653- curbuf->b_p_eol = TRUE;
654- curbuf->b_start_eol = TRUE;
654+ /* Don't change 'eol' if reading from buffer as it will already be
655+ * correctly set when reading stdin. */
656+ if (!read_buffer)
657+ {
658+ curbuf->b_p_eol = TRUE;
659+ curbuf->b_start_eol = TRUE;
660+ }
655661 #ifdef FEAT_MBYTE
656662 curbuf->b_p_bomb = FALSE;
657663 curbuf->b_start_bomb = FALSE;
diff -r 6d95d8976b00 -r 1f93fbcb4e0c src/version.c
--- a/src/version.c Fri Jan 04 15:01:07 2008 +0000
+++ b/src/version.c Fri Jan 04 15:31:21 2008 +0000
@@ -667,6 +667,8 @@
667667 static int included_patches[] =
668668 { /* Add new patch number below this line */
669669 /**/
670+ 201,
671+/**/
670672 200,
671673 /**/
672674 199,
Afficher sur ancien navigateur de dépôt.