# HG changeset patch
# User Ludovic Chabant <ludovic@chabant.com>
# Date 1461126642 25200
# Node ID 90f8d4bf4fa76c75ed80b133e1d0ee5df55ffb2e
# Parent  0e005903aae470a5d4f3430eec92f9af004032e5# Parent  48f4124af78d83ffa2403b72ed4f145980081a0d
Merge pull request #12 from GitHub.

diff -r 48f4124af78d -r 90f8d4bf4fa7 plugin/lawrencium.vim
--- a/plugin/lawrencium.vim	Sun Feb 21 19:17:23 2016 +0900
+++ b/plugin/lawrencium.vim	Tue Apr 19 21:30:42 2016 -0700
@@ -2,6 +2,7 @@
 " Maintainer:   Ludovic Chabant <http://ludovic.chabant.com>
 " Version:      0.4.0
 
+
 " Globals {{{
 
 if !exists('g:lawrencium_debug')
@@ -1416,6 +1417,7 @@
     let w:lawrencium_diffoff['&cursorbind'] = &l:cursorbind
     let w:lawrencium_diffoff['&foldmethod'] = &l:foldmethod
     let w:lawrencium_diffoff['&foldcolumn'] = &l:foldcolumn
+    let w:lawrencium_diffoff['&foldenable'] = &l:foldenable
     let w:lawrencium_diff_id = a:diff_id
     diffthis
     autocmd BufWinLeave <buffer> call s:HgDiff_CleanUp()
@@ -2207,7 +2209,7 @@
     call l:orig_buf.DefineCommand('Hgrecordabort', ':call s:HgRecord_Abort()')
     call l:orig_buf.DefineCommand('Hgrecordcommit', ':call s:HgRecord_Execute()')
     call s:HgDiff_DiffThis(l:diff_id)
-    setlocal foldmethod=marker
+    setlocal foldmethod=diff
 
     " Split the window and open the parent revision in the right or bottom
     " window. Keep the current buffer in the left or top window... we're going
@@ -2243,7 +2245,7 @@
 
     " Make it the other part of the diff.
     call s:HgDiff_DiffThis(l:diff_id)
-    setlocal foldmethod=marker
+    setlocal foldmethod=diff
     call l:rec_buf.SetVar('&filetype', l:orig_buf.GetVar('&filetype'))
 
     if g:lawrencium_record_start_in_working_buffer