diff options
| author | Eduardo Chappa <chappa@washington.edu> | 2015-03-25 20:27:02 -0600 |
|---|---|---|
| committer | Eduardo Chappa <chappa@washington.edu> | 2015-03-25 20:27:02 -0600 |
| commit | 3a9d4c01e5135f6d5b2aecdaf698d1d960387df9 (patch) | |
| tree | 01b45596b7334d2f9d1298f099ca4f037f2e69b7 /pico/search.c | |
| parent | 955a543f9ac3bb29b88a42d0520ac68324c2f6fa (diff) | |
| download | alpine-3a9d4c01e5135f6d5b2aecdaf698d1d960387df9.tar.xz | |
* new version 2.20.4
* If the charset of a message can not be determined, use the value set
in the "Unknown Character Set" option.
* Resizing setup screen will redraw screen.
* Unix Alpine only. Experimental: If Alpine/Pico finds a UCS4 code
in the width ambiguous zone, it will use other means to determine
the width, such as call wcwidth.
Diffstat (limited to 'pico/search.c')
| -rw-r--r-- | pico/search.c | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/pico/search.c b/pico/search.c index f2a5389f..e90a403f 100644 --- a/pico/search.c +++ b/pico/search.c @@ -712,11 +712,6 @@ srpat(char *utf8prompt, UCS *defpat, size_t defpatlen, int repl_mode, int flags) menu_pat[i].key = (CTRL|'R'); KS_OSDATASET(&menu_pat[i], KS_NONE); - menu_pat[++i].name = "^^"; - menu_pat[i].label = bol ? N_("End Line") : eol ? N_("Anywhere") : N_("Bgn Line") ; - menu_pat[i].key = (CTRL|'^'); - KS_OSDATASET(&menu_pat[i], KS_NONE); - if(!repl_mode){ menu_pat[++i].name = "^T"; menu_pat[i].label = N_("LineNumber"); @@ -748,6 +743,11 @@ srpat(char *utf8prompt, UCS *defpat, size_t defpatlen, int repl_mode, int flags) menu_pat[i].key = (CTRL|'P'); KS_OSDATASET(&menu_pat[i], KS_NONE); + menu_pat[++i].name = "^^"; + menu_pat[i].label = bol ? N_("End Line") : eol ? N_("Anywhere") : N_("Bgn Line") ; + menu_pat[i].key = (CTRL|'^'); + KS_OSDATASET(&menu_pat[i], KS_NONE); + menu_pat[++i].name = NULL; b = utf8_to_ucs4_cpystr(utf8prompt); @@ -908,17 +908,7 @@ readpattern(char *utf8prompt, int text_mode, int flags) menu_pat[i].key = (CTRL|'V'); KS_OSDATASET(&menu_pat[i], KS_NONE); - menu_pat[++i].name = "^^"; - menu_pat[i].label = bol ? N_("End Line") : eol ? N_("Anywhere") : N_("Bgn Line") ; - menu_pat[i].key = (CTRL|'^'); - KS_OSDATASET(&menu_pat[i], KS_NONE); - if(text_mode){ - menu_pat[++i].name = "^^"; - menu_pat[i].label = N_("Begn of Line"); - menu_pat[i].key = (CTRL|'^'); - KS_OSDATASET(&menu_pat[i], KS_NONE); - menu_pat[++i].name = "^T"; menu_pat[i].label = N_("LineNumber"); menu_pat[i].key = (CTRL|'T'); @@ -938,6 +928,11 @@ readpattern(char *utf8prompt, int text_mode, int flags) menu_pat[i].label = N_("FullJustify"); menu_pat[i].key = (CTRL|'U'); KS_OSDATASET(&menu_pat[i], KS_NONE); + + menu_pat[++i].name = "^^"; + menu_pat[i].label = bol ? N_("End Line") : eol ? N_("Anywhere") : N_("Bgn Line") ; + menu_pat[i].key = (CTRL|'^'); + KS_OSDATASET(&menu_pat[i], KS_NONE); } menu_pat[++i].name = "^P"; |