X-Git-Url: https://mudpy.org/gitweb?p=mudpy.git;a=blobdiff_plain;f=mudpy%2Fmisc.py;h=dce3ea6c84c7b0ccdc1782a4d5d7601414ef3b6b;hp=b4009c90c9cf9e9dafb6962e330084da75853735;hb=da204426401f781b90121eac018166bcde5ee211;hpb=f0c07e0cbc98ffc01b59d15a0e9854b04ebc8a78

diff --git a/mudpy/misc.py b/mudpy/misc.py
index b4009c9..dce3ea6 100644
--- a/mudpy/misc.py
+++ b/mudpy/misc.py
@@ -663,7 +663,17 @@ class User:
 
     def prompt(self):
         """"Generate and return an input prompt."""
-        return self.account.get("prompt", ">") + " "
+
+        # Start with the user's preference, if one was provided
+        prompt = self.account.get("prompt")
+
+        # If the user has not set a prompt, then immediately return the default
+        # provided for the current state
+        if not prompt:
+            return get_menu_prompt(self.state)
+
+        # Return the cooked prompt
+        return "%s " % prompt
 
     def adjust_echoing(self):
         """Adjust echoing to match state menu requirements."""