1Index: src/option.c 2=================================================================== 3--- src/option.c (revision 57764) 4+++ src/option.c (working copy) 5@@ -553,8 +553,8 @@ 6 (char_u *)&p_ai, PV_AI, 7 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, 8 {"autoprint", "ap", P_BOOL|P_VI_DEF, 9- (char_u *)NULL, PV_NONE, 10- {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, 11+ (char_u *)&p_ap, PV_NONE, 12+ {(char_u *)TRUE, (char_u *)1L} SCRIPTID_INIT}, 13 {"autoread", "ar", P_BOOL|P_VI_DEF, 14 (char_u *)&p_ar, PV_AR, 15 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, 16@@ -622,7 +622,7 @@ 17 # endif 18 #endif 19 {"beautify", "bf", P_BOOL|P_VI_DEF, 20- (char_u *)NULL, PV_NONE, 21+ (char_u *)&p_bf, PV_NONE, 22 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, 23 {"binary", "bin", P_BOOL|P_VI_DEF|P_RSTAT, 24 (char_u *)&p_bin, PV_BIN, 25@@ -2779,7 +2779,7 @@ 26 #endif 27 SCRIPTID_INIT}, 28 {"window", "wi", P_NUM|P_VI_DEF, 29- (char_u *)&p_window, PV_NONE, 30+ (char_u *)&p_window_unix2003, PV_NONE, 31 {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, 32 {"winheight", "wh", P_NUM|P_VI_DEF, 33 #ifdef FEAT_WINDOWS 34@@ -3680,7 +3680,7 @@ 35 */ 36 if (!option_was_set((char_u *)"window")) 37 p_window = Rows - 1; 38- set_number_default("window", Rows - 1); 39+ set_number_default("window", p_window); 40 41 /* For DOS console the default is always black. */ 42 #if !((defined(MSDOS) || defined(OS2) || defined(WIN3264)) && !defined(FEAT_GUI)) 43