Apply trunk r6533 to 0.4.

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

5 files changed, 23 insertions, 22 deletions

diff --git a/crawl-ref/docs/crawl_manual.txt b/crawl-ref/docs/crawl_manual.txt
index 94e17cc397..2d091afb04 100644
--- a/crawl-ref/docs/crawl_manual.txt
+++ b/crawl-ref/docs/crawl_manual.txt
@@ -382,17 +382,17 @@ with yellow glyphs.
 
 Automated Travel and Exploration
 --------------------------------
-Crawl has an extensive automated travel system: pressing 'Ctrl-G' lets
-you choose any dungeon level; the game will then take the shortest path
-to reach this destination. You can also use autotravel on the level map
-('X'): Move the cursor to the place where you want to go and hit Enter.
-There are several shortcuts when choosing destinations: For example,
-try '<' and '>' to quickly reach the staircases.
-
-When your autotravel gets interrupted, Crawl will remember the previous
-destination. Hitting 'Ctrl-G' again and following with Enter puts the
-cursor on that square. See Appendix 4 for all commands and shortcuts in
-level-map mode.
+Crawl has an extensive automated travel system: pressing 'Ctrl-G' or 'G' 
+lets you choose any dungeon level; the game will then take the shortest 
+path to reach this destination. You can also use autotravel on the level 
+map ('X'): Move the cursor to the place where you want to go and hit 
+Enter. There are several shortcuts when choosing destinations: For 
+example, try '<' and '>' to quickly reach the staircases.
+
+When your autotravel gets interrupted, Crawl will remember the previous 
+destination. Hitting 'Ctrl-G' or 'G' again and following with Enter puts 
+the cursor on that square. See Appendix 4 for all commands and shortcuts 
+in level-map mode.
 
 Another use of autotravel is exploration: 'o' makes your character move
 to the nearest unexplored area. This can be dangerous -- do not use it
@@ -443,8 +443,8 @@ also appears in Appendix 4 of this text. Various other help texts are
 available as well, including this manual. You can also read the logbook
 from there by pressing ':'. Note that several commands have their own
 help screens, among them are targeting ('f'), level map ('X'), travel
-('Ctrl-G') and searching ('Ctrl-F'); again, press '?' when asked for
-input.
+('Ctrl-G' or 'G') and searching ('Ctrl-F'); again, press '?' when asked
+for input.
 
 If you don't like the standard keyset (either because some keys do not
 work properly, or because you want to decrease the amount of typing
@@ -2252,12 +2252,12 @@ Movement:
                         Autoexploration will open doors on its own
                         except if you set easy_open to false.
     Ctrl-G              Interlevel travel (to arbitrary dungeon levels
-                        or waypoints). Remembers old destinations if
+    or   G              or waypoints). Remembers old destinations if
                         interrupted. This command has its own set of
                         shortcuts; use ? for help on them.
     Ctrl-W              Set waypoint (a digit between 0 and 9). Check
                         the option show_waypoints. You can go to a
-                        waypoint by pressing Ctrl-G and the digit.
+                        waypoint by pressing Ctrl-G or G and the digit.
 
 Resting and Searching:
     s, Del, . or        Rests and searches (these are not distinguished)
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc
index 2ac242a32d..043182e73a 100644
--- a/crawl-ref/source/acr.cc
+++ b/crawl-ref/source/acr.cc
@@ -3476,6 +3476,7 @@ static command_type _keycode_to_command( keycode_type key )
     case 'D': return CMD_NO_CMD;
     case 'E': return CMD_EXPERIENCE_CHECK;
     case 'F': return CMD_THROW_ITEM_NO_QUIVER;
+    case CONTROL('G'):
     case 'G': return CMD_INTERLEVEL_TRAVEL;
     case 'I': return CMD_DISPLAY_SPELLS;
     case 'M': return CMD_MEMORISE_SPELL;
@@ -3533,7 +3534,6 @@ static command_type _keycode_to_command( keycode_type key )
     case CONTROL('C'): return CMD_CLEAR_MAP;
     case CONTROL('E'): return CMD_FORGET_STASH;
     case CONTROL('F'): return CMD_SEARCH_STASHES;
-    case CONTROL('G'): return CMD_INTERLEVEL_TRAVEL;
     case CONTROL('I'): return CMD_NO_CMD; // Tab on most systems
     case CONTROL('M'): return CMD_NO_CMD; // Enter on most systems
     case CONTROL('O'): return CMD_DISPLAY_OVERMAP;
diff --git a/crawl-ref/source/command.cc b/crawl-ref/source/command.cc
index 35333535c7..6ebf009edf 100644
--- a/crawl-ref/source/command.cc
+++ b/crawl-ref/source/command.cc
@@ -1885,8 +1885,8 @@ static void _add_formatted_keyhelp(column_composer &cols)
             "<h>Additional help:\n"
             "Many commands have context sensitive \n"
             "help, among them <w>X</w>, <w>x</w>, <w>f</w> (or any \n"
-            "form of targeting), <w>G</w> and <w>Ctrl-F</w>."
-            "\n",
+            "form of targeting), <w>Ctrl-G</w> or <w>G</w>, and \n"
+            "<w>Ctrl-F</w>.\n",
             true, true, _cmdhelp_textfilter);
 }
 
diff --git a/crawl-ref/source/tutorial.cc b/crawl-ref/source/tutorial.cc
index 2bf6ebc4aa..52404c0875 100644
--- a/crawl-ref/source/tutorial.cc
+++ b/crawl-ref/source/tutorial.cc
@@ -821,9 +821,10 @@ void tutorial_finished()
     else if (Options.tut_travel)
     {
         text =  "There is a convenient way for travelling between far away "
-                "dungeon levels: press <w>Ctrl-G</w> and enter the desired "
-                "destination. If your travel gets interrupted, issuing "
-                "<w>Ctrl-G Enter</w> will continue it.";
+                "dungeon levels: press <w>Ctrl-G</w> or <w>G</w> and enter "
+                "the desired destination. If your travel gets interrupted, "
+                "issuing <w>Ctrl-G Enter</w> or <w>G Enter</w> will continue "
+                "it.";
     }
     else if (Options.tut_stashes)
     {
diff --git a/crawl-ref/source/util/docs/quickstart.tex b/crawl-ref/source/util/docs/quickstart.tex
index 5b6a72ecfd..77b13ecdf3 100644
--- a/crawl-ref/source/util/docs/quickstart.tex
+++ b/crawl-ref/source/util/docs/quickstart.tex
@@ -162,7 +162,7 @@ the beginning.
 \key{p} prays (press \key{\^} for god information) \\
 \key{Ctrl-P} shows previous messages \\
 \key{Ctrl-F} searches for items dungeon-wide \\
-\key{G} provides automated travel between levels \\
+\key{Ctrl-G} or \key{G} provides automated travel between levels \\
 \key{o} provides automated exploration \\
 \key{\#} dumps character to the file \texttt{name.txt} \\
 \key{=} reassigns inventory or spell letters \\