fix a bitfield bug

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 966b5a71ef6250aca2ac650b51e277f3133ca0fd..174d48c9bd9fb9f404d44f8309ae3667fd44b647 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-17  Lars Gullik Bjønnes  <larsbj@birdstep.com>
+
+       * lyxtextclass.C (Read): fix bit adding, bug discovered by Mike
+       Ressler.
+
 2002-04-16  Juergen Vigna  <jug@sad.it>
 
        * text2.C (setCursor): set also the irow().
@@ -8,7 +13,7 @@
 
        * lyxrow.h: added irow helper function same as other (i) functions.
 
-       * BufferView_pimpl.C (cursorPrevious): 
+       * BufferView_pimpl.C (cursorPrevious):
        (cursorNext): fixed for insets!
 
 2002-04-15  Juergen Vigna  <jug@sad.it>

diff --git a/src/lyxtextclass.C b/src/lyxtextclass.C
index 9418b24464e77029deaab2cd3e95a66a486e04fa..75d31c62320d98ddf4ec7b60fd5368e58875c2f8 100644 (file)
--- a/src/lyxtextclass.C
+++ b/src/lyxtextclass.C
@@ -291,7 +291,7 @@ bool LyXTextClass::Read(string const & filename, bool merge)
 
                case TC_PROVIDESURL:
                        if (lexrc.next() && lexrc.getInteger())
-                               provides_ = url;
+                               provides_ |= url;
                        break;
 
                case TC_LEFTMARGIN:     // left margin type