style

[lyx.git] / src / BufferView.cpp

diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index d26f9496870c54021cd68e9bdff60092592e54ed..2d3df5f8661e3a50eb231952daf874799646112d 100644 (file)
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -62,6 +62,8 @@
 #include "insets/InsetRef.h"
 #include "insets/InsetText.h"
 
+#include "mathed/MathData.h"
+
 #include "frontends/alert.h"
 #include "frontends/Application.h"
 #include "frontends/Delegates.h"
@@ -1079,7 +1081,6 @@ bool BufferView::getStatus(FuncRequest const & cmd, FuncStatus & flag)
        case LFUN_BIBTEX_DATABASE_ADD:
        case LFUN_BIBTEX_DATABASE_DEL:
        case LFUN_STATISTICS:
-       case LFUN_BRANCH_ADD_INSERT:
        case LFUN_KEYMAP_OFF:
        case LFUN_KEYMAP_PRIMARY:
        case LFUN_KEYMAP_SECONDARY:
@@ -1154,6 +1155,10 @@ bool BufferView::getStatus(FuncRequest const & cmd, FuncStatus & flag)
                flag.setEnabled(cur.inset().allowParagraphCustomization(cur.idx()));
                break;
 
+       case LFUN_BRANCH_ADD_INSERT:
+               flag.setEnabled(!(cur.inTexted() && cur.paragraph().isPassThru()));
+               break;
+
        case LFUN_DIALOG_SHOW_NEW_INSET:
                // FIXME: this is wrong, but I do not understand the
                // intent (JMarc)
@@ -1496,6 +1501,8 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
 
        case LFUN_WORD_FIND_FORWARD:
        case LFUN_WORD_FIND_BACKWARD: {
+               // FIXME THREAD
+               // Would it maybe be better if this variable were view specific anyway?
                static docstring last_search;
                docstring searched_string;
 
@@ -1513,8 +1520,14 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
                docstring const data =
                        find2string(searched_string, true, false, fw);
                bool found = lyxfind(this, FuncRequest(LFUN_WORD_FIND, data));
-               if (found)
+               if (found) {
                        dr.screenUpdate(Update::Force | Update::FitCursor);
+                       cur.dispatched();
+                       dispatched = true;
+               } else {
+                       cur.undispatched();
+                       dispatched = false;
+               }
                break;
        }
 
@@ -1526,10 +1539,14 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
                        lyx::dispatch(FuncRequest(LFUN_DIALOG_SHOW, "findreplace"));
                        break;
                }
-               if (lyxfind(this, req))
+               if (lyxfind(this, req)) {
                        dr.screenUpdate(Update::Force | Update::FitCursor);
-               else
-                       message(_("String not found."));
+                       cur.dispatched();
+                       dispatched = true;
+               } else {
+                       cur.undispatched();
+                       dispatched = false;
+               }
                d->search_request_cache_ = req;
                break;
        }
@@ -1551,6 +1568,11 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
                if (lyxreplace(this, cmd, has_deleted)) {
                        dr.forceBufferUpdate();
                        dr.screenUpdate(Update::Force | Update::FitCursor);
+                       cur.dispatched();
+                       dispatched = true;
+               } else {
+                       cur.undispatched();
+                       dispatched = false;
                }
                break;
        }
@@ -2476,7 +2498,8 @@ void BufferView::putSelectionAt(DocIterator const & cur,
 
 bool BufferView::selectIfEmpty(DocIterator & cur)
 {
-       if (!cur.paragraph().empty())
+       if ((cur.inTexted() && !cur.paragraph().empty())
+           || (cur.inMathed() && !cur.cell().empty()))
                return false;
 
        pit_type const beg_pit = cur.pit();