home *** CD-ROM | disk | FTP | other *** search
/ vim.ftp.fu-berlin.de / 2015-02-03.vim.ftp.fu-berlin.de.tar / vim.ftp.fu-berlin.de / patches / 6.2.317 < prev    next >
Encoding:
Internet Message Format  |  2004-03-04  |  2.1 KB
  1. To: vim-dev@vim.org
  2. Subject: Patch 6.2.317
  3. Fcc: outbox
  4. From: Bram Moolenaar <Bram@moolenaar.net>
  5. Mime-Version: 1.0
  6. Content-Type: text/plain; charset=ISO-8859-1
  7. Content-Transfer-Encoding: 8bit
  8. ------------
  9.  
  10. Patch 6.2.317 (after 6.2.313)
  11. Problem:    When using "zi" in a diff window, other diff windows are not
  12.         adjusted. (Richard Curnow)
  13. Solution:   Distribute a change in 'foldenable' to other diff windows.
  14. Files:        src/normal.c
  15.  
  16.  
  17. *** ../vim-6.2.316/src/normal.c    Thu Mar  4 10:42:50 2004
  18. --- src/normal.c    Thu Mar  4 22:56:50 2004
  19. ***************
  20. *** 4530,4538 ****
  21.       }
  22.   
  23.   #ifdef FEAT_FOLDING
  24. !     /* Redraw when 'foldenable' or 'foldlevel' changed */
  25.       if (old_fen != curwin->w_p_fen)
  26.       changed_window_setting();
  27.       if (old_fdl != curwin->w_p_fdl)
  28.       newFoldLevel();
  29.   #endif
  30. --- 4537,4565 ----
  31.       }
  32.   
  33.   #ifdef FEAT_FOLDING
  34. !     /* Redraw when 'foldenable' changed */
  35.       if (old_fen != curwin->w_p_fen)
  36. +     {
  37. + # ifdef FEAT_DIFF
  38. +     win_T        *wp;
  39. + 
  40. +     if (foldmethodIsDiff(curwin) && curwin->w_p_scb)
  41. +     {
  42. +         /* Adjust 'foldenable' in diff-synced windows. */
  43. +         FOR_ALL_WINDOWS(wp)
  44. +         {
  45. +         if (wp != curwin && foldmethodIsDiff(wp) && wp->w_p_scb)
  46. +         {
  47. +             wp->w_p_fen = curwin->w_p_fen;
  48. +             changed_window_setting_win(wp);
  49. +         }
  50. +         }
  51. +     }
  52. + # endif
  53.       changed_window_setting();
  54. +     }
  55. + 
  56. +     /* Redraw when 'foldlevel' changed. */
  57.       if (old_fdl != curwin->w_p_fdl)
  58.       newFoldLevel();
  59.   #endif
  60. *** ../vim-6.2.316/src/version.c    Thu Mar  4 14:20:22 2004
  61. --- src/version.c    Fri Mar  5 12:10:41 2004
  62. ***************
  63. *** 639,640 ****
  64. --- 639,642 ----
  65.   {   /* Add new patch number below this line */
  66. + /**/
  67. +     317,
  68.   /**/
  69.  
  70. -- 
  71. It is illegal for anyone to try and stop a child from playfully jumping over
  72. puddles of water.
  73.         [real standing law in California, United States of America]
  74.  
  75.  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
  76. ///        Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
  77. \\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
  78.  \\\  Buy at Amazon and help AIDS victims -- http://ICCF.nl/click1.html ///
  79.