Changeset 449c682

Timestamp:

Sep 18, 2010, 3:17:27 PM (14 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.7, release-1.8, release-1.9

Children:

5b68c05

Parents:

72f613a

git-author:

David Benjamin <davidben@mit.edu> (07/31/10 18:12:41)

git-committer:

David Benjamin <davidben@mit.edu> (09/18/10 15:17:27)

Message:

Honor the do_search argument to _owl_fmtext_curs_waddstr

It hasn't done anything since 41c9a9675faf455c3c6adfbc629faf55ddbfe10f.
This also makes the viewwin explicitly request search highlighting,
to preserve old behavior.

Files:

• fmtext.c (modified) (2 diffs)
• viewwin.c (modified) (1 diff)

fmtext.c

@@ -299 +299 @@
       tmp = p[0];
       p[0] = '\0';
-      if (owl_global_is_search_active(&g)) {
+      if (do_search && owl_global_is_search_active(&g)) {
         /* Search is active, so highlight search results. */
         char tmp2;
@@ -364 +364 @@
 void owl_fmtext_curs_waddstr(const owl_fmtext *f, WINDOW *w)
 {
-  _owl_fmtext_curs_waddstr(f, w, owl_global_is_search_active(&g));
+  _owl_fmtext_curs_waddstr(f, w, 1);
 }
 

viewwin.c

@@ -88 +88 @@
   owl_fmtext_truncate_cols(&fm1, v->rightshift, wincols-1+v->rightshift, &fm2);
 
-  owl_fmtext_curs_waddstr_without_search(&fm2, curswin);
+  owl_fmtext_curs_waddstr(&fm2, curswin);
 
   /* print the message at the bottom */