From 759d3523fc6c5a67a40ccf4e457251dcd592d8e3 Mon Sep 17 00:00:00 2001 From: Chris Allegretta Date: Thu, 27 Sep 2001 13:04:10 +0000 Subject: [PATCH] Search prompt changes, bracketed modifiers and to search at the front git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@790 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 5 +++++ search.c | 24 ++++++++++++++---------- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2d80dcde..2ca6c9da 100644 --- a/ChangeLog +++ b/ChangeLog @@ -44,6 +44,11 @@ CVS code - - corrected the Mouse Toggle section, noticed by Daniel Bonniot. - rcfile.c: - NUM_RCOPTS fix (DLR). +- search.c: + - Changed search prompt to "Search" followed by a list of + bracketed, free-standing modifiers that do not imply a grammar, + and the (to replace) string separately. Hopefully this resolves + the i18n problems that this provoked. - winio.c: - Add David Lawrence Ramsey to credits. bottombars() diff --git a/search.c b/search.c index 249f3e86..6fab9312 100644 --- a/search.c +++ b/search.c @@ -74,7 +74,6 @@ int search_init(int replacing) { int i = 0; char *buf; - char *prompt; static char *backupstring = NULL; #ifndef NANO_SMALL int j; @@ -126,19 +125,24 @@ int search_init(int replacing) else strcpy(buf, ""); - /* Instead of having a million if statements here to determine - the prompt, we instead just have a hundred "? :" calls in - the statusq call. I hope no one ever has to modify this :-) */ - prompt = "%s%s%s%s%s%s"; - /* This is now one simple call. It just does a lot */ i = statusq(0, replacing ? replace_list : whereis_list, replacing ? REPLACE_LIST_LEN : WHEREIS_LIST_LEN, backupstring, - prompt, - ISSET(CASE_SENSITIVE) ? _("Case Sensitive ") : "", - ISSET(USE_REGEXP) ? _("Regexp ") : "", + "%s%s%s%s%s%s", _("Search"), - ISSET(REVERSE_SEARCH) ? _(" Backwards") : "", + + /* This string is just a modifier for the search prompt, + no grammar is implied */ + ISSET(CASE_SENSITIVE) ? _(" [Case Sensitive]") : "", + + /* This string is just a modifier for the search prompt, + no grammar is implied */ + ISSET(USE_REGEXP) ? _(" [Regexp]") : "", + + /* This string is just a modifier for the search prompt, + no grammar is implied */ + ISSET(REVERSE_SEARCH) ? _(" [Backwards]") : "", + replacing ? _(" (to replace)") : "", buf); -- 2.39.5