summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsabetts <sabetts>2001-09-06 06:49:48 +0000
committersabetts <sabetts>2001-09-06 06:49:48 +0000
commitfdf305b75123f1ca5b7e08e951760a93a2c106fd (patch)
treeba1eb7e9b2dae3ca3cd17db767c72451b94d71c0
parente715a0843ad274149f7e3d6741235a2db19a320e (diff)
downloadratpoison-fdf305b75123f1ca5b7e08e951760a93a2c106fd.zip
* src/main.c (show_welcome_message): If the help key is bound to ?
then print ? instead of `question'. * src/main.c (show_welcome_message): new function (main): call show_welcome_message to show the welcome message.
-rw-r--r--ChangeLog3
-rw-r--r--src/main.c10
2 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ab09f71..bbb1d70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2001-09-05 shawn <sabetts@diggin.lamenet.tmp>
+ * src/main.c (show_welcome_message): If the help key is bound to ?
+ then print ? instead of `question'.
+
* configure.in: check for getopt and getopt_long.
* src/getopt.c: wrap the whole file in an #ifndef HAVE_GETOPT_LONG
diff --git a/src/main.c b/src/main.c
index af294d7..8d555aa 100644
--- a/src/main.c
+++ b/src/main.c
@@ -308,6 +308,8 @@ read_startup_files ()
}
}
+/* Odd that we spend so much code on making sure the silly welcome
+ message is correct. Oh well... */
static void
show_welcome_message ()
{
@@ -326,7 +328,13 @@ show_welcome_message ()
if (help)
{
- marked_message_printf (0, 0, MESSAGE_WELCOME, prefix, help);
+ /* A little kludge to use ? instead of `question' for the help
+ key. */
+ if (!strcmp (help, "question"))
+ marked_message_printf (0, 0, MESSAGE_WELCOME, prefix, "?");
+ else
+ marked_message_printf (0, 0, MESSAGE_WELCOME, prefix, help);
+
free (help);
}
else