# 
# 
# patch "cmd_diff_log.cc"
#  from [c35bec121bd67432ca2b9c7c801dc381c339f325]
#    to [27ec51bfd532e11facf197b658fe0a4a39c44943]
# 
============================================================
--- cmd_diff_log.cc	c35bec121bd67432ca2b9c7c801dc381c339f325
+++ cmd_diff_log.cc	27ec51bfd532e11facf197b658fe0a4a39c44943
@@ -383,7 +383,7 @@ prepare_diff(cset & included,
       check_restricted_cset(old_roster, included);
 
       new_is_archived = false;
-      old_revision = r_old_id;
+      old_revision = old_rid;
     }
   else if (app.opts.revision_selectors.size() == 1)
     {
@@ -527,8 +527,7 @@ dump_diffs_basic_io(app_state & app, bas
         }
       else
         {
-          read_localized_data(file_path(i->first),
-                              unpacked, app.lua);
+          read_data(file_path(i->first), unpacked);
         }
 
         // FIXME: if this should _ever_ become a transferrable format
@@ -575,7 +574,7 @@ dump_diffs_basic_io(app_state & app, bas
 
       file_data f_old;
       data data_old, data_new;
-      app.db.get_file_version(i->second.first.inner(), f_old);
+      app.db.get_file_version(i->second.first, f_old);
       data_old = f_old.inner();
 
       if (new_is_archived)
@@ -586,8 +585,7 @@ dump_diffs_basic_io(app_state & app, bas
         }
       else
         {
-          read_localized_data(file_path(delta_entry_path(i)),
-                              data_new, app.lua);
+          read_data(file_path(delta_entry_path(i)), data_new);
         }   
 
         // FIXME: if this should _ever_ become a transferrable format