Index: bindings.doc
==================================================================
--- bindings.doc
+++ bindings.doc
@@ -117,15 +117,21 @@
 
 '^x'
   Cancel dead animation.
 
 'lo' <location>
-  Flash the specified location briefly.
+  Flash the specified location briefly (same as the LocateMe instruction in
+  the class codes).
 
 'ls' <slot>
   Load save state slot (0 to 7).
 
+'md' <number>
+  Multiple deletion. No effect if the number is zero or negative. If the
+  number is 1 then it is the same as the '^-' binding, while a sufficiently
+  large number is the same as the '^D' binding.
+
 'mi' <command>
   Import a move list. The argument is a operating system command, that
   when executed will write the move list to stdout, with one byte per
   move (the Hero Mesh key codes).
 

Index: default.heromeshrc
==================================================================
--- default.heromeshrc
+++ default.heromeshrc
@@ -142,10 +142,11 @@
 ?.gameKey.alt.X: ^x
 ?.gameKey.alt.leftbracket: select 'rs',-5;
 ?.gameKey.alt.rightbracket: select 'rs',+5;
 ?.gameKey.delete: ^-
 ?.gameKey.ctrl.delete: ^D
+?.gameKey.shift.delete: select 'md',mark()-movenumber();
 ?.gameKey.insert: ^+
 ?.gameKey.alt.kp_minus: select 'go',-ord from levels where ord<$level and not solved order by ord desc limit 1;
 ?.gameKey.alt.kp_plus: select 'go',-ord from levels where ord>$level and not solved order by ord asc limit 1;
 ?.gameKey.shift.1: select 'ss',0;
 ?.gameKey.shift.2: select 'ss',1;

Index: function.c
==================================================================
--- function.c
+++ function.c
@@ -1812,13 +1812,15 @@
   sqlite3_create_function(userdb,"LEVEL_CODE",0,SQLITE_UTF8,&level_code,fn_level,0,0);
   sqlite3_create_function(userdb,"LEVEL_ID",0,SQLITE_UTF8,&level_id,fn_level,0,0);
   sqlite3_create_function(userdb,"LEVEL_TITLE",0,SQLITE_UTF8,0,fn_level_title,0,0);
   sqlite3_create_function(userdb,"LEVEL_VERSION",0,SQLITE_UTF8,&level_version,fn_level,0,0);
   sqlite3_create_function(userdb,"LOAD_LEVEL",1,SQLITE_UTF8,0,fn_load_level,0,0);
+  sqlite3_create_function(userdb,"MARK",0,SQLITE_UTF8,&replay_mark,fn_level,0,0);
   sqlite3_create_function(userdb,"MAX_LEVEL",0,SQLITE_UTF8,0,fn_max_level,0,0);
   sqlite3_create_function(userdb,"MODSTATE",0,SQLITE_UTF8,0,fn_modstate,0,0);
   sqlite3_create_function(userdb,"MOVE_LIST",0,SQLITE_UTF8,0,fn_move_list,0,0);
+  sqlite3_create_function(userdb,"MOVECOUNT",0,SQLITE_UTF8,&replay_count,fn_level,0,0);
   sqlite3_create_function(userdb,"MOVENUMBER",0,SQLITE_UTF8,0,fn_movenumber,0,0);
   sqlite3_create_function(userdb,"MVALUE",1,SQLITE_UTF8|SQLITE_DETERMINISTIC,0,fn_mvalue,0,0);
   sqlite3_create_function(userdb,"NVALUE",1,SQLITE_UTF8|SQLITE_DETERMINISTIC,0,fn_zero_extend,0,0);
   sqlite3_create_function(userdb,"OVALUE",1,SQLITE_UTF8,0,fn_ovalue,0,0);
   sqlite3_create_function(userdb,"PFHEIGHT",0,SQLITE_UTF8,&pfheight,fn_pfsize,0,0);

Index: game.c
==================================================================
--- game.c
+++ game.c
@@ -1456,10 +1456,25 @@
         return -3;
       }
       number=exchange_state(number&7,'l');
       if(number<0) return -3;
       goto restart;
+    case 'md': // Delete multiple moves
+      inputs_count=0;
+      if(solution_replay) {
+        screen_message("You cannot delete moves during the solution replay");
+        return -3;
+      }
+      if(replay_pos==replay_count || number<=0) return 0;
+      if(number>replay_count-replay_pos) number=replay_count-replay_pos;
+      memmoveM(replay_list+replay_pos,replay_list+replay_pos+number,replay_count-replay_pos-number);
+      replay_count-=number;
+      if(replay_mark>replay_pos) {
+        replay_mark-=number;
+        if(replay_mark<replay_pos) replay_mark=replay_pos;
+      }
+      return 0;
     case 'mi': // Move list import
       if(argc<2 || solution_replay) break;
       if(replay_pos) begin_level(level_id);
       do_import_moves(sqlite3_column_text(args,1));
       return 1;

Index: game.doc
==================================================================
--- game.doc
+++ game.doc
@@ -180,10 +180,11 @@
   ALT+[       Increase slow replay speed
   ALT+]       Decrease slow replay speed
   INS         Toggle insertion mode
   DEL         Delete a move
   CTRL+DEL    Delete all moves forward
+  SHIFT+DEL   Delete moves up to mark
   SHIFT+num   Save state 1 to 8
   CTRL+num    Load state 1 to 8
   ALT+num     Exchange state 1 to 8
 
 Mouse (in grid):

Index: sql.doc
==================================================================
--- sql.doc
+++ sql.doc
@@ -111,10 +111,13 @@
 
 LOAD_LEVEL(level_id)
   Only valid when Free Hero Mesh is invoked with the -x switch. Loads
   the level with the specified ID number.
 
+MARK()
+  The number of moves in the replay list before the mark.
+
 MAX_LEVEL()
   The number of levels in this puzzle set (equal to the maximum valid
   level order number).
 
 MVALUE(number)
@@ -124,10 +127,13 @@
   The SDL keyboard modifier state.
 
 MOVE_LIST()
   Return the current move list as a blob.
 
+MOVECOUNT()
+  The total number of moves in the replay list.
+
 MOVENUMBER()
   Return the number of moves executed so far since the level restarted.
 
 NVALUE(number)
   Makes a game value of type 'number'. Same as ZERO_EXTEND.