From d91eacb901b62344a292ca74aa683bc83b673b87 Mon Sep 17 00:00:00 2001 From: William Hubbs Date: Fri, 15 Oct 2010 22:13:33 -0500 Subject: [PATCH] --- yaml --- r: 220386 b: refs/heads/master c: f976520bee1ca20c5ff73ffc277b71545b698b7a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/speakup/i18n.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 1d68bfd43a85..7959c172a2ed 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2b6d83d6623dfc4ea036b62b405ce206edfcaa52 +refs/heads/master: f976520bee1ca20c5ff73ffc277b71545b698b7a diff --git a/trunk/drivers/staging/speakup/i18n.c b/trunk/drivers/staging/speakup/i18n.c index 7a0c833c9ac4..c2119433f333 100644 --- a/trunk/drivers/staging/speakup/i18n.c +++ b/trunk/drivers/staging/speakup/i18n.c @@ -42,7 +42,8 @@ static char *speakup_default_msgs[MSG_LAST_INDEX] = { [MSG_GOTO] = "go to?", [MSG_LEAVING_HELP] = "leaving help", [MSG_IS_UNASSIGNED] = "is unassigned", - [MSG_HELP_INFO] = "press space to leav help, cursor up or down to scroll, or a letter to go to commands in list", + [MSG_HELP_INFO] = + "press space to exit, up or down to scroll, or a letter to go to a command", [MSG_EDGE_TOP] = "top,", [MSG_EDGE_BOTTOM] = "bottom,", [MSG_EDGE_LEFT] = "left,", @@ -550,8 +551,10 @@ ssize_t msg_set(enum msg_index_t index, char *text, size_t length) if (newstr) { memcpy(newstr, text, length); newstr[length] = '\0'; - if ((index >= MSG_FORMATTED_START && index <= MSG_FORMATTED_END) - && !fmt_validate(speakup_default_msgs[index], newstr)) { + if ((index >= MSG_FORMATTED_START + && index <= MSG_FORMATTED_END) + && !fmt_validate(speakup_default_msgs[index], + newstr)) { return -EINVAL; } spk_lock(flags);