Fixed issue #8543 also for advanced search (cursor moved at proper end of selection...

diff --git a/src/lyxfind.cpp b/src/lyxfind.cpp
index a81e293fc2a8bcc65f0acd2368519c65f54d10d6..a4ae87093026c5d52469ced869340faaf36b72a5 100644 (file)
--- a/src/lyxfind.cpp
+++ b/src/lyxfind.cpp
@@ -1422,6 +1422,9 @@ bool findAdv(BufferView * bv, FindAndReplaceOptions const & opt)
 
        try {
                MatchStringAdv matchAdv(bv->buffer(), opt);
+               int length = bv->cursor().selectionEnd().pos() - bv->cursor().selectionBegin().pos();
+               if (length > 0)
+                       bv->putSelectionAt(bv->cursor().selectionBegin(), length, !opt.forward);
                findAdvReplace(bv, opt, matchAdv);
                cur = bv->cursor();
                if (opt.forward)

diff --git a/status.20x b/status.20x
index 36ff77107dcf98cf587d468f3e2bf063256c1243..d35946afa40cc016cfbf761c50cffa0255751a68 100644 (file)
--- a/status.20x
+++ b/status.20x
@@ -214,6 +214,8 @@ What's new
 - Fixed problem when searching with regular expressions and ignore
   format off (bug 8382).
 
+- Cursor moved at proper end of selection before starting Find Advanced operation (fixing issue #8543 for advanced search)
+
 
 * BUILD/INSTALLATION