To: vim_dev@googlegroups.com
Subject: Patch 7.4.2251
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.4.2251
Problem:    In rare cases diffing 4 buffers is not enough.
Solution:   Raise the limit to 8. (closes #1000)
Files:      src/structs.h, runtime/doc/diff.txt


*** ../vim-7.4.2250/src/structs.h	2016-08-23 23:50:06.864280017 +0200
--- src/structs.h	2016-08-24 22:31:20.192851146 +0200
***************
*** 2296,2302 ****
  /*
   * Stuff for diff mode.
   */
! # define DB_COUNT 4	/* up to four buffers can be diff'ed */
  
  /*
   * Each diffblock defines where a block of lines starts in each of the buffers
--- 2296,2302 ----
  /*
   * Stuff for diff mode.
   */
! # define DB_COUNT 8	/* up to eight buffers can be diff'ed */
  
  /*
   * Each diffblock defines where a block of lines starts in each of the buffers
*** ../vim-7.4.2250/runtime/doc/diff.txt	2014-10-31 13:54:21.839214469 +0100
--- runtime/doc/diff.txt	2016-08-24 22:32:38.351769893 +0200
***************
*** 1,12 ****
! *diff.txt*      For Vim version 7.4.  Last change: 2013 Jul 07
  
  
  		  VIM REFERENCE MANUAL    by Bram Moolenaar
  
  
  				*diff* *vimdiff* *gvimdiff* *diff-mode*
! This file describes the |+diff| feature: Showing differences between two,
! three or four versions of the same file.
  
  The basics are explained in section |08.7| of the user manual.
  
--- 1,12 ----
! *diff.txt*      For Vim version 7.4.  Last change: 2016 Aug 24
  
  
  		  VIM REFERENCE MANUAL    by Bram Moolenaar
  
  
  				*diff* *vimdiff* *gvimdiff* *diff-mode*
! This file describes the |+diff| feature: Showing differences between two to
! eight versions of the same file.
  
  The basics are explained in section |08.7| of the user manual.
  
***************
*** 117,123 ****
  If you always prefer a vertical split include "vertical" in 'diffopt'.
  
  							*E96*
! There can be up to four buffers with 'diff' set.
  
  Since the option values are remembered with the buffer, you can edit another
  file for a moment and come back to the same file and be in diff mode again.
--- 117,123 ----
  If you always prefer a vertical split include "vertical" in 'diffopt'.
  
  							*E96*
! There can be up to eight buffers with 'diff' set.
  
  Since the option values are remembered with the buffer, you can edit another
  file for a moment and come back to the same file and be in diff mode again.
***************
*** 132,139 ****
  		if the current window does not have 'diff' set then no options
  		in it are changed.
  
! The ":diffoff" command resets the relevant options to the values they had when
! using |:diffsplit|, |:diffpatch| , |:diffthis|. or starting Vim in diff mode.
  Otherwise they are set to their default value:
  
  	'diff'		off
--- 132,140 ----
  		if the current window does not have 'diff' set then no options
  		in it are changed.
  
! The `:diffoff` command resets the relevant options to the values they had when
! using `:diffsplit`, `:diffpatch` , `:diffthis`. or starting Vim in diff mode.
! When using `:diffoff` twice the last saved values are restored.
  Otherwise they are set to their default value:
  
  	'diff'		off
***************
*** 181,188 ****
  buffer.  If you don't want a buffer to remain used for the diff do ":set
  nodiff" before hiding it.
  
! 							*:diffu* *:diffupdate*
! :diffu[pdate][!]		Update the diff highlighting and folds.
  
  Vim attempts to keep the differences updated when you make changes to the
  text.  This mostly takes care of inserted and deleted lines.  Changes within a
--- 182,189 ----
  buffer.  If you don't want a buffer to remain used for the diff do ":set
  nodiff" before hiding it.
  
! 							*:dif* *:diffupdate*
! :dif[fupdate][!]		Update the diff highlighting and folds.
  
  Vim attempts to keep the differences updated when you make changes to the
  text.  This mostly takes care of inserted and deleted lines.  Changes within a
***************
*** 314,319 ****
--- 315,333 ----
  
  Also see |'diffopt'| and the "diff" item of |'fillchars'|.
  
+ 					    *diff-slow* *diff_translations*
+ For very long lines, the diff syntax highlighting might be slow, especially
+ since it tries to match all different kind of localisations. To disable
+ localisations and speed up the syntax highlighting, set the global variable
+ g:diff_translations to zero: >
+ 
+     let g:diff_translations = 0
+ <
+ After setting this variable, Reload the syntax script: >
+ 
+     set syntax=diff
+ <
+ 
  
  FINDING THE DIFFERENCES					*diff-diffexpr*
  
*** ../vim-7.4.2250/src/version.c	2016-08-24 22:11:52.337277956 +0200
--- src/version.c	2016-08-24 22:32:53.331562825 +0200
***************
*** 765,766 ****
--- 765,768 ----
  {   /* Add new patch number below this line */
+ /**/
+     2251,
  /**/

-- 
I got a new desk stapler. It broke on the first desk I tried.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///