From c4b2613c6b791a087affa244ef3bcf965246a347 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Thu, 19 Jul 2001 15:32:13 +0000 Subject: [PATCH] small things git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2287 a592a061-630c-0410-9148-cb99ea01b6c8 --- ChangeLog | 5 +++++ configure.in | 2 +- lib/ChangeLog | 2 +- src/ChangeLog | 4 ++-- src/frontends/controllers/ChangeLog | 5 +++++ src/frontends/controllers/biblio.C | 2 +- 6 files changed, 15 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index cfce3e9cc7..b73c5e0f1d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-07-19 Jean-Marc Lasgouttes + + * configure.in: remove extra action for AC_OUTPUT (not needed + anymore with gettext 0.10.38) + 2001-07-05 Jean-Marc Lasgouttes * INSTALL: update various requirements diff --git a/configure.in b/configure.in index d9fe16d7ec..f0843f7aa5 100644 --- a/configure.in +++ b/configure.in @@ -313,7 +313,7 @@ AC_OUTPUT([Makefile \ src/frontends/xforms/Makefile \ src/frontends/qt2/Makefile \ src/frontends/gnome/Makefile \ -], [sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile]) +]) cat < +2001-07-12 Kayvan A. Sylvan * layouts/literate-scrap.inc: Added PassThru tag diff --git a/src/ChangeLog b/src/ChangeLog index d47f2a8eb6..ea3292dbf1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -127,7 +127,7 @@ * sp_form.[Ch]: removed * spellchecker.[Ch]: removed -2001-07-12 Kayvan A. Sylvan +2001-07-12 Kayvan A. Sylvan * paragraph_pimpl.C (simpleTeXBlanks): Simply return if pass_thru is set. @@ -913,7 +913,7 @@ * bufferlist.C (emergencyWrite): fix assert() call -2001-05-04 Kayvan A. Sylvan +2001-05-04 Kayvan A. Sylvan * text.C (InsertChar): Added trivial patch to only send the "you can not do multiple spaces this way" message once during a diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog index c4714f0443..9d1133d01c 100644 --- a/src/frontends/controllers/ChangeLog +++ b/src/frontends/controllers/ChangeLog @@ -1,3 +1,8 @@ +2001-07-19 Jean-Marc Lasgouttes + + * biblio.C (getInfo): add a .c_str() to handle the usual + stringstream pain. + 2001-07-19 Angus Leeming * ControlCitation.[Ch]: changes associated with adding natbib support. diff --git a/src/frontends/controllers/biblio.C b/src/frontends/controllers/biblio.C index 91a4d57fd5..9b2096e0c9 100644 --- a/src/frontends/controllers/biblio.C +++ b/src/frontends/controllers/biblio.C @@ -281,7 +281,7 @@ string const getInfo(InfoMap const & map, string const & key) if (result.str().empty()) // not a BibTeX record result << it->second; - return result.str(); + return result.str().c_str(); } -- 2.39.2