small cleanups.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4910 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/BufferView2.C b/src/BufferView2.C
index f09e7bfeb8910921c66ce88ee98f2c08a81420c1..8edb8e76cb9c8d474a0d45e1d87c14702bd94496 100644 (file)
--- a/src/BufferView2.C
+++ b/src/BufferView2.C
@@ -336,40 +336,35 @@ bool BufferView::gotoLabel(string const & label)
 
 void BufferView::menuUndo()
 {
-       if (available()) {
-               owner()->message(_("Undo"));
-               hideCursor();
-               beforeChange(text);
-               update(text, BufferView::SELECT|BufferView::FITCUR);
-               if (!textUndo(this))
-                       owner()->message(_("No further undo information"));
-               else
-                       update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-               switchKeyMap();
-       }
+       if (!available())
+               return;
+ 
+       owner()->message(_("Undo"));
+       hideCursor();
+       beforeChange(text);
+       update(text, BufferView::SELECT|BufferView::FITCUR);
+       if (!textUndo(this))
+               owner()->message(_("No further undo information"));
+       else
+               update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+       switchKeyMap();
 }
 
 
 void BufferView::menuRedo()
 {
-#if 0 // this should not be here (Jug 20011206)
-       if (theLockingInset()) {
-               owner()->message(_("Redo not yet supported in math mode"));
+       if (!available())
                return;
-       }
-#endif
-
-       if (available()) {
-               owner()->message(_("Redo"));
-               hideCursor();
-               beforeChange(text);
-               update(text, BufferView::SELECT|BufferView::FITCUR);
-               if (!textRedo(this))
-                       owner()->message(_("No further redo information"));
-               else
-                       update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-               switchKeyMap();
-       }
+ 
+       owner()->message(_("Redo"));
+       hideCursor();
+       beforeChange(text);
+       update(text, BufferView::SELECT|BufferView::FITCUR);
+       if (!textRedo(this))
+               owner()->message(_("No further redo information"));
+       else
+               update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+       switchKeyMap();
 }
 
 

diff --git a/src/ChangeLog b/src/ChangeLog
index 23ef87f28881cd8b2f97412ff514a9ec0618914f..7cf6b7b4d37d41b65a93f1ca2d0484d74395f5f4 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2002-08-08  John Levon  <levon@movementarian.org>
+
+       * BufferView2.C: small cleanup
+ 
+       * lyxfind.h:
+       * lyxfind.C: move unnecessary header into the .C
+ 
 2002-08-08  John Levon  <levon@movementarian.org>
 
        * funcrequest.h: just tedious nonsense

diff --git a/src/lyxfind.C b/src/lyxfind.C
index de0857924fa21af12d56f6278f5f977aa056c233..597df35b6a3622b2c8e0695f04b86106ebc66b39 100644 (file)
--- a/src/lyxfind.C
+++ b/src/lyxfind.C
@@ -6,6 +6,7 @@
 
 #include "lyxtext.h"
 #include "lyxfind.h"
+#include "paragraph.h"
 #include "frontends/LyXView.h"
 #include "frontends/Alert.h"
 #include "support/textutils.h"

diff --git a/src/lyxfind.h b/src/lyxfind.h
index 4a211e1be401867d18877e60996c4f83fe085700..f86b8dec851bc2c29a3823f4aa6d202e38adc0db 100644 (file)
--- a/src/lyxfind.h
+++ b/src/lyxfind.h
@@ -7,9 +7,9 @@
 #endif
 
 #include "LString.h"
-#include "paragraph.h"
 
 class BufferView;
+class LyXText;
 
 namespace lyxfind {