# HG changeset patch
# User ht
# Date 1254144767 0
# Node ID b1666e6cfbd1e4ea4a4ef9fb86acd3879d0fa8de
# Parent  6d097403ddb98d33408d3c2ad92bb0ce216eb4db
revised for pre-proc

diff -r 6d097403ddb9 -r b1666e6cfbd1 summa/bilingual/merge.el
--- a/summa/bilingual/merge.el	Mon Sep 28 13:32:29 2009 +0000
+++ b/summa/bilingual/merge.el	Mon Sep 28 13:32:47 2009 +0000
@@ -1,7 +1,8 @@
 ;;; Two buffers, raw latin on top, output of prep.xsl on english on the bottom
-;;; Put cursor at beginning of latin para, end of english
+;;; Put cursor at beginning of latin para, end of english/'both' div
 (defalias 'merge-paras (read-kbd-macro
-"C-SPC M-C-f C-x C-x M-w C-x o 4*<C-b> 4*<C-f> C-r right\"/> RET M-f C-f C-d C-f C-y </div> C-r <p SPC RET 3*<C-f> xml:lang=\"la\" SPC C-r <p RET M-C-f C-s clear: SPC both RET C-r <div RET M-C-f C-x o M-C-f C-s <p RET 2*<C-b>"))
+"C-SPC M-C-f C-x C-x M-w C-x o C-r right\"/> RET M-f C-f C-d C-f C-y < /div> C-r < p SPC RET 3*<C-f> xml:lang=\"la\" SPC C-r < p RET M-C-f C-s clear: SPC both RET C-r < div RET M-C-f C-x o M-C-f C-s < p RET 2*<C-b>"))
+
 
 (defalias
   'old-merge-paras