Merge branch 'NetHack-3.7' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.7

doc/Guidebook.mn

@@ -870,9 +870,6 @@ Quaff (drink) something (potion, water, etc).
 Select an object for your quiver, quiver sack, or just generally at
 the ready (only one of these is available at a time).
 You can then throw this (or one of these) using the \(oqf\(cq command.
-.lp ""
-(In versions prior to 3.3 this was the command to quit
-the game, which has been moved to \(lq#quit\(rq.)
 .lp r
 Read a scroll or spellbook.
 .lp R
@@ -1407,7 +1404,6 @@ Default key is \(oqq\(cq.
 .lp "#quit    "
 Quit the program without saving your game.
 Autocompletes.
-Default key is \(oqM-q\(cq.
 .lp ""
 Since using this command by accident would throw away the current game,
 you are asked to confirm your intent before quitting.
@@ -1759,8 +1755,6 @@ option is enabled)
 #overview
 .lp M-p
 #pray
-.lp M-q
-#quit
 .lp M-r
 #rub
 .lp M-R

doc/Guidebook.tex

@@ -953,11 +953,7 @@ Quaff (drink) something (potion, water, etc).
 \item[\tb{Q}]
 Select an object for your quiver, quiver sack, or just generally at
 the ready (only one of these is available at a time).  You can then throw
-this (or one of these) using
+this (or one of these) using the `f' command.
-the `f' command.\\
-%.lp ""
-(In versions prior to 3.3 this was the command to quit
-the game, which has been moved to ``{\tt \#quit}''.)
 %.lp
 \item[\tb{r}]
 Read a scroll or spellbook.
@@ -1500,8 +1496,7 @@ Put on an accessory (ring, amulet, etc). Default key is `{\tt P}'.
 Quaff (drink) something. Default key is `{\tt q}'.
 %.lp
 \item[\tb{\#quit}]
-Quit the program without saving your game. Autocompletes.
+Quit the program without saving your game. Autocompletes.\\
-Default key is `{\tt M-q}'.\\
 %.lp ""
 Since using this command by accident would throw away the current game,
 you are asked to confirm your intent before quitting.
@@ -1893,9 +1888,6 @@ another command, so the three key combination meta+shift+letter is needed.
 \item[\tb{M-p}]
 {\tt\#pray}
 %.Ip
-\item[\tb{M-q}]
-{\tt\#quit}
-%.lp
 \item[\tb{M-r}]
 {\tt\#rub}
 %.lp

doc/fixes37.0

@@ -539,6 +539,7 @@ when moving the cursor to examine the map, have '^' move to next trap even if
 	that trap is displayed with some other symbol (web, vibrating square)
 change valkyrie and warrior (valk quest) monsters from chaotic to lawful
 change attendant (healer quest) monster from lawful to neutral
+quit is not longer bound to M-q
 
 
 Fixes to 3.7.0-x Problems that Were Exposed Via git Repository

src/cmd.c

@@ -1908,7 +1908,7 @@ struct ext_func_tab extcmdlist[] = {
               doputon, 0, NULL },
     { 'q',    "quaff", "quaff (drink) something",
               dodrink, 0, NULL },
-    { M('q'), "quit", "exit without saving current game",
+    { '\0', "quit", "exit without saving current game",
               done2, IFBURIED | AUTOCOMPLETE | GENERALCMD, NULL },
     { 'Q',    "quiver", "select ammunition for quiver",
               dowieldquiver, 0, NULL },