[LyX/2.1.x] Fix bugs #6078 and #9364

[Guillaume Munch]

commit 4b62267814edd145cd0a68b9078b3e04b5a8263a
Author: Guillaume Munch <g...@lyx.org>
Date:   Sat Aug 29 01:51:38 2015 +0100

    Fix bugs #6078 and #9364
    
    Remove unwanted clearSelection()s in MathData::updateMacros(). These calls 
broke
    text selection with keyboard and mouse, search-and-replace, restoring 
selection
    after Undo, etc. in a document with math macros since 1.6.0. (Regression at
    6aa54673 and 12314897)
    
    I do not know the purpose of these calls, but the selection code has been 
worked
    on since, and I cannot produce undesired behaviour after removing
    them.
    
    (cherry-picked from 89342f2946ab
    
    Conflicts:
        src/mathed/MathData.cpp
    )

diff --git a/src/mathed/MathData.cpp b/src/mathed/MathData.cpp
index edd8089..6095b47 100644
--- a/src/mathed/MathData.cpp
+++ b/src/mathed/MathData.cpp
@@ -431,13 +431,8 @@ void MathData::updateMacros(Cursor * cur, MacroContext 
const & mc,
                if (oldDisplayMode == MathMacro::DISPLAY_NORMAL
                    && (macroInset->arity() != macroNumArgs
                        || macroInset->optionals() != macroOptionals
-                       || newDisplayMode == MathMacro::DISPLAY_UNFOLDED)) {
-
+                       || newDisplayMode == MathMacro::DISPLAY_UNFOLDED))
                        detachMacroParameters(cur, i);
-                       // FIXME: proper anchor handling, this removes the 
selection
-                       if (cur)
-                               cur->clearSelection();
-               }
 
                // the macro could have been copied while resizing this
                macroInset = operator[](i).nucleus()->asMacro();
@@ -475,12 +470,9 @@ void MathData::updateMacros(Cursor * cur, MacroContext 
const & mc,
                        // attach parameters
                        attachMacroParameters(cur, i, macroNumArgs, 
macroOptionals,
                                fromInitToNormalMode, interactive, appetite);
-                       
-                       if (cur) {
-                               // FIXME: proper anchor handling, this removes 
the selection
+
+                       if (cur)
                                cur->updateInsets(&cur->bottom().inset());
-                               cur->clearSelection();  
-                       }
                }
 
                // Give macro the chance to adapt to new situation.
diff --git a/status.21x b/status.21x
index 6c6b8a3..6f343fc 100644
--- a/status.21x
+++ b/status.21x
@@ -37,7 +37,9 @@ What's new
 
 * USER INTERFACE
 
-- Add \ensuremath to the list of math completions
+- Add \ensuremath to the list of math completions.
+
+- The entries in the outliner are no longer truncated at 40 chars. (bug 9579)
 
 
 
@@ -85,6 +87,9 @@ What's new
 
 - Fix a crash with the outliner when switching documents (bug 9754).
 
+- Repaired selection of text and search-and-replace in the presence of math
+  macros. The selection is no longer cleared unvolontarily. (bugs 6078, 9364)
+
 
 * INTERNALS
 
@@ -97,6 +102,9 @@ What's new
 
 - German UserGuide: fix many typos
 
+- French: "Rechercher" and "Remplacer" are no longer bound to the same
+  accelerator
+
 
 
 * LYXHTML