summaryrefslogtreecommitdiff
path: root/pico/search.c
diff options
context:
space:
mode:
authorEduardo Chappa <chappa@washington.edu>2015-04-23 00:24:07 -0600
committerEduardo Chappa <chappa@washington.edu>2015-04-23 00:24:07 -0600
commite2e8488ca2d18f2b0eedaa1bfc6826e8a11de025 (patch)
tree9843fcc18bc7739fc3f45503baa51006bd49dabf /pico/search.c
parent69b0d3a5dff7b8be0deada358dad1a55f319d769 (diff)
downloadalpine-e2e8488ca2d18f2b0eedaa1bfc6826e8a11de025.tar.xz
* new version 2.20.7.
* Fix documentation for search to beginning and to end of line, which had not been updated, even though the behavior had changed. * Exact search is sticky, that is, once an exact search is done, so will be the next ones. This is consistent with the default behavior where all searches are not exact. * Pico upgraded to versio 5.08. * some hunks of integrate.patch were added to this source code to make handling of menus consistent, and reduce the size of integrate.patch at the same time.
Diffstat (limited to 'pico/search.c')
-rw-r--r--pico/search.c15
1 files changed, 13 insertions, 2 deletions
diff --git a/pico/search.c b/pico/search.c
index 69979702..1aae21cf 100644
--- a/pico/search.c
+++ b/pico/search.c
@@ -172,7 +172,17 @@ forwsearch(int f, int n)
defpat[0] = '\0';
/* defaults: usual menu, search forward, not case sensitive */
- flags = SR_ORIGMEN | SR_FORWARD | SR_NOEXACT;
+
+ flags = SR_ORIGMEN | SR_FORWARD;
+
+ /* exact search is sticky -- that is, once one is done, so will be
+ * the next ones. This is consistent with all all searches being
+ * case insensitive by default.
+ */
+ if((curwp->w_bufp->b_mode & MDEXACT) == 0)
+ flags |= SR_NOEXACT;
+ else
+ flags |= SR_EXACTSR;
/* ask the user for the text of a pattern */
while(1){
@@ -934,8 +944,9 @@ readnumpat(char *utf8prompt)
{
int i, n;
char numpat[NPMT];
- EXTRAKEYS menu_pat[2];
+ EXTRAKEYS menu_pat[10];
+ memset(&menu_pat, 0, 10*sizeof(EXTRAKEYS));
menu_pat[i = 0].name = "^T";
menu_pat[i].label = N_("No Line Number");
menu_pat[i].key = (CTRL|'T');