components/vim/vim72-patches/7.2.162
changeset 379 c6a17bba1da3
parent 378 f0b61ed1d10d
child 380 e92b3b4a1c66
equal deleted inserted replaced
378:f0b61ed1d10d 379:c6a17bba1da3
     1 To: [email protected]
       
     2 Subject: Patch 7.2.162
       
     3 Fcc: outbox
       
     4 From: Bram Moolenaar <[email protected]>
       
     5 Mime-Version: 1.0
       
     6 Content-Type: text/plain; charset=ISO-8859-1
       
     7 Content-Transfer-Encoding: 8bit
       
     8 ------------
       
     9 
       
    10 Patch 7.2.162
       
    11 Problem:    The quickfix window may get wrong filetype.
       
    12 Solution:   Do not detect the filetype for the quickfix window. (Lech Lorens)
       
    13 Files:	    src/quickfix.c
       
    14 
       
    15 
       
    16 *** ../vim-7.2.161/src/quickfix.c	Sun Feb 22 02:36:36 2009
       
    17 --- src/quickfix.c	Wed Apr 22 17:34:57 2009
       
    18 ***************
       
    19 *** 2346,2352 ****
       
    20   	    set_option_value((char_u *)"bt", 0L, (char_u *)"quickfix",
       
    21   								   OPT_LOCAL);
       
    22   	    set_option_value((char_u *)"bh", 0L, (char_u *)"wipe", OPT_LOCAL);
       
    23 ! 	    set_option_value((char_u *)"diff", 0L, NULL, OPT_LOCAL);
       
    24   	}
       
    25   
       
    26   	/* Only set the height when still in the same tab page and there is no
       
    27 --- 2346,2358 ----
       
    28   	    set_option_value((char_u *)"bt", 0L, (char_u *)"quickfix",
       
    29   								   OPT_LOCAL);
       
    30   	    set_option_value((char_u *)"bh", 0L, (char_u *)"wipe", OPT_LOCAL);
       
    31 ! #ifdef FEAT_DIFF
       
    32 ! 	    curwin->w_p_diff = FALSE;
       
    33 ! #endif
       
    34 ! #ifdef FEAT_FOLDING
       
    35 ! 	    set_option_value((char_u *)"fdm", 0L, (char_u *)"manual",
       
    36 ! 								   OPT_LOCAL);
       
    37 ! #endif
       
    38   	}
       
    39   
       
    40   	/* Only set the height when still in the same tab page and there is no
       
    41 ***************
       
    42 *** 2607,2616 ****
       
    43 --- 2613,2624 ----
       
    44       curbuf->b_p_ma = FALSE;
       
    45   
       
    46   #ifdef FEAT_AUTOCMD
       
    47 +     keep_filetype = TRUE;		/* don't detect 'filetype' */
       
    48       apply_autocmds(EVENT_BUFREADPOST, (char_u *)"quickfix", NULL,
       
    49   							       FALSE, curbuf);
       
    50       apply_autocmds(EVENT_BUFWINENTER, (char_u *)"quickfix", NULL,
       
    51   							       FALSE, curbuf);
       
    52 +     keep_filetype = FALSE;
       
    53   #endif
       
    54   
       
    55       /* make sure it will be redrawn */
       
    56 *** ../vim-7.2.161/src/version.c	Wed Apr 29 11:00:09 2009
       
    57 --- src/version.c	Wed Apr 29 11:49:09 2009
       
    58 ***************
       
    59 *** 678,679 ****
       
    60 --- 678,681 ----
       
    61   {   /* Add new patch number below this line */
       
    62 + /**/
       
    63 +     162,
       
    64   /**/
       
    65 
       
    66 -- 
       
    67 Yesterday is history.
       
    68 Tomorrow is a mystery.
       
    69 Today is a gift.
       
    70 That's why it is called 'present'.
       
    71 
       
    72  /// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net   \\\
       
    73 ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
       
    74 \\\        download, build and distribute -- http://www.A-A-P.org        ///
       
    75  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///