fix startup failure

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

diff --git a/ChangeLog b/ChangeLog
index 26b8476d2be1591b47dc3da6437d9a35c64edb2c..9f2ed701a481003b6ab8773c05ba21c132d1e5ee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-02-04  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
+
+       * README: change reference to bugtracker
+
 2002-01-17  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
 
        * configure.in (ALL_LINGUAS): add slovak

diff --git a/README b/README
index d71b2774843dec2b1ec6c1ad67de716a123d99c4..7d3b882bff23e831f57f72238a08871d67b6306b 100644 (file)
--- a/README
+++ b/README
@@ -192,7 +192,7 @@ How do I submit a bug report?
        You'll find detailed info on submitting bug reports there.
 
        If you can't do that, send details to the LyX Developers mailing
-       list, or use the LyX bug tracker at http://lyxbugs.sf.net/.
+       list, or use the LyX bug tracker at http://bugzilla.lyx.org/.
        Don't forget to mention which version you are having problems with!
 
 How can I participate in the development of LyX? 

diff --git a/lib/configure b/lib/configure
index bc348bd6d29f6da00c9bdd8176c221652d3fe2b5..d8b9b99ce17f7d23d5bcb8775f37de48bb8cddd9 100755 (executable)
--- a/lib/configure
+++ b/lib/configure
@@ -1170,6 +1170,7 @@ if test "$TOXPM" = "convert"; then
        eps_to_xpm="convert EPS:\$\$i XPM:\$\$o" 
        jpg_to_xpm="convert JPG:\$\$i XPM:\$\$o"
        png_to_xpm="convert PNG:\$\$i XPM:\$\$o"
+       ps_to_xpm="convert PS:\$\$i XPM:\$\$o" 
 fi
 
 echo $ac_n "checking For an EPS -> PDF converter""... $ac_c"

diff --git a/src/ColorHandler.C b/src/ColorHandler.C
index 54968146a15d00d5d4ea0ae8b80d10b988e924aa..416f09fea706e055c519c15c4c972f29d4faa818 100644 (file)
--- a/src/ColorHandler.C
+++ b/src/ColorHandler.C
@@ -86,7 +86,7 @@ GC LyXColorHandler::getGCForeground(LColor::color c)
         if (XLookupColor(display, colormap, s.c_str(), &xcol, &ccol) == 0) {
                lyxerr << _("LyX: Unknown X11 color ") << s
                       << _(" for ") << lcolor.getGUIName(c) << '\n'
-                      << _("     Using black instead, sorry!.") << endl;
+                      << _("     Using black instead, sorry!") << endl;
                unsigned long bla = BlackPixel(display,
                                               DefaultScreen(display));
                val.foreground = bla;

diff --git a/src/support/ChangeLog b/src/support/ChangeLog
index e513ec93e3d73b4f9f02417101628b3780258cb5..1a1c14feb06bc8bb8ee571ceb2e692fab9fec417 100644 (file)
--- a/src/support/ChangeLog
+++ b/src/support/ChangeLog
@@ -1,3 +1,8 @@
+2002-02-04  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
+
+       * filetools.C (FileOpenSearch): remove duplicated line, probably
+       resulting from bad cut-and paste.
+
 2002-01-31  Herbert Voss  <voss@perce.de>
 
        * filetools.[Ch]: add getExtFromContents(), which returns

diff --git a/src/support/filetools.C b/src/support/filetools.C
index a666079437df35d306422d23992eeada4821e49d..1846e98e3ee4089e472ec35be051ba3274403c7e 100644 (file)
--- a/src/support/filetools.C
+++ b/src/support/filetools.C
@@ -186,7 +186,6 @@ string const FileOpenSearch (string const & path, string const & name,
                        do {
                                tmppath = split(tmppath, path_element, ';');
                        } while (!tmppath.empty() && path_element.empty());
-                               tmppath = split(tmppath, path_element, ';');
                } else {
                        notfound = false;
                }