small changes to autogen.sh and xforms_helpers suggested by rob lahaye

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

diff --git a/ChangeLog b/ChangeLog
index c6e71ac7f53262749b748e5222b8cee594fc2dfb..8d90a619bb59de6c1ecb145211c042f1574458d5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-10-09  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * autogen.sh: fix test that says whether m4 has been found
+
 2002-09-30  Angus Leeming  <leeming@lyx.org>
 
        * INSTALL: update notes on compilation with Compaq cxx.

diff --git a/autogen.sh b/autogen.sh
index 3c1e8a6e4fd368f3e107230b79b5470f4f7a3c37..cd49ec6ed4557334832b8a2890351d388d6aad66 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -46,7 +46,7 @@ for prog in $M4 gm4 gnum4 m4 ; do
     *) ;;
   esac
 done
-if test x$ok = xno ; then
+if test x$ok != xyes ; then
     echo "not found."
 fi
 

diff --git a/po/POTFILES.in b/po/POTFILES.in
index aff2b7b7945680f7654b457a3c75f1138b5d4464..11f1cc1f80e6762e8bb8e47ddd9db691e5b96376 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,7 +2,6 @@ src/BufferView.C
 src/BufferView_pimpl.C
 src/Chktex.C
 src/CutAndPaste.C
-src/FloatList.C
 src/LColor.C
 src/LaTeX.C
 src/LyXAction.C
@@ -19,6 +18,7 @@ src/frontends/controllers/ButtonController.h
 src/frontends/controllers/ControlAboutlyx.C
 src/frontends/controllers/ControlBibtex.C
 src/frontends/controllers/ControlCharacter.C
+src/frontends/controllers/ControlDocument.C
 src/frontends/controllers/ControlExternal.C
 src/frontends/controllers/ControlGraphics.C
 src/frontends/controllers/ControlInclude.C
@@ -44,7 +44,9 @@ src/frontends/qt2/QCharacter.C
 src/frontends/qt2/QCitation.C
 src/frontends/qt2/QCitationDialog.C
 src/frontends/qt2/QCommandBuffer.C
+src/frontends/qt2/QDelimiterDialog.C
 src/frontends/qt2/QDocument.C
+src/frontends/qt2/QDocumentDialog.C
 src/frontends/qt2/QERT.C
 src/frontends/qt2/QError.C
 src/frontends/qt2/QExternal.C
@@ -54,6 +56,7 @@ src/frontends/qt2/QGraphics.C
 src/frontends/qt2/QInclude.C
 src/frontends/qt2/QIndex.C
 src/frontends/qt2/QLog.C
+src/frontends/qt2/QMathDialog.C
 src/frontends/qt2/QMinipage.C
 src/frontends/qt2/QParagraph.C
 src/frontends/qt2/QPreamble.C
@@ -70,6 +73,7 @@ src/frontends/qt2/QThesaurus.C
 src/frontends/qt2/QToc.C
 src/frontends/qt2/QURL.C
 src/frontends/qt2/QVCLog.C
+src/frontends/qt2/QWrap.C
 src/frontends/qt2/lengthcombo.C
 src/frontends/xforms/Alert_pimpl.C
 src/frontends/xforms/ColorHandler.C

diff --git a/src/ChangeLog b/src/ChangeLog
index 17d79406f90ae846e3cbc62e8011ba8af1d85d24..863b380ef4af92882dae8d627def80ac21675143 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1147,7 +1147,6 @@
        * converter.C: add support for $$s (scripts from lib/scripts dir)
        * lyx_main.C: white space
 
-
 2002-07-17  John Levon  <moz@compsoc.man.ac.uk>
 
        * bufferlist.C:

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index 732a98f67147eac7679c1b139571a3760dc1d53d..1de999b6efd054e999dd5c71155a8a529d5b0127 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,8 @@
+2002-10-09  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * xforms_helpers.C (formatted): fix small typo, spotted by Rob
+       Lahaye 
+
 2002-10-08  Dekel Tsur  <dekelts@tau.ac.il>
 
        * FormRef.C (update): Always list the labels of the current buffer.

diff --git a/src/frontends/xforms/xforms_helpers.C b/src/frontends/xforms/xforms_helpers.C
index eccfa54a185968e333e9630b873aa1904000bc8f..b6409a6aaaf248f1813125787f51f63841c75ef3 100644 (file)
--- a/src/frontends/xforms/xforms_helpers.C
+++ b/src/frontends/xforms/xforms_helpers.C
@@ -137,7 +137,7 @@ void updateWidgetsFromLengthString(FL_OBJECT * input, FL_OBJECT * choice,
                fl_set_input(input, str.c_str());
                // we assume that "default_unit" is in the choice as "we"
                // have control over that!
-               // No need to check for it's precence in the choice, therefore.
+               // No need to check for its presence in the choice, therefore.
                fl_set_choice_text(choice, default_unit.c_str());
        } else {
                updateWidgetsFromLength(input, choice,
@@ -189,7 +189,7 @@ string formatted(string const & sin, int w, int size, int style)
        for(;;) {
                string::size_type const nxtpos1 = sin.find(' ',  curpos);
                string::size_type const nxtpos2 = sin.find('\n', curpos);
-               string::size_type const nxtpos = std::min(nxtpos1, nxtpos1);
+               string::size_type const nxtpos = std::min(nxtpos1, nxtpos2);
 
                string const word = nxtpos == string::npos ?
                        sin.substr(curpos) : sin.substr(curpos, nxtpos-curpos);