From 41b2f113d7b225b1599aa794faaeb509f688e181 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Mon, 4 Feb 2002 10:41:30 +0000 Subject: [PATCH] fix startup failure git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3477 a592a061-630c-0410-9148-cb99ea01b6c8 --- ChangeLog | 4 ++++ README | 2 +- lib/configure | 1 + src/ColorHandler.C | 2 +- src/support/ChangeLog | 5 +++++ src/support/filetools.C | 1 - 6 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 26b8476d2b..9f2ed701a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2002-02-04 Jean-Marc Lasgouttes + + * README: change reference to bugtracker + 2002-01-17 Jean-Marc Lasgouttes * configure.in (ALL_LINGUAS): add slovak diff --git a/README b/README index d71b277484..7d3b882bff 100644 --- 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 bc348bd6d2..d8b9b99ce1 100755 --- 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 54968146a1..416f09fea7 100644 --- 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 e513ec93e3..1a1c14feb0 100644 --- a/src/support/ChangeLog +++ b/src/support/ChangeLog @@ -1,3 +1,8 @@ +2002-02-04 Jean-Marc Lasgouttes + + * filetools.C (FileOpenSearch): remove duplicated line, probably + resulting from bad cut-and paste. + 2002-01-31 Herbert Voss * filetools.[Ch]: add getExtFromContents(), which returns diff --git a/src/support/filetools.C b/src/support/filetools.C index a666079437..1846e98e3e 100644 --- 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; }