forgot this

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_4_X@14972 a592a061-630c-0410-9148-cb99ea01b6c8

src/ChangeLog

@@ -1,4 +1,17 @@
-1006-09-07  Enrico Forestieri <[EMAIL PROTECTED]>
+2006-09-11  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+	* lfuns.h:
+	* LyXAction.C: new LFUN inset-dissolve (bug 2201).
+	
+	* text.C (dissolveInset): new method.
+	(erase, backspace): use dissolveInset.
+
+	* text3.C (dispatch): implement LFUN_INSET_DISSOLVE using
+	dissolveInset.
+	(getStatus): disable LFUN_INSET_DISSOLVE if the inset has more
+	than one cell. 
+
+2006-09-07  Enrico Forestieri <forenr@tlc.unipr.it>
 
 	* messages.C (Messages::get): don't warn about locale on cygwin
 	as it is not supported.

status.14x

@@ -22,6 +22,15 @@ What's new
 - All shell scripts have been translated to python so sh.exe is no
   longer needed. That's a big plus for the Windows port.
 
+- implement inset-dissolve feature; this can be accessed (like in
+  mathed) by pressing Backspace at the start of an inset, or Delete at
+  the end (bug 2201).
+
+- Add buttons for \intop and \ointop to the math panel (bug 2698)
+
+- Native support for \phantom, \hphantom and \vphantom in mathed (bug 1473).
+  There is no Menu/Toolbar/Math panel entry yet, only display on screen.
+
 - Some small updates to the documentation.
 
 - Updated Czech (new), Italian (bug 2774) and German (bug 2718).
@@ -30,11 +39,6 @@ What's new
 - Updated Czech (Tutorial, new splash) and German (UserGuide,
   Extended) documentation.
 
-- Add buttons for \intop and \ointop to the math panel (bug 2698)
-
-- Native support for \phantom, \hphantom and \vphantom in mathed (bug 1473).
-  There is no Menu/Toolbar/Math panel entry yet, only display on screen.
-
 ** Bug fixes:
 
 * Document Input/Output