Merge r6587, keybindings. Fixes bug 2018200: macros not working with the

old 0.3.4 keymap.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6682 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 7 insertions, 1 deletions

diff --git a/crawl-ref/docs/options_guide.txt b/crawl-ref/docs/options_guide.txt
index f182fed5ec..e7cb00a362 100644
--- a/crawl-ref/docs/options_guide.txt
+++ b/crawl-ref/docs/options_guide.txt
@@ -82,7 +82,7 @@ The contents of this text are:
                 autoinscribe
 4-n     Macro related Options.
                 flush.failure, flush.command, flush.message,
-                macro_meta_entry, additional_macro_file
+                macro_meta_entry, additional_macro_file, bindkey
 4-o     Tiles Options.
                 tile_show_items, title_screen, tile_player_col,
                 tile_monster_col, tile_neutral_col, tile_friendly_col, 
@@ -1470,6 +1470,12 @@ additional_macro_file = path/to/filename
         Add an additional macro file to be loaded after macro.txt.
         You can have multiple additional_macro_file lines.
 
+bindkey = [^D] CMD_BUTCHER
+        Change which key invokes which command at a lower level of
+        operation than macros.  Useful in that macros cannot (yet)
+        invoke each other, but a macro can invoke a command whose
+        key has changed.
+
 4-o     Tiles Options.
 ----------------------
 In non-tile games the tile options are ignored.