* src/LyXRC.{cpp,h}:

[lyx.git] / src / BufferView.cpp

diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index 6e0d65e24d470f04813fa271b2a1295448f0ac57..eee61d6b93631f6b6f9422b4d72575066e7c0b71 100644 (file)
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -468,7 +468,7 @@ bool BufferView::fitCursor()
 {
        if (cursorStatus(d->cursor_) == CUR_INSIDE) {
                frontend::FontMetrics const & fm =
-                       theFontMetrics(d->cursor_.getFont());
+                       theFontMetrics(d->cursor_.getFont().fontInfo());
                int const asc = fm.maxAscent();
                int const des = fm.maxDescent();
                Point const p = getPos(d->cursor_, d->cursor_.boundary());
@@ -507,7 +507,7 @@ void BufferView::processUpdateFlags(Update::flags flags)
 
        // Update macro store
        if (!(cursor().inMathed() && cursor().inMacroMode()))
-               buffer_.buildMacros();
+               buffer_.updateMacros();
 
        // Now do the first drawing step if needed. This consists on updating
        // the CoordCache in updateMetrics().
@@ -1757,6 +1757,7 @@ bool BufferView::mouseSetCursor(Cursor & cur, bool select)
                d->cursor_.clearSelection();
 
        d->cursor_.finishUndo();
+       d->cursor_.setCurrentFont();
        return update;
 }