Use the proper buffer when recording undo

[lyx.git] / src / Paragraph.cpp

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 3da74d7ff7e777b94b2debe3fd44cb0bae7bc7aa..73157e6b7d60f5605b698b419e157d93e4509564 100644 (file)
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -71,8 +71,8 @@
 using namespace std;
 using namespace lyx::support;
 
-// gcc < 4.8.0 and msvc < 2015 do not support C++11 thread_local
-#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 8
+// OSX clang, gcc < 4.8.0, and msvc < 2015 do not support C++11 thread_local
+#if defined(__APPLE__) || (defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 8)
 #define THREAD_LOCAL_STATIC static __thread
 #elif defined(_MSC_VER) && (_MSC_VER < 1900)
 #define THREAD_LOCAL_STATIC static __declspec(thread)
@@ -397,7 +397,7 @@ public:
        typedef SkipPositions::const_iterator SkipPositionsIterator;
 
        void appendSkipPosition(SkipPositions & skips, pos_type const pos) const;
-       
+
        Language * getSpellLanguage(pos_type const from) const;
 
        Language * locateSpellRange(pos_type & from, pos_type & to,
@@ -412,7 +412,7 @@ public:
        }
 
        bool ignoreWord(docstring const & word) const ;
-       
+
        void setMisspelled(pos_type from, pos_type to, SpellChecker::Result state)
        {
                pos_type textsize = owner_->size();
@@ -2967,13 +2967,13 @@ docstring Paragraph::simpleLyXHTMLOnePar(Buffer const & buf,
        FontShape  curr_fs   = INHERIT_SHAPE;
        FontFamily curr_fam  = INHERIT_FAMILY;
        FontSize   curr_size = FONT_SIZE_INHERIT;
-       
-       string const default_family = 
-               buf.masterBuffer()->params().fonts_default_family;              
+
+       string const default_family =
+               buf.masterBuffer()->params().fonts_default_family;
 
        vector<html::FontTag> tagsToOpen;
        vector<html::EndFontTag> tagsToClose;
-       
+
        // parsing main loop
        for (pos_type i = initial; i < size(); ++i) {
                // let's not show deleted material in the output
@@ -2996,7 +2996,7 @@ docstring Paragraph::simpleLyXHTMLOnePar(Buffer const & buf,
                curstate = font.fontInfo().underbar();
                if (font_old.underbar() != curstate)
                        doFontSwitch(tagsToOpen, tagsToClose, ubar_flag, curstate, html::FT_UBAR);
-       
+
                // strikeout
                curstate = font.fontInfo().strikeout();
                if (font_old.strikeout() != curstate)
@@ -3627,7 +3627,7 @@ int Paragraph::fixBiblio(Buffer const & buffer)
                                         InsetCommandParams(BIBITEM_CODE));
 
        Font font(inherit_font, buffer.params().language);
-       insertInset(0, inset, font, Change(track_changes ? Change::INSERTED 
+       insertInset(0, inset, font, Change(track_changes ? Change::INSERTED
                                                   : Change::UNCHANGED));
 
        return 1;