Move LFUN_WORD_FIND_FORWARD and LFUN_WORD_FIND_BACKWARD to their friends in BufferView.

[features.git] / src / BufferView.cpp

diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index 7b1b778dd62cc4f6539714753ebd2cdec39ce364..9b16202c3adffc77b27510bf6f367e3f7ac2a0f3 100644 (file)
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -922,6 +922,8 @@ bool BufferView::getStatus(FuncRequest const & cmd, FuncStatus & flag)
        case LFUN_NOTE_NEXT:
        case LFUN_REFERENCE_NEXT:
        case LFUN_WORD_FIND:
+       case LFUN_WORD_FIND_FORWARD:
+       case LFUN_WORD_FIND_BACKWARD:
        case LFUN_WORD_FINDADV:
        case LFUN_WORD_REPLACE:
        case LFUN_MARK_OFF:
@@ -1225,6 +1227,28 @@ bool BufferView::dispatch(FuncRequest const & cmd)
                processUpdateFlags(Update::Force | Update::FitCursor);
                break;
 
+       case LFUN_WORD_FIND_FORWARD:
+       case LFUN_WORD_FIND_BACKWARD: {
+               static docstring last_search;
+               docstring searched_string;
+
+               if (!cmd.argument().empty()) {
+                       last_search = cmd.argument();
+                       searched_string = cmd.argument();
+               } else {
+                       searched_string = last_search;
+               }
+
+               if (searched_string.empty())
+                       break;
+
+               bool const fw = cmd.action == LFUN_WORD_FIND_FORWARD;
+               docstring const data =
+                       find2string(searched_string, true, false, fw);
+               find(this, FuncRequest(LFUN_WORD_FIND, data));
+               break;
+       }
+
        case LFUN_WORD_FIND: {
                FuncRequest req = cmd;
                if (cmd.argument().empty() && !d->search_request_cache_.argument().empty())