diff --git a/src/BufferView.C b/src/BufferView.C
index 53e1ffd55c..207fc5c7b9 100644
--- a/src/BufferView.C
+++ b/src/BufferView.C
@@ -15,10 +15,48 @@
 
 #include "BufferView.h"
 #include "BufferView_pimpl.h"
+
+#include "BufferView_pimpl.h"
+#include "LaTeX.h"
+#include "WordLangTuple.h"
+#include "buffer.h"
+#include "bufferlist.h"
+#include "debug.h"
+#include "gettext.h"
+#include "iterators.h"
+#include "language.h"
+#include "lyxcursor.h"
+#include "lyxlex.h"
 #include "lyxtext.h"
-#include "frontends/screen.h"
-#include "frontends/WorkArea.h"
+#include "undo_funcs.h"
+
+#include "frontends/Alert.h"
+#include "frontends/Dialogs.h"
 #include "frontends/LyXView.h"
+#include "frontends/WorkArea.h"
+#include "frontends/screen.h"
+
+#include "insets/insetcommand.h" // ChangeRefs
+#include "insets/inseterror.h"
+
+#include "support/FileInfo.h"
+#include "support/filetools.h"
+#include "support/lyxfunctional.h" // equal_1st_in_pair
+#include "support/types.h"
+#include "support/lyxalgo.h" // lyx_count
+
+#include <fstream>
+
+extern BufferList bufferlist;
+
+using lyx::pos_type;
+
+using std::pair;
+using std::endl;
+using std::ifstream;
+using std::vector;
+using std::find;
+using std::count_if;
 
 
 BufferView::BufferView(LyXView * owner, int xpos, int ypos,
@@ -230,3 +268,672 @@ int BufferView::scroll(long time)
 {
 	return pimpl_->scroll(time);
 }
+
+
+int BufferView::defaultHeight() const
+{
+	return text->defaultHeight();
+}
+
+
+
+// Inserts a file into current document
+bool BufferView::insertLyXFile(string const & filen)
+	//
+	// Copyright CHT Software Service GmbH
+	// Uwe C. Schroeder
+	//
+	// Insert a LyXformat - file into current buffer
+	//
+	// Moved from lyx_cb.C (Lgb)
+{
+	if (filen.empty())
+		return false;
+
+	string const fname = MakeAbsPath(filen);
+
+	// check if file exist
+	FileInfo const fi(fname);
+
+	if (!fi.readable()) {
+		Alert::alert(_("Error!"),
+			   _("Specified file is unreadable: "),
+			   MakeDisplayPath(fname, 50));
+		return false;
+	}
+
+	beforeChange(text);
+
+	ifstream ifs(fname.c_str());
+	if (!ifs) {
+		Alert::alert(_("Error!"),
+			   _("Cannot open specified file: "),
+			   MakeDisplayPath(fname, 50));
+		return false;
+	}
+
+	int const c = ifs.peek();
+
+	LyXLex lex(0, 0);
+	lex.setStream(ifs);
+
+	bool res = true;
+
+	if (c == '#') {
+		lyxerr[Debug::INFO] << "Will insert file with header" << endl;
+		res = buffer()->readFile(lex, text->cursor.par());
+	} else {
+		lyxerr[Debug::INFO] << "Will insert file without header"
+				    << endl;
+		res = buffer()->readLyXformat2(lex, text->cursor.par());
+	}
+
+	resize();
+	return res;
+}
+
+
+bool BufferView::removeAutoInsets()
+{
+	// keep track of which pos and par the cursor was on
+	Paragraph * cursor_par = text->cursor.par();
+	Paragraph * cursor_par_prev = cursor_par ? cursor_par->previous() : 0;
+	Paragraph * cursor_par_next = cursor_par ? cursor_par->next() : 0;
+	pos_type cursor_pos = text->cursor.pos();
+
+	bool found = false;
+
+	// Trap the deletion of the paragraph the cursor is in.
+	// Iterate until we find a paragraph that won't be immediately deleted.
+	// In reality this should mean we only execute the body of the while
+	// loop once at most.  However for safety we iterate rather than just
+	// make this an if () conditional.
+	while ((cursor_par_prev || cursor_par_next)
+	       && text->setCursor(this,
+				  cursor_par_prev ? cursor_par_prev : cursor_par_next,
+				  0)) {
+		// We just removed cursor_par so have to fix the "cursor"
+		if (cursor_par_prev) {
+			// '.' = cursor_par
+			//  a -> a.
+			// .
+			cursor_par = cursor_par_prev;
+			cursor_pos = cursor_par->size();
+		} else {
+			// .  -> .a
+			//  a
+			cursor_par = cursor_par_next;
+			cursor_pos = 0;
+		}
+		cursor_par_prev = cursor_par->previous();
+		cursor_par_next = cursor_par->next();
+	}
+
+	// Iterate through the paragraphs removing autoDelete insets as we go.
+	// If the paragraph ends up empty after all the autoDelete insets are
+	// removed that paragraph will be removed by the next setCursor() call.
+	ParIterator it = buffer()->par_iterator_begin();
+	ParIterator end = buffer()->par_iterator_end();
+	for (; it != end; ++it) {
+		Paragraph * par = *it;
+		Paragraph * par_prev = par ? par->previous() : 0;
+		bool removed = false;
+
+		if (text->setCursor(this, par, 0)
+		    && cursor_par == par_prev) {
+			// The previous setCursor line was deleted and that
+			// was the cursor_par line.  This can only happen if an
+			// error box was the sole item on cursor_par.
+			// It is possible for cursor_par_prev to be stray if
+			// the line it pointed to only had a error box on it
+			// so we have to set it to a known correct value.
+			// This is often the same value it already had.
+			cursor_par_prev = par->previous();
+			if (cursor_par_prev) {
+				// '|' = par, '.' = cursor_par, 'E' = error box
+				// First step below may occur before while{}
+				//  a    |a      a     a     a.
+				//  E -> .E -> |.E -> .  -> |b
+				// .      b      b    |b
+				//  b
+				cursor_par = cursor_par_prev;
+				cursor_pos = cursor_par_prev->size();
+				cursor_par_prev = cursor_par->previous();
+				// cursor_par_next remains the same
+			} else if (cursor_par_next) {
+				// First step below may occur before while{}
+				// .
+				//  E -> |.E -> |.  -> . -> .|a
+				//  a      a      a    |a
+				cursor_par = cursor_par_next;
+				cursor_pos = 0;
+				// cursor_par_prev remains unset
+				cursor_par_next = cursor_par->next();
+			} else {
+				// I can't find a way to trigger this
+				// so it should be unreachable code
+				// unless the buffer is corrupted.
+				lyxerr << "BufferView::removeAutoInsets() is bad\n";
+			}
+		}
+
+		InsetList::iterator pit = par->insetlist.begin();
+		InsetList::iterator pend = par->insetlist.end();
+
+		while (pit != pend) {
+			if (pit.getInset()->autoDelete()) {
+				removed = true;
+				pos_type const pos = pit.getPos();
+
+				par->erase(pos);
+				// We just invalidated par's inset iterators so
+				// we get the next valid iterator position
+				pit = par->insetlist.insetIterator(pos);
+				// and ensure we have a valid end iterator.
+				pend = par->insetlist.end();
+
+				if (cursor_par == par) {
+					// update the saved cursor position
+					if (cursor_pos > pos)
+						--cursor_pos;
+				}
+			} else {
+				++pit;
+			}
+		}
+		if (removed) {
+			found = true;
+			text->redoParagraph(this);
+		}
+	}
+
+	// It is possible that the last line is empty if it was cursor_par
+	// and/or only had an error inset on it.  So we set the cursor to the
+	// start of the doc to force its removal and ensure a valid saved cursor
+	if (text->setCursor(this, text->ownerParagraph(), 0)
+	    && 0 == cursor_par_next) {
+		cursor_par = cursor_par_prev;
+		cursor_pos = cursor_par->size();
+	} else if (cursor_pos > cursor_par->size()) {
+		// Some C-Enter lines were removed by the setCursor call which
+		// then invalidated cursor_pos. It could still be "wrong" because
+		// the cursor may appear to have jumped but since we collapsed
+		// some C-Enter lines this should be a reasonable compromise.
+		cursor_pos = cursor_par->size();
+	}
+
+	// restore the original cursor in its corrected location.
+	text->setCursorIntern(this, cursor_par, cursor_pos);
+
+	return found;
+}
+
+
+void BufferView::insertErrors(TeXErrors & terr)
+{
+	// Save the cursor position
+	LyXCursor cursor = text->cursor;
+
+	TeXErrors::Errors::const_iterator cit = terr.begin();
+	TeXErrors::Errors::const_iterator end = terr.end();
+	for (; cit != end; ++cit) {
+		string const desctext(cit->error_desc);
+		string const errortext(cit->error_text);
+		string const msgtxt = desctext + '\n' + errortext;
+		int const errorrow = cit->error_in_line;
+
+		// Insert error string for row number
+		int tmpid = -1;
+		int tmppos = -1;
+
+		if (buffer()->texrow.getIdFromRow(errorrow, tmpid, tmppos)) {
+			buffer()->texrow.increasePos(tmpid, tmppos);
+		}
+
+		Paragraph * texrowpar = 0;
+
+		if (tmpid == -1) {
+			texrowpar = text->ownerParagraph();
+			tmppos = 0;
+		} else {
+			texrowpar = buffer()->getParFromID(tmpid);
+		}
+
+		if (texrowpar == 0)
+			continue;
+
+		freezeUndo();
+		InsetError * new_inset = new InsetError(msgtxt);
+		text->setCursorIntern(this, texrowpar, tmppos);
+		text->insertInset(this, new_inset);
+		text->fullRebreak(this);
+		unFreezeUndo();
+	}
+	// Restore the cursor position
+	text->setCursorIntern(this, cursor.par(), cursor.pos());
+}
+
+
+void BufferView::setCursorFromRow(int row)
+{
+	int tmpid = -1;
+	int tmppos = -1;
+
+	buffer()->texrow.getIdFromRow(row, tmpid, tmppos);
+
+	Paragraph * texrowpar;
+
+	if (tmpid == -1) {
+		texrowpar = text->ownerParagraph();
+		tmppos = 0;
+	} else {
+		texrowpar = buffer()->getParFromID(tmpid);
+	}
+	text->setCursor(this, texrowpar, tmppos);
+}
+
+
+bool BufferView::insertInset(Inset * inset, string const & lout)
+{
+	return pimpl_->insertInset(inset, lout);
+}
+
+
+// This is also a buffer property (ale)
+// Not so sure about that. a goto Label function can not be buffer local, just
+// think how this will work in a multiwindow/buffer environment, all the
+// cursors in all the views showing this buffer will move. (Lgb)
+// OK, then no cursor action should be allowed in buffer. (ale)
+bool BufferView::gotoLabel(string const & label)
+{
+	for (Buffer::inset_iterator it = buffer()->inset_iterator_begin();
+	     it != buffer()->inset_iterator_end(); ++it) {
+		vector<string> labels = it->getLabelList();
+		if (find(labels.begin(),labels.end(),label)
+		     != labels.end()) {
+			beforeChange(text);
+			text->setCursor(this, it.getPar(), it.getPos());
+			text->selection.cursor = text->cursor;
+			update(text, BufferView::SELECT|BufferView::FITCUR);
+			return true;
+		}
+	}
+	return false;
+}
+
+
+void BufferView::menuUndo()
+{
+	if (!available())
+		return;
+
+	owner()->message(_("Undo"));
+	hideCursor();
+	beforeChange(text);
+	update(text, BufferView::SELECT|BufferView::FITCUR);
+	if (!textUndo(this))
+		owner()->message(_("No further undo information"));
+	else
+		update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+	switchKeyMap();
+}
+
+
+void BufferView::menuRedo()
+{
+	if (!available())
+		return;
+
+	owner()->message(_("Redo"));
+	hideCursor();
+	beforeChange(text);
+	update(text, BufferView::SELECT|BufferView::FITCUR);
+	if (!textRedo(this))
+		owner()->message(_("No further redo information"));
+	else
+		update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+	switchKeyMap();
+}
+
+
+void BufferView::copyEnvironment()
+{
+	if (available()) {
+		text->copyEnvironmentType();
+		owner()->message(_("Paragraph environment type copied"));
+	}
+}
+
+
+void BufferView::pasteEnvironment()
+{
+	if (available()) {
+		text->pasteEnvironmentType(this);
+		owner()->message(_("Paragraph environment type set"));
+		update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+	}
+}
+
+
+// these functions are for the spellchecker
+WordLangTuple const BufferView::nextWord(float & value)
+{
+	if (!available()) {
+		value = 1;
+		return WordLangTuple();
+	}
+
+	return text->selectNextWordToSpellcheck(this, value);
+}
+
+
+void BufferView::selectLastWord()
+{
+	if (!available())
+		return;
+
+	LyXCursor cur = text->selection.cursor;
+	hideCursor();
+	beforeChange(text);
+	text->selection.cursor = cur;
+	text->selectSelectedWord(this);
+	toggleSelection(false);
+	update(text, BufferView::SELECT|BufferView::FITCUR);
+}
+
+
+void BufferView::endOfSpellCheck()
+{
+	if (!available()) return;
+
+	hideCursor();
+	beforeChange(text);
+	text->selectSelectedWord(this);
+	text->clearSelection();
+	update(text, BufferView::SELECT|BufferView::FITCUR);
+}
+
+
+void BufferView::replaceWord(string const & replacestring)
+{
+	if (!available())
+		return;
+
+	LyXText * tt = getLyXText();
+	hideCursor();
+	update(tt, BufferView::SELECT|BufferView::FITCUR);
+
+	// clear the selection (if there is any)
+	toggleSelection(false);
+	update(tt, BufferView::SELECT|BufferView::FITCUR);
+
+	// clear the selection (if there is any)
+	toggleSelection(false);
+	tt->replaceSelectionWithString(this, replacestring);
+
+	tt->setSelectionOverString(this, replacestring);
+
+	// Go back so that replacement string is also spellchecked
+	for (string::size_type i = 0; i < replacestring.length() + 1; ++i) {
+		tt->cursorLeft(this);
+	}
+	update(tt, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+}
+// End of spellchecker stuff
+
+
+bool BufferView::lockInset(UpdatableInset * inset)
+{
+	if (!inset)
+		return false;
+	// don't relock if we're already locked
+	if (theLockingInset() == inset)
+		return true;
+	if (!theLockingInset()) {
+		// first check if it's the inset under the cursor we want lock
+		// should be most of the time
+		char const c = text->cursor.par()->getChar(text->cursor.pos());
+		if (c == Paragraph::META_INSET) {
+			Inset * in = text->cursor.par()->getInset(text->cursor.pos());
+			if (inset == in) {
+				theLockingInset(inset);
+				return true;
+			}
+		}
+		// Then do a deep look of the inset and lock the right one
+		int const id = inset->id();
+		ParagraphList::iterator pit = buffer()->paragraphs.begin();
+		ParagraphList::iterator pend = buffer()->paragraphs.end();
+		for (; pit != pend; ++pit) {
+			InsetList::iterator it = pit->insetlist.begin();
+			InsetList::iterator end = pit->insetlist.end();
+			for (; it != end; ++it) {
+				if (it.getInset() == inset) {
+					text->setCursorIntern(this, &*pit, it.getPos());
+					theLockingInset(inset);
+					return true;
+				}
+				if (it.getInset()->getInsetFromID(id)) {
+					text->setCursorIntern(this, &*pit, it.getPos());
+					it.getInset()->edit(this);
+					return theLockingInset()->lockInsetInInset(this, inset);
+				}
+			}
+		}
+		return false;
+	}
+	return theLockingInset()->lockInsetInInset(this, inset);
+}
+
+
+void BufferView::showLockedInsetCursor(int x, int y, int asc, int desc)
+{
+	if (available() && theLockingInset() && !theLockingInset()->nodraw()) {
+		LyXCursor cursor = text->cursor;
+		Inset * locking_inset = theLockingInset()->getLockingInset();
+
+		if ((cursor.pos() - 1 >= 0) &&
+		    cursor.par()->isInset(cursor.pos() - 1) &&
+		    (cursor.par()->getInset(cursor.pos() - 1) ==
+		     locking_inset))
+			text->setCursor(this, cursor,
+					cursor.par(), cursor.pos() - 1);
+		LyXScreen::Cursor_Shape shape = LyXScreen::BAR_SHAPE;
+		LyXText * txt = getLyXText();
+		if (locking_inset->isTextInset() &&
+		    locking_inset->lyxCode() != Inset::ERT_CODE &&
+		    (txt->real_current_font.language() !=
+		     buffer()->params.language
+		     || txt->real_current_font.isVisibleRightToLeft()
+		     != buffer()->params.language->RightToLeft()))
+			shape = (txt->real_current_font.isVisibleRightToLeft())
+				? LyXScreen::REVERSED_L_SHAPE
+				: LyXScreen::L_SHAPE;
+		y += cursor.iy() + theLockingInset()->insetInInsetY();
+		screen().showManualCursor(text, x, y, asc, desc,
+						  shape);
+	}
+}
+
+
+void BufferView::hideLockedInsetCursor()
+{
+	if (theLockingInset() && available()) {
+		screen().hideCursor();
+	}
+}
+
+
+bool BufferView::fitLockedInsetCursor(int x, int y, int asc, int desc)
+{
+	if (theLockingInset() && available()) {
+		y += text->cursor.iy() + theLockingInset()->insetInInsetY();
+		if (screen().fitManualCursor(this, text, x, y, asc, desc)) {
+			updateScrollbar();
+			return true;
+		}
+	}
+	return false;
+}
+
+
+int BufferView::unlockInset(UpdatableInset * inset)
+{
+	if (!inset)
+		return 0;
+	if (inset && theLockingInset() == inset) {
+		inset->insetUnlock(this);
+		theLockingInset(0);
+		// make sure we update the combo !
+		owner()->setLayout(getLyXText()->cursor.par()->layout()->name());
+		// Tell the paragraph dialog that we changed paragraph
+		owner()->getDialogs().updateParagraph();
+		finishUndo();
+		return 0;
+	} else if (inset && theLockingInset() &&
+		   theLockingInset()->unlockInsetInInset(this, inset)) {
+		// Tell the paragraph dialog that we changed paragraph
+		owner()->getDialogs().updateParagraph();
+		// owner inset has updated the layout combo
+		finishUndo();
+		return 0;
+	}
+	return bufferlist.unlockInset(inset);
+}
+
+
+void BufferView::lockedInsetStoreUndo(Undo::undo_kind kind)
+{
+	if (!theLockingInset())
+		return; // shouldn't happen
+	if (kind == Undo::EDIT) // in this case insets would not be stored!
+		kind = Undo::FINISH;
+	setUndo(this, kind,
+		text->cursor.par(),
+		text->cursor.par()->next());
+}
+
+
+void BufferView::updateInset(Inset * inset, bool mark_dirty)
+{
+	pimpl_->updateInset(inset, mark_dirty);
+}
+
+
+bool BufferView::ChangeInsets(Inset::Code code,
+			      string const & from, string const & to)
+{
+	bool need_update = false;
+	LyXCursor cursor = text->cursor;
+	LyXCursor tmpcursor = cursor;
+	cursor.par(tmpcursor.par());
+	cursor.pos(tmpcursor.pos());
+
+	ParIterator end = buffer()->par_iterator_end();
+	for (ParIterator it = buffer()->par_iterator_begin();
+	     it != end; ++it) {
+		Paragraph * par = *it;
+		bool changed_inset = false;
+		for (InsetList::iterator it2 = par->insetlist.begin();
+		     it2 != par->insetlist.end(); ++it2) {
+			if (it2.getInset()->lyxCode() == code) {
+				InsetCommand * inset = static_cast<InsetCommand *>(it2.getInset());
+				if (inset->getContents() == from) {
+					inset->setContents(to);
+					changed_inset = true;
+				}
+			}
+		}
+		if (changed_inset) {
+			need_update = true;
+
+			// FIXME
+
+			// The test it.size()==1 was needed to prevent crashes.
+			// How to set the cursor corretly when it.size()>1 ??
+			if (it.size() == 1) {
+				text->setCursorIntern(this, par, 0);
+				text->redoParagraphs(this, text->cursor,
+						     text->cursor.par()->next());
+				text->fullRebreak(this);
+			}
+		}
+	}
+	text->setCursorIntern(this, cursor.par(), cursor.pos());
+	return need_update;
+}
+
+
+bool BufferView::ChangeRefsIfUnique(string const & from, string const & to)
+{
+	// Check if the label 'from' appears more than once
+	vector<string> labels = buffer()->getLabelList();
+
+	if (lyx::count(labels.begin(), labels.end(), from) > 1)
+		return false;
+
+	return ChangeInsets(Inset::REF_CODE, from, to);
+}
+
+
+bool BufferView::ChangeCitationsIfUnique(string const & from,
+					 string const & to)
+{
+	typedef pair<string, string> StringPair;
+
+	vector<StringPair> keys = buffer()->getBibkeyList();
+	if (count_if(keys.begin(), keys.end(),
+		     lyx::equal_1st_in_pair<StringPair>(from))
+	    > 1)
+		return false;
+
+	return ChangeInsets(Inset::CITE_CODE, from, to);
+}
+
+
+UpdatableInset * BufferView::theLockingInset() const
+{
+	// If NULL is not allowed we should put an Assert here. (Lgb)
+	if (text)
+		return text->the_locking_inset;
+	return 0;
+}
+
+
+void BufferView::theLockingInset(UpdatableInset * inset)
+{
+	text->the_locking_inset = inset;
+}
+
+
+LyXText * BufferView::getLyXText() const
+{
+	if (theLockingInset()) {
+		LyXText * txt = theLockingInset()->getLyXText(this, true);
+		if (txt)
+			return txt;
+	}
+	return text;
+}
+
+
+LyXText * BufferView::getParentText(Inset * inset) const
+{
+	if (inset->owner()) {
+		LyXText * txt = inset->getLyXText(this);
+		inset = inset->owner();
+		while (inset && inset->getLyXText(this) == txt)
+			inset = inset->owner();
+		if (inset)
+			return inset->getLyXText(this);
+	}
+	return text;
+}
+
+
+Language const * BufferView::getParentLanguage(Inset * inset) const
+{
+	LyXText * text = getParentText(inset);
+	return text->cursor.par()->getFontSettings(buffer()->params,
+						   text->cursor.pos()).language();
+}
diff --git a/src/BufferView.h b/src/BufferView.h
index 712bdba8ba..b775e4b434 100644
--- a/src/BufferView.h
+++ b/src/BufferView.h
@@ -190,6 +190,8 @@ public:
 	void stuffClipboard(string const &) const;
 	///
 	bool dispatch(FuncRequest const & argument);
+	/// height of a normal line in pixels (zoom factor considered)
+	int defaultHeight() const;
 
 private:
 	///
diff --git a/src/BufferView2.C b/src/BufferView2.C
deleted file mode 100644
index c467f4922f..0000000000
--- a/src/BufferView2.C
+++ /dev/null
@@ -1,715 +0,0 @@
-/* This file is part of
- * ======================================================
- *
- *           LyX, The Document Processor
- *
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 The LyX Team.
- *
- * ====================================================== */
-
-#include <config.h>
-
-#include "BufferView.h"
-#include "buffer.h"
-#include "lyxcursor.h"
-#include "lyxtext.h"
-#include "frontends/LyXView.h"
-#include "bufferlist.h"
-#include "frontends/screen.h"
-#include "LaTeX.h"
-#include "BufferView_pimpl.h"
-#include "language.h"
-#include "gettext.h"
-#include "undo_funcs.h"
-#include "debug.h"
-#include "iterators.h"
-#include "lyxlex.h"
-#include "WordLangTuple.h"
-
-#include "frontends/Alert.h"
-#include "frontends/Dialogs.h"
-
-#include "insets/insetcommand.h" //ChangeRefs
-#include "insets/inseterror.h"
-
-#include "support/FileInfo.h"
-#include "support/filetools.h"
-#include "support/lyxfunctional.h" //equal_1st_in_pair
-#include "support/types.h"
-#include "support/lyxalgo.h" // lyx_count
-
-#include <fstream>
-
-extern BufferList bufferlist;
-
-using lyx::pos_type;
-
-using std::pair;
-using std::endl;
-using std::ifstream;
-using std::vector;
-using std::find;
-using std::count_if;
-
-
-// Inserts a file into current document
-bool BufferView::insertLyXFile(string const & filen)
-	//
-	// Copyright CHT Software Service GmbH
-	// Uwe C. Schroeder
-	//
-	// Insert a LyXformat - file into current buffer
-	//
-	// Moved from lyx_cb.C (Lgb)
-{
-	if (filen.empty())
-		return false;
-
-	string const fname = MakeAbsPath(filen);
-
-	// check if file exist
-	FileInfo const fi(fname);
-
-	if (!fi.readable()) {
-		Alert::alert(_("Error!"),
-			   _("Specified file is unreadable: "),
-			   MakeDisplayPath(fname, 50));
-		return false;
-	}
-
-	beforeChange(text);
-
-	ifstream ifs(fname.c_str());
-	if (!ifs) {
-		Alert::alert(_("Error!"),
-			   _("Cannot open specified file: "),
-			   MakeDisplayPath(fname, 50));
-		return false;
-	}
-
-	int const c = ifs.peek();
-
-	LyXLex lex(0, 0);
-	lex.setStream(ifs);
-
-	bool res = true;
-
-	if (c == '#') {
-		lyxerr[Debug::INFO] << "Will insert file with header" << endl;
-		res = buffer()->readFile(lex, text->cursor.par());
-	} else {
-		lyxerr[Debug::INFO] << "Will insert file without header"
-				    << endl;
-		res = buffer()->readLyXformat2(lex, text->cursor.par());
-	}
-
-	resize();
-	return res;
-}
-
-
-bool BufferView::removeAutoInsets()
-{
-	// keep track of which pos and par the cursor was on
-	Paragraph * cursor_par = text->cursor.par();
-	Paragraph * cursor_par_prev = cursor_par ? cursor_par->previous() : 0;
-	Paragraph * cursor_par_next = cursor_par ? cursor_par->next() : 0;
-	pos_type cursor_pos = text->cursor.pos();
-
-	bool found = false;
-
-	// Trap the deletion of the paragraph the cursor is in.
-	// Iterate until we find a paragraph that won't be immediately deleted.
-	// In reality this should mean we only execute the body of the while
-	// loop once at most.  However for safety we iterate rather than just
-	// make this an if () conditional.
-	while ((cursor_par_prev || cursor_par_next)
-	       && text->setCursor(this,
-				  cursor_par_prev ? cursor_par_prev : cursor_par_next,
-				  0)) {
-		// We just removed cursor_par so have to fix the "cursor"
-		if (cursor_par_prev) {
-			// '.' = cursor_par
-			//  a -> a.
-			// .
-			cursor_par = cursor_par_prev;
-			cursor_pos = cursor_par->size();
-		} else {
-			// .  -> .a
-			//  a
-			cursor_par = cursor_par_next;
-			cursor_pos = 0;
-		}
-		cursor_par_prev = cursor_par->previous();
-		cursor_par_next = cursor_par->next();
-	}
-
-	// Iterate through the paragraphs removing autoDelete insets as we go.
-	// If the paragraph ends up empty after all the autoDelete insets are
-	// removed that paragraph will be removed by the next setCursor() call.
-	ParIterator it = buffer()->par_iterator_begin();
-	ParIterator end = buffer()->par_iterator_end();
-	for (; it != end; ++it) {
-		Paragraph * par = *it;
-		Paragraph * par_prev = par ? par->previous() : 0;
-		bool removed = false;
-
-		if (text->setCursor(this, par, 0)
-		    && cursor_par == par_prev) {
-			// The previous setCursor line was deleted and that
-			// was the cursor_par line.  This can only happen if an
-			// error box was the sole item on cursor_par.
-			// It is possible for cursor_par_prev to be stray if
-			// the line it pointed to only had a error box on it
-			// so we have to set it to a known correct value.
-			// This is often the same value it already had.
-			cursor_par_prev = par->previous();
-			if (cursor_par_prev) {
-				// '|' = par, '.' = cursor_par, 'E' = error box
-				// First step below may occur before while{}
-				//  a    |a      a     a     a.
-				//  E -> .E -> |.E -> .  -> |b
-				// .      b      b    |b
-				//  b
-				cursor_par = cursor_par_prev;
-				cursor_pos = cursor_par_prev->size();
-				cursor_par_prev = cursor_par->previous();
-				// cursor_par_next remains the same
-			} else if (cursor_par_next) {
-				// First step below may occur before while{}
-				// .
-				//  E -> |.E -> |.  -> . -> .|a
-				//  a      a      a    |a
-				cursor_par = cursor_par_next;
-				cursor_pos = 0;
-				// cursor_par_prev remains unset
-				cursor_par_next = cursor_par->next();
-			} else {
-				// I can't find a way to trigger this
-				// so it should be unreachable code
-				// unless the buffer is corrupted.
-				lyxerr << "BufferView::removeAutoInsets() is bad\n";
-			}
-		}
-
-		InsetList::iterator pit = par->insetlist.begin();
-		InsetList::iterator pend = par->insetlist.end();
-
-		while (pit != pend) {
-			if (pit.getInset()->autoDelete()) {
-				removed = true;
-				pos_type const pos = pit.getPos();
-
-				par->erase(pos);
-				// We just invalidated par's inset iterators so
-				// we get the next valid iterator position
-				pit = par->insetlist.insetIterator(pos);
-				// and ensure we have a valid end iterator.
-				pend = par->insetlist.end();
-
-				if (cursor_par == par) {
-					// update the saved cursor position
-					if (cursor_pos > pos)
-						--cursor_pos;
-				}
-			} else {
-				++pit;
-			}
-		}
-		if (removed) {
-			found = true;
-			text->redoParagraph(this);
-		}
-	}
-
-	// It is possible that the last line is empty if it was cursor_par
-	// and/or only had an error inset on it.  So we set the cursor to the
-	// start of the doc to force its removal and ensure a valid saved cursor
-	if (text->setCursor(this, text->ownerParagraph(), 0)
-	    && 0 == cursor_par_next) {
-		cursor_par = cursor_par_prev;
-		cursor_pos = cursor_par->size();
-	} else if (cursor_pos > cursor_par->size()) {
-		// Some C-Enter lines were removed by the setCursor call which
-		// then invalidated cursor_pos. It could still be "wrong" because
-		// the cursor may appear to have jumped but since we collapsed
-		// some C-Enter lines this should be a reasonable compromise.
-		cursor_pos = cursor_par->size();
-	}
-
-	// restore the original cursor in its corrected location.
-	text->setCursorIntern(this, cursor_par, cursor_pos);
-
-	return found;
-}
-
-
-void BufferView::insertErrors(TeXErrors & terr)
-{
-	// Save the cursor position
-	LyXCursor cursor = text->cursor;
-
-	TeXErrors::Errors::const_iterator cit = terr.begin();
-	TeXErrors::Errors::const_iterator end = terr.end();
-	for (; cit != end; ++cit) {
-		string const desctext(cit->error_desc);
-		string const errortext(cit->error_text);
-		string const msgtxt = desctext + '\n' + errortext;
-		int const errorrow = cit->error_in_line;
-
-		// Insert error string for row number
-		int tmpid = -1;
-		int tmppos = -1;
-
-		if (buffer()->texrow.getIdFromRow(errorrow, tmpid, tmppos)) {
-			buffer()->texrow.increasePos(tmpid, tmppos);
-		}
-
-		Paragraph * texrowpar = 0;
-
-		if (tmpid == -1) {
-			texrowpar = text->ownerParagraph();
-			tmppos = 0;
-		} else {
-			texrowpar = buffer()->getParFromID(tmpid);
-		}
-
-		if (texrowpar == 0)
-			continue;
-
-		freezeUndo();
-		InsetError * new_inset = new InsetError(msgtxt);
-		text->setCursorIntern(this, texrowpar, tmppos);
-		text->insertInset(this, new_inset);
-		text->fullRebreak(this);
-		unFreezeUndo();
-	}
-	// Restore the cursor position
-	text->setCursorIntern(this, cursor.par(), cursor.pos());
-}
-
-
-void BufferView::setCursorFromRow(int row)
-{
-	int tmpid = -1;
-	int tmppos = -1;
-
-	buffer()->texrow.getIdFromRow(row, tmpid, tmppos);
-
-	Paragraph * texrowpar;
-
-	if (tmpid == -1) {
-		texrowpar = text->ownerParagraph();
-		tmppos = 0;
-	} else {
-		texrowpar = buffer()->getParFromID(tmpid);
-	}
-	text->setCursor(this, texrowpar, tmppos);
-}
-
-
-bool BufferView::insertInset(Inset * inset, string const & lout)
-{
-	return pimpl_->insertInset(inset, lout);
-}
-
-
-// This is also a buffer property (ale)
-// Not so sure about that. a goto Label function can not be buffer local, just
-// think how this will work in a multiwindow/buffer environment, all the
-// cursors in all the views showing this buffer will move. (Lgb)
-// OK, then no cursor action should be allowed in buffer. (ale)
-bool BufferView::gotoLabel(string const & label)
-{
-	for (Buffer::inset_iterator it = buffer()->inset_iterator_begin();
-	     it != buffer()->inset_iterator_end(); ++it) {
-		vector<string> labels = it->getLabelList();
-		if (find(labels.begin(),labels.end(),label)
-		     != labels.end()) {
-			beforeChange(text);
-			text->setCursor(this, it.getPar(), it.getPos());
-			text->selection.cursor = text->cursor;
-			update(text, BufferView::SELECT|BufferView::FITCUR);
-			return true;
-		}
-	}
-	return false;
-}
-
-
-void BufferView::menuUndo()
-{
-	if (!available())
-		return;
-
-	owner()->message(_("Undo"));
-	hideCursor();
-	beforeChange(text);
-	update(text, BufferView::SELECT|BufferView::FITCUR);
-	if (!textUndo(this))
-		owner()->message(_("No further undo information"));
-	else
-		update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-	switchKeyMap();
-}
-
-
-void BufferView::menuRedo()
-{
-	if (!available())
-		return;
-
-	owner()->message(_("Redo"));
-	hideCursor();
-	beforeChange(text);
-	update(text, BufferView::SELECT|BufferView::FITCUR);
-	if (!textRedo(this))
-		owner()->message(_("No further redo information"));
-	else
-		update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-	switchKeyMap();
-}
-
-
-void BufferView::copyEnvironment()
-{
-	if (available()) {
-		text->copyEnvironmentType();
-		owner()->message(_("Paragraph environment type copied"));
-	}
-}
-
-
-void BufferView::pasteEnvironment()
-{
-	if (available()) {
-		text->pasteEnvironmentType(this);
-		owner()->message(_("Paragraph environment type set"));
-		update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-	}
-}
-
-
-// these functions are for the spellchecker
-WordLangTuple const BufferView::nextWord(float & value)
-{
-	if (!available()) {
-		value = 1;
-		return WordLangTuple();
-	}
-
-	return text->selectNextWordToSpellcheck(this, value);
-}
-
-
-void BufferView::selectLastWord()
-{
-	if (!available())
-		return;
-
-	LyXCursor cur = text->selection.cursor;
-	hideCursor();
-	beforeChange(text);
-	text->selection.cursor = cur;
-	text->selectSelectedWord(this);
-	toggleSelection(false);
-	update(text, BufferView::SELECT|BufferView::FITCUR);
-}
-
-
-void BufferView::endOfSpellCheck()
-{
-	if (!available()) return;
-
-	hideCursor();
-	beforeChange(text);
-	text->selectSelectedWord(this);
-	text->clearSelection();
-	update(text, BufferView::SELECT|BufferView::FITCUR);
-}
-
-
-void BufferView::replaceWord(string const & replacestring)
-{
-	if (!available())
-		return;
-
-	LyXText * tt = getLyXText();
-	hideCursor();
-	update(tt, BufferView::SELECT|BufferView::FITCUR);
-
-	// clear the selection (if there is any)
-	toggleSelection(false);
-	update(tt, BufferView::SELECT|BufferView::FITCUR);
-
-	// clear the selection (if there is any)
-	toggleSelection(false);
-	tt->replaceSelectionWithString(this, replacestring);
-
-	tt->setSelectionOverString(this, replacestring);
-
-	// Go back so that replacement string is also spellchecked
-	for (string::size_type i = 0; i < replacestring.length() + 1; ++i) {
-		tt->cursorLeft(this);
-	}
-	update(tt, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-}
-// End of spellchecker stuff
-
-
-bool BufferView::lockInset(UpdatableInset * inset)
-{
-	if (!inset)
-		return false;
-	// don't relock if we're already locked
-	if (theLockingInset() == inset)
-		return true;
-	if (!theLockingInset()) {
-		// first check if it's the inset under the cursor we want lock
-		// should be most of the time
-		char const c = text->cursor.par()->getChar(text->cursor.pos());
-		if (c == Paragraph::META_INSET) {
-			Inset * in = text->cursor.par()->getInset(text->cursor.pos());
-			if (inset == in) {
-				theLockingInset(inset);
-				return true;
-			}
-		}
-		// Then do a deep look of the inset and lock the right one
-		int const id = inset->id();
-		ParagraphList::iterator pit = buffer()->paragraphs.begin();
-		ParagraphList::iterator pend = buffer()->paragraphs.end();
-		for (; pit != pend; ++pit) {
-			InsetList::iterator it = pit->insetlist.begin();
-			InsetList::iterator end = pit->insetlist.end();
-			for (; it != end; ++it) {
-				if (it.getInset() == inset) {
-					text->setCursorIntern(this, &*pit, it.getPos());
-					theLockingInset(inset);
-					return true;
-				}
-				if (it.getInset()->getInsetFromID(id)) {
-					text->setCursorIntern(this, &*pit, it.getPos());
-					it.getInset()->edit(this);
-					return theLockingInset()->lockInsetInInset(this, inset);
-				}
-			}
-		}
-		return false;
-	}
-	return theLockingInset()->lockInsetInInset(this, inset);
-}
-
-
-void BufferView::showLockedInsetCursor(int x, int y, int asc, int desc)
-{
-	if (available() && theLockingInset() && !theLockingInset()->nodraw()) {
-		LyXCursor cursor = text->cursor;
-		Inset * locking_inset = theLockingInset()->getLockingInset();
-
-		if ((cursor.pos() - 1 >= 0) &&
-		    cursor.par()->isInset(cursor.pos() - 1) &&
-		    (cursor.par()->getInset(cursor.pos() - 1) ==
-		     locking_inset))
-			text->setCursor(this, cursor,
-					cursor.par(), cursor.pos() - 1);
-		LyXScreen::Cursor_Shape shape = LyXScreen::BAR_SHAPE;
-		LyXText * txt = getLyXText();
-		if (locking_inset->isTextInset() &&
-		    locking_inset->lyxCode() != Inset::ERT_CODE &&
-		    (txt->real_current_font.language() !=
-		     buffer()->params.language
-		     || txt->real_current_font.isVisibleRightToLeft()
-		     != buffer()->params.language->RightToLeft()))
-			shape = (txt->real_current_font.isVisibleRightToLeft())
-				? LyXScreen::REVERSED_L_SHAPE
-				: LyXScreen::L_SHAPE;
-		y += cursor.iy() + theLockingInset()->insetInInsetY();
-		screen().showManualCursor(text, x, y, asc, desc,
-						  shape);
-	}
-}
-
-
-void BufferView::hideLockedInsetCursor()
-{
-	if (theLockingInset() && available()) {
-		screen().hideCursor();
-	}
-}
-
-
-bool BufferView::fitLockedInsetCursor(int x, int y, int asc, int desc)
-{
-	if (theLockingInset() && available()) {
-		y += text->cursor.iy() + theLockingInset()->insetInInsetY();
-		if (screen().fitManualCursor(this, text, x, y, asc, desc)) {
-			updateScrollbar();
-			return true;
-		}
-	}
-	return false;
-}
-
-
-int BufferView::unlockInset(UpdatableInset * inset)
-{
-	if (!inset)
-		return 0;
-	if (inset && theLockingInset() == inset) {
-		inset->insetUnlock(this);
-		theLockingInset(0);
-		// make sure we update the combo !
-		owner()->setLayout(getLyXText()->cursor.par()->layout()->name());
-		// Tell the paragraph dialog that we changed paragraph
-		owner()->getDialogs().updateParagraph();
-		finishUndo();
-		return 0;
-	} else if (inset && theLockingInset() &&
-		   theLockingInset()->unlockInsetInInset(this, inset)) {
-		// Tell the paragraph dialog that we changed paragraph
-		owner()->getDialogs().updateParagraph();
-		// owner inset has updated the layout combo
-		finishUndo();
-		return 0;
-	}
-	return bufferlist.unlockInset(inset);
-}
-
-
-void BufferView::lockedInsetStoreUndo(Undo::undo_kind kind)
-{
-	if (!theLockingInset())
-		return; // shouldn't happen
-	if (kind == Undo::EDIT) // in this case insets would not be stored!
-		kind = Undo::FINISH;
-	setUndo(this, kind,
-		text->cursor.par(),
-		text->cursor.par()->next());
-}
-
-
-void BufferView::updateInset(Inset * inset, bool mark_dirty)
-{
-	pimpl_->updateInset(inset, mark_dirty);
-}
-
-
-bool BufferView::ChangeInsets(Inset::Code code,
-			      string const & from, string const & to)
-{
-	bool need_update = false;
-	LyXCursor cursor = text->cursor;
-	LyXCursor tmpcursor = cursor;
-	cursor.par(tmpcursor.par());
-	cursor.pos(tmpcursor.pos());
-
-	ParIterator end = buffer()->par_iterator_end();
-	for (ParIterator it = buffer()->par_iterator_begin();
-	     it != end; ++it) {
-		Paragraph * par = *it;
-		bool changed_inset = false;
-		for (InsetList::iterator it2 = par->insetlist.begin();
-		     it2 != par->insetlist.end(); ++it2) {
-			if (it2.getInset()->lyxCode() == code) {
-				InsetCommand * inset = static_cast<InsetCommand *>(it2.getInset());
-				if (inset->getContents() == from) {
-					inset->setContents(to);
-					changed_inset = true;
-				}
-			}
-		}
-		if (changed_inset) {
-			need_update = true;
-
-			// FIXME
-
-			// The test it.size()==1 was needed to prevent crashes.
-			// How to set the cursor corretly when it.size()>1 ??
-			if (it.size() == 1) {
-				text->setCursorIntern(this, par, 0);
-				text->redoParagraphs(this, text->cursor,
-						     text->cursor.par()->next());
-				text->fullRebreak(this);
-			}
-		}
-	}
-	text->setCursorIntern(this, cursor.par(), cursor.pos());
-	return need_update;
-}
-
-
-bool BufferView::ChangeRefsIfUnique(string const & from, string const & to)
-{
-	// Check if the label 'from' appears more than once
-	vector<string> labels = buffer()->getLabelList();
-
-	if (lyx::count(labels.begin(), labels.end(), from) > 1)
-		return false;
-
-	return ChangeInsets(Inset::REF_CODE, from, to);
-}
-
-
-bool BufferView::ChangeCitationsIfUnique(string const & from,
-					 string const & to)
-{
-	typedef pair<string, string> StringPair;
-
-	vector<StringPair> keys = buffer()->getBibkeyList();
-	if (count_if(keys.begin(), keys.end(),
-		     lyx::equal_1st_in_pair<StringPair>(from))
-	    > 1)
-		return false;
-
-	return ChangeInsets(Inset::CITE_CODE, from, to);
-}
-
-
-UpdatableInset * BufferView::theLockingInset() const
-{
-	// If NULL is not allowed we should put an Assert here. (Lgb)
-	if (text)
-		return text->the_locking_inset;
-	return 0;
-}
-
-
-void BufferView::theLockingInset(UpdatableInset * inset)
-{
-	text->the_locking_inset = inset;
-}
-
-
-LyXText * BufferView::getLyXText() const
-{
-	if (theLockingInset()) {
-		LyXText * txt = theLockingInset()->getLyXText(this, true);
-		if (txt)
-			return txt;
-	}
-	return text;
-}
-
-
-LyXText * BufferView::getParentText(Inset * inset) const
-{
-	if (inset->owner()) {
-		LyXText * txt = inset->getLyXText(this);
-		inset = inset->owner();
-		while (inset && inset->getLyXText(this) == txt)
-			inset = inset->owner();
-		if (inset)
-			return inset->getLyXText(this);
-	}
-	return text;
-}
-
-
-Language const * BufferView::getParentLanguage(Inset * inset) const
-{
-	LyXText * text = getParentText(inset);
-	return text->cursor.par()->getFontSettings(buffer()->params,
-						   text->cursor.pos()).language();
-}
diff --git a/src/BufferView_pimpl.C b/src/BufferView_pimpl.C
index b4a81751a2..8edfc62a31 100644
--- a/src/BufferView_pimpl.C
+++ b/src/BufferView_pimpl.C
@@ -44,7 +44,6 @@
 
 #include "insets/insetbib.h"
 #include "insets/insettext.h"
-#include "insets/inseturl.h"
 #include "insets/insetlatexaccent.h"
 #include "insets/insettoc.h"
 #include "insets/insetindex.h"
@@ -364,13 +363,13 @@ void BufferView::Pimpl::scrollDocView(int value)
 {
 	lyxerr[Debug::GUI] << "scrollDocView of " << value << endl;
 
-	if (!buffer_) return;
+	if (!buffer_)
+		return;
 
 	screen().draw(bv_->text, bv_, value);
 
-	if (!lyxrc.cursor_follows_scrollbar) {
+	if (!lyxrc.cursor_follows_scrollbar)
 		return;
-	}
 
 	LyXText * vbt = bv_->text;
 
@@ -1080,20 +1079,6 @@ bool BufferView::Pimpl::dispatch(FuncRequest const & ev)
 	}
 	break;
 
-	case LFUN_INSERT_URL:
-	{
-		InsetCommandParams p;
-		p.setFromString(ev.argument);
-
-		InsetUrl * inset = new InsetUrl(p);
-		if (!insertInset(inset))
-			delete inset;
-		else
-			updateInset(inset, true);
-	}
-	break;
-
-
 	// --- accented characters ---------------------------
 
 	case LFUN_UMLAUT:
@@ -1267,7 +1252,7 @@ bool BufferView::Pimpl::insertInset(Inset * inset, string const & lout)
 	// inset there otherwise this is a illegal function now
 	if (bv_->theLockingInset()) {
 		if (bv_->theLockingInset()->insetAllowed(inset))
-		    return bv_->theLockingInset()->insertInset(bv_, inset);
+			return bv_->theLockingInset()->insertInset(bv_, inset);
 		return false;
 	}
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 5e2aef1602..11f250b933 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -40,7 +40,6 @@ BUILT_SOURCES = version.C
 lyx_SOURCES = \
 	BufferView.C \
 	BufferView.h \
-	BufferView2.C \
 	BufferView_pimpl.C \
 	BufferView_pimpl.h \
 	Bullet.C \
diff --git a/src/factory.C b/src/factory.C
index 4e536e6423..7c8bf37bcf 100644
--- a/src/factory.C
+++ b/src/factory.C
@@ -22,6 +22,7 @@
 #include "insets/insettabular.h"
 #include "insets/insettext.h"
 #include "insets/insettoc.h"
+#include "insets/inseturl.h"
 #include "frontends/Dialogs.h"
 #include "frontends/LyXView.h"
 
@@ -115,6 +116,13 @@ Inset * createInset(FuncRequest const & cmd)
 			return new InsetParent(
 				InsetCommandParams("lyxparent", cmd.argument), *bv->buffer());
 
+		case LFUN_INSERT_URL:
+		{
+			InsetCommandParams p;
+			p.setFromString(cmd.argument);
+			return new InsetUrl(p);
+		}
+
 	#if 0
 		case LFUN_INSET_LIST:
 			return new InsetList;
diff --git a/src/texrow.C b/src/texrow.C
index 2e3bd01fc2..80c198ea22 100644
--- a/src/texrow.C
+++ b/src/texrow.C
@@ -113,9 +113,7 @@ bool TexRow::getIdFromRow(int row, int & id, int & pos) const
 
 void TexRow::increasePos(int id, int pos)
 {
-	RowList::iterator it = rowlist.begin();
-	RowList::iterator end = rowlist.end();
-	for_each(it, end, increase_pos(id, pos));
+	for_each(rowlist.begin(), rowlist.end(), increase_pos(id, pos));
 }
 
 
diff --git a/src/text3.C b/src/text3.C
index bf3ea5f767..1815fbefa4 100644
--- a/src/text3.C
+++ b/src/text3.C
@@ -1552,6 +1552,7 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
 	case LFUN_INSET_THEOREM:
 #endif
 	case LFUN_INSERT_NOTE:
+	case LFUN_INSERT_URL:
 	case LFUN_INSET_CAPTION:
 	case LFUN_INSET_ERT:
 	case LFUN_INSET_EXTERNAL:
diff --git a/src/vspace.C b/src/vspace.C
index 9f86ce86de..5966cb66af 100644
--- a/src/vspace.C
+++ b/src/vspace.C
@@ -16,7 +16,6 @@
 #include "lengthcommon.h"
 #include "buffer.h"
 #include "lyxrc.h"
-#include "lyxtext.h"
 #include "BufferView.h"
 #include "support/LAssert.h"
 
@@ -472,21 +471,22 @@ string const VSpace::asLatexCommand(BufferParams const & params) const
 int VSpace::inPixels(BufferView const * bv) const
 {
 	// Height of a normal line in pixels (zoom factor considered)
-	int const default_height = bv->text->defaultHeight(); // [pixels]
+	int const default_height = bv->defaultHeight(); // [pixels]
 
 	int retval = 0;
 
 	switch (kind_) {
+
 	case NONE:
-		// Value for this is already set
+		// value for this is already set
 		break;
+
 	case DEFSKIP:
 		retval = bv->buffer()->params.getDefSkip().inPixels(bv);
 		break;
 
-		// This is how the skips are normally defined by
-		// LateX.  But there should be some way to change
-		// this per document.
+	// This is how the skips are normally defined by LateX. 
+	// But there should be some way to change this per document.
 	case SMALLSKIP:
 		retval = default_height / 4;
 		break;
@@ -504,11 +504,9 @@ int VSpace::inPixels(BufferView const * bv) const
 		retval = 3 * default_height;
 		break;
 
-	case LENGTH: {
-		int const default_width  = bv->workWidth();
-		retval = len_.len().inPixels(default_width, default_height);
+	case LENGTH:
+		retval = len_.len().inPixels(bv->workWidth(), default_height);
 		break;
-	}
 
 	}
 	return retval;