X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView.C;h=2ff1ec0a0736a88c10920b725bf23ac2072a96af;hb=ca6838b288daf07eec7d7a381d74c639c0de3a46;hp=3f7ccd1c2f0c27f1082726538d2593205756e6e5;hpb=eb651c3d6100eac2d3ec6d176234a0f9512671b9;p=lyx.git

diff --git a/src/BufferView.C b/src/BufferView.C
index 3f7ccd1c2f..2ff1ec0a07 100644
--- a/src/BufferView.C
+++ b/src/BufferView.C
@@ -83,10 +83,11 @@ namespace lyx {
 using support::addPath;
 using support::bformat;
 using support::FileFilterList;
+using support::FileName;
 using support::fileSearch;
 using support::isDirWriteable;
+using support::isFileReadable;
 using support::makeDisplayPath;
-using support::makeAbsPath;
 using support::package;
 
 using std::distance;
@@ -103,9 +104,6 @@ namespace Alert = frontend::Alert;
 
 namespace {
 
-unsigned int const saved_positions_num = 20;
-
-
 /// Return an inset of this class if it exists at the current cursor position
 template <class T>
 T * getInsetByCode(LCursor & cur, InsetBase::Code code)
@@ -126,20 +124,9 @@ BufferView::BufferView()
 	: width_(0), height_(0), buffer_(0), wh_(0),
 	  cursor_(*this),
 	  multiparsel_cache_(false), anchor_ref_(0), offset_ref_(0),
-	  intl_(new Intl)
+	  intl_(new Intl), last_inset_(0)
 {
 	xsel_cache_.set = false;
-
-	saved_positions.resize(saved_positions_num);
-	// load saved bookmarks
-	BookmarksSection::BookmarkList & bmList = LyX::ref().session().bookmarks().load();
-	for (BookmarksSection::BookmarkList::iterator bm = bmList.begin();
-		bm != bmList.end(); ++bm)
-		if (bm->get<0>() < saved_positions_num)
-			saved_positions[bm->get<0>()] = Position( bm->get<1>(), bm->get<2>(), bm->get<3>() );
-	// and then clear them
-	bmList.clear();
-
 	intl_->initKeyMapper(lyxrc.use_kbmap);
 }
 
@@ -167,7 +154,7 @@ void BufferView::setBuffer(Buffer * b)
 		buffer_->saveCursor(cursor_.selectionBegin(),
 				    cursor_.selectionEnd());
 		// current buffer is going to be switched-off, save cursor pos
-		LyX::ref().session().lastFilePos().save(buffer_->fileName(),
+		LyX::ref().session().lastFilePos().save(FileName(buffer_->fileName()),
 			boost::tie(cursor_.pit(), cursor_.pos()) );
 	}
 
@@ -211,27 +198,19 @@ void BufferView::setBuffer(Buffer * b)
 		}
 	}
 
-	update();
+	if (buffer_)
+		updateMetrics(false);    
 
 	if (buffer_ && graphics::Previews::status() != LyXRC::PREVIEW_OFF)
 		graphics::Previews::get().generateBufferPreviews(*buffer_);
 }
 
 
-bool BufferView::loadLyXFile(string const & filename, bool tolastfiles)
+bool BufferView::loadLyXFile(FileName const & filename, bool tolastfiles)
 {
-	// Get absolute path of file and add ".lyx"
-	// to the filename if necessary
-	string s = fileSearch(string(), filename, "lyx");
-
-	bool const found = !s.empty();
-
-	if (!found)
-		s = filename;
-
 	// File already open?
-	if (theBufferList().exists(s)) {
-		docstring const file = makeDisplayPath(s, 20);
+	if (theBufferList().exists(filename.absFilename())) {
+		docstring const file = makeDisplayPath(filename.absFilename(), 20);
 		docstring text = bformat(_("The document %1$s is already "
 						     "loaded.\n\nDo you want to revert "
 						     "to the saved version?"), file);
@@ -239,11 +218,11 @@ bool BufferView::loadLyXFile(string const & filename, bool tolastfiles)
 			text, 0, 1,  _("&Revert"), _("&Switch to document"));
 
 		if (ret != 0) {
-			setBuffer(theBufferList().getBuffer(s));
+			setBuffer(theBufferList().getBuffer(filename.absFilename()));
 			return true;
 		}
 		// FIXME: should be LFUN_REVERT
-		if (!theBufferList().close(theBufferList().getBuffer(s), false))
+		if (!theBufferList().close(theBufferList().getBuffer(filename.absFilename()), false))
 			return false;
 		// Fall through to new load. (Asger)
 		buffer_ = 0;
@@ -251,21 +230,21 @@ bool BufferView::loadLyXFile(string const & filename, bool tolastfiles)
 
 	Buffer * b = 0;
 
-	if (found) {
-		b = theBufferList().newBuffer(s);
-		if (!lyx::loadLyXFile(b, s)) {
+	if (isFileReadable(filename)) {
+		b = theBufferList().newBuffer(filename.absFilename());
+		if (!lyx::loadLyXFile(b, filename)) {
 			theBufferList().release(b);
 			return false;
 		}
 	} else {
 		docstring text = bformat(_("The document %1$s does not yet "
 						     "exist.\n\nDo you want to create "
-						     "a new document?"), from_utf8(s));
+						     "a new document?"), from_utf8(filename.absFilename()));
 		int const ret = Alert::prompt(_("Create new document?"),
 			 text, 0, 1, _("&Create"), _("Cancel"));
 
 		if (ret == 0) {
-			b = newFile(s, string(), true);
+			b = newFile(filename.absFilename(), string(), true);
 			if (!b)
 				return false;
 		} else
@@ -280,7 +259,7 @@ bool BufferView::loadLyXFile(string const & filename, bool tolastfiles)
 	if (lyxrc.use_lastfilepos) {
 		pit_type pit;
 		pos_type pos;
-		boost::tie(pit, pos) = LyX::ref().session().lastFilePos().load(s);
+		boost::tie(pit, pos) = LyX::ref().session().lastFilePos().load(filename);
 		// I am not sure how to separate the following part to a function
 		// so I will leave this to Lars.
 		//
@@ -292,14 +271,16 @@ bool BufferView::loadLyXFile(string const & filename, bool tolastfiles)
 				if (it.pit() == pit) {
 					// restored pos may be bigger than it->size
 					setCursor(makeDocIterator(it, min(pos, it->size())));
-					update(Update::FitCursor);
+					// No need to update the metrics if fitCursor returns false.
+					if (fitCursor())
+						updateMetrics(false);
 					break;
 				}
 		}
 	}
 
 	if (tolastfiles)
-		LyX::ref().session().lastFiles().add(b->fileName());
+		LyX::ref().session().lastFiles().add(FileName(b->fileName()));
 
 	return true;
 }
@@ -307,9 +288,8 @@ bool BufferView::loadLyXFile(string const & filename, bool tolastfiles)
 
 void BufferView::reload()
 {
-	string const fn = buffer_->fileName();
 	if (theBufferList().close(buffer_, false))
-		loadLyXFile(fn);
+		loadLyXFile(FileName(buffer_->fileName()));
 }
 
 
@@ -321,7 +301,7 @@ void BufferView::resize()
 	lyxerr[Debug::DEBUG] << BOOST_CURRENT_FUNCTION << endl;
 
 	buffer_->text().init(this);
-	update();
+	updateMetrics(false);
 	switchKeyMap();
 }
 
@@ -369,20 +349,43 @@ bool BufferView::update(Update::flags flags)
 	if (!buffer_)
 		return false;
 
-	lyxerr[Debug::WORKAREA] << "BufferView::update" << std::endl;
+	if (lyxerr.debugging(Debug::WORKAREA)) {
+		lyxerr[Debug::WORKAREA] << "BufferView::update" << std::endl;
+	}
 
 	// Update macro store
 	buffer_->buildMacros();
 
-	// First drawing step
-	updateMetrics(flags & Update::SinglePar);
-
+	// Now do the first drawing step if needed. This consists on updating
+	// the CoordCache in updateMetrics().
 	// The second drawing step is done in WorkArea::redraw() if needed.
-	bool const need_second_step =
-		(flags & (Update::Force | Update::FitCursor | Update::MultiParSel))
-		&& (fitCursor() || multiParSel());
 
-	return need_second_step;
+	// Case when no explicit update is requested.
+	if (!flags) {
+		// no need to redraw anything.
+		return false;
+	}
+
+	if (flags == Update::FitCursor) {
+		bool const fit_cursor = fitCursor();
+		if (fit_cursor)
+			updateMetrics(false);
+		// tell the frontend to update the screen if needed.
+		return fit_cursor;
+	}
+
+	bool full_metrics = flags & Update::Force;
+	if (flags & Update::MultiParSel)
+		full_metrics |= multiParSel();
+
+	bool const single_par = !full_metrics;
+	updateMetrics(single_par);
+
+	if (flags & Update::FitCursor && fitCursor())
+		updateMetrics(false);
+
+	// tell the frontend to update the screen.
+	return true;
 }
 
 
@@ -402,11 +405,13 @@ void BufferView::updateScrollbar()
 		offset_ref_ = 0;
 	}
 
-	lyxerr[Debug::GUI]
-		<< BOOST_CURRENT_FUNCTION
-		<< " Updating scrollbar: height: " << t.paragraphs().size()
-		<< " curr par: " << cursor_.bottom().pit()
-		<< " default height " << defaultRowHeight() << endl;
+	if (lyxerr.debugging(Debug::GUI)) {
+		lyxerr[Debug::GUI]
+			<< BOOST_CURRENT_FUNCTION
+			<< " Updating scrollbar: height: " << t.paragraphs().size()
+			<< " curr par: " << cursor_.bottom().pit()
+			<< " default height " << defaultRowHeight() << endl;
+	}
 
 	// It would be better to fix the scrollbar to understand
 	// values in [0..1] and divide everything by wh
@@ -470,6 +475,7 @@ void BufferView::scrollDocView(int value)
 	t.redoParagraph(*this, anchor_ref_);
 	int const h = t.getPar(anchor_ref_).height();
 	offset_ref_ = int((bar * t.paragraphs().size() - anchor_ref_) * h);
+	updateMetrics(false);
 }
 
 
@@ -514,74 +520,32 @@ Change const BufferView::getCurrentChange() const
 }
 
 
-void BufferView::savePosition(unsigned int i)
+void BufferView::saveBookmark(bool persistent)
 {
-	if (i >= saved_positions_num)
-		return;
-	BOOST_ASSERT(cursor_.inTexted());
-	saved_positions[i] = Position(buffer_->fileName(),
-				      cursor_.paragraph().id(),
-				      cursor_.pos());
-	if (i > 0)
+	LyX::ref().session().bookmarks().save(
+		FileName(buffer_->fileName()),
+		cursor_.paragraph().id(),
+		cursor_.pos(),
+		persistent
+	);
+	if (persistent)
 		// emit message signal.
-		message(bformat(_("Saved bookmark %1$d"), i));
+		message(_("Save bookmark"));
 }
 
 
-void BufferView::restorePosition(unsigned int i)
+void BufferView::moveToPosition(int par_id, pos_type par_pos)
 {
-	if (i >= saved_positions_num)
-		return;
-
-	string const fname = saved_positions[i].filename;
-
 	cursor_.clearSelection();
 
-	if (fname != buffer_->fileName()) {
-		Buffer * b = 0;
-		if (theBufferList().exists(fname))
-			b = theBufferList().getBuffer(fname);
-		else {
-			b = theBufferList().newBuffer(fname);
-			// Don't ask, just load it
-			lyx::loadLyXFile(b, fname);
-		}
-		if (b)
-			setBuffer(b);
-	}
-
-	ParIterator par = buffer_->getParFromID(saved_positions[i].par_id);
+	ParIterator par = buffer_->getParFromID(par_id);
 	if (par == buffer_->par_iterator_end())
 		return;
 
-	setCursor(makeDocIterator(par, min(par->size(), saved_positions[i].par_pos)));
-
-	if (i > 0)
-		// emit message signal.
-		message(bformat(_("Moved to bookmark %1$d"), i));
+	setCursor(makeDocIterator(par, min(par->size(), par_pos)));
 }
 
 
-bool BufferView::isSavedPosition(unsigned int i)
-{
-	return i < saved_positions_num && !saved_positions[i].filename.empty();
-}
-
-void BufferView::saveSavedPositions()
-{
-	// save bookmarks. It is better to use the pit interface
-	// but I do not know how to effectively convert between
-	// par_id and pit.
-	for (unsigned int i=1; i < saved_positions_num; ++i) {
-		if ( isSavedPosition(i) )
-			LyX::ref().session().bookmarks().save( boost::tie(
-				i,
-				saved_positions[i].filename,
-				saved_positions[i].par_id,
-				saved_positions[i].par_pos) );
-	}
-}
-
 void BufferView::switchKeyMap()
 {
 	if (!lyxrc.rtl_support)
@@ -663,10 +627,6 @@ FuncStatus BufferView::getStatus(FuncRequest const & cmd)
 		break;
 	}
 
-	case LFUN_BOOKMARK_GOTO:
-		flag.enabled(isSavedPosition(convert<unsigned int>(to_utf8(cmd.argument()))));
-		break;
-
 	case LFUN_CHANGES_TRACK:
 		flag.enabled(true);
 		flag.setOnOff(buffer_->params().trackChanges);
@@ -684,7 +644,11 @@ FuncStatus BufferView::getStatus(FuncRequest const & cmd)
 	case LFUN_CHANGE_NEXT:
 	case LFUN_ALL_CHANGES_ACCEPT:
 	case LFUN_ALL_CHANGES_REJECT:
-		flag.enabled(buffer_); // FIXME: Change tracking (MG)
+		// TODO: context-sensitive enabling of LFUNs
+		// In principle, these command should only be enabled if there
+		// is a change in the document. However, without proper
+		// optimizations, this will inevitably result in poor performance.
+		flag.enabled(buffer_);
 		break;
 
 	case LFUN_BUFFER_TOGGLE_COMPRESSION: {
@@ -741,30 +705,26 @@ bool BufferView::dispatch(FuncRequest const & cmd)
 		break;
 
 	case LFUN_FILE_INSERT:
-		// FIXME: We don't know the encoding of filenames
+		// FIXME UNICODE
 		menuInsertLyXFile(to_utf8(cmd.argument()));
 		break;
 
 	case LFUN_FILE_INSERT_ASCII_PARA:
-		// FIXME: We don't know the encoding of filenames
+		// FIXME UNICODE
 		insertAsciiFile(this, to_utf8(cmd.argument()), true);
 		break;
 
 	case LFUN_FILE_INSERT_ASCII:
-		// FIXME: We don't know the encoding of filenames
+		// FIXME UNICODE
 		insertAsciiFile(this, to_utf8(cmd.argument()), false);
 		break;
 
 	case LFUN_FONT_STATE:
-		cur.message(from_utf8(cur.currentState()));
+		cur.message(cur.currentState());
 		break;
 
 	case LFUN_BOOKMARK_SAVE:
-		savePosition(convert<unsigned int>(to_utf8(cmd.argument())));
-		break;
-
-	case LFUN_BOOKMARK_GOTO:
-		restorePosition(convert<unsigned int>(to_utf8(cmd.argument())));
+		saveBookmark(convert<unsigned int>(to_utf8(cmd.argument())));
 		break;
 
 	case LFUN_LABEL_GOTO: {
@@ -775,7 +735,8 @@ bool BufferView::dispatch(FuncRequest const & cmd)
 							 InsetBase::REF_CODE);
 			if (inset) {
 				label = inset->getParam("reference");
-				savePosition(0);
+				// persistent=false: use temp_bookmark
+				saveBookmark(false);
 			}
 		}
 
@@ -786,21 +747,34 @@ bool BufferView::dispatch(FuncRequest const & cmd)
 
 	case LFUN_PARAGRAPH_GOTO: {
 		int const id = convert<int>(to_utf8(cmd.argument()));
-		ParIterator par = buffer_->getParFromID(id);
-		if (par == buffer_->par_iterator_end()) {
-			lyxerr[Debug::INFO] << "No matching paragraph found! ["
-					    << id << ']' << endl;
-			break;
-		} else {
-			lyxerr[Debug::INFO] << "Paragraph " << par->id()
-					    << " found." << endl;
+		int i = 0;
+		for (Buffer * b = buffer_; i == 0 || b != buffer_; b = theBufferList().next(b)) {
+			ParIterator par = b->getParFromID(id);
+			if (par == b->par_iterator_end()) {
+				lyxerr[Debug::INFO]
+					<< "No matching paragraph found! ["
+					<< id << "]." << endl;
+			} else {
+				lyxerr[Debug::INFO]
+					<< "Paragraph " << par->id()
+					<< " found in buffer `"
+					<< b->fileName() << "'." << endl;
+
+				if (b == buffer_) {
+					// Set the cursor
+					setCursor(makeDocIterator(par, 0));
+					update();
+					switchKeyMap();
+				} else {
+					// Switch to other buffer view and resend cmd
+					theLyXFunc().dispatch(FuncRequest(
+						LFUN_BUFFER_SWITCH, b->fileName()));
+					theLyXFunc().dispatch(cmd);
+				}
+				break;
+			}
+			++i;
 		}
-
-		// Set the cursor
-		setCursor(makeDocIterator(par, 0));
-
-		update();
-		switchKeyMap();
 		break;
 	}
 
@@ -1038,20 +1012,16 @@ void BufferView::clearSelection()
 
 void BufferView::workAreaResize(int width, int height)
 {
-	bool const widthChange = width != width_;
-	bool const heightChange = height != height_;
-
+	// A resize is triggered whenever a window gets focus,
+	// because of the shared rows() of a buffer in multiple
+	// buffer views.
+	
 	// Update from work area
 	width_ = width;
 	height_ = height;
 
-	if (buffer_ && widthChange) {
-		// The WorkArea content needs a resize
+	if (buffer_)
 		resize();
-	}
-
-	if (widthChange || heightChange)
-		update();
 }
 
 
@@ -1063,6 +1033,7 @@ bool BufferView::workAreaDispatch(FuncRequest const & cmd0)
 	// LFUN_FILE_OPEN generated by drag-and-drop.
 	FuncRequest cmd = cmd0;
 
+	// E.g. Qt mouse press when no buffer
 	if (!buffer_)
 		return false;
 
@@ -1070,24 +1041,64 @@ bool BufferView::workAreaDispatch(FuncRequest const & cmd0)
 	cur.push(buffer_->inset());
 	cur.selection() = cursor_.selection();
 
-	// Doesn't go through lyxfunc, so we need to update
-	// the layout choice etc. ourselves
-
-	// E.g. Qt mouse press when no buffer
-	if (!buffer_)
-		return false;
-
 	// Either the inset under the cursor or the
 	// surrounding LyXText will handle this event.
 
 	// Build temporary cursor.
 	cmd.y = min(max(cmd.y, -1), height_);
 	InsetBase * inset = buffer_->text().editXY(cur, cmd.x, cmd.y);
+
 	//lyxerr << BOOST_CURRENT_FUNCTION
 	//       << " * hit inset at tip: " << inset << endl;
 	//lyxerr << BOOST_CURRENT_FUNCTION
 	//       << " * created temp cursor:" << cur << endl;
 
+	// NOTE: editXY returns the top level inset of nested insets. If you happen
+	// to move from a text (inset=0) to a text inside an inset (e.g. an opened
+	// footnote inset, again inset=0), that inset will not be redrawn.
+	if (cmd.action == LFUN_MOUSE_MOTION && cmd.button() == mouse_button::none) {
+		bool need_redraw = false;
+		
+		if (inset != last_inset_) {
+			if (last_inset_)
+				need_redraw |= last_inset_->setMouseHover(false);
+			if (inset)
+				need_redraw |= inset->setMouseHover(true);
+			last_inset_ = inset;
+		}
+
+		// if last metrics update was in singlepar mode, WorkArea::redraw() will
+		// not expose the button for redraw. We adjust here the metrics dimension
+		// to enable a full redraw.
+		// FIXME: It is possible to redraw only the area around the button!
+		if (need_redraw && metrics_info_.singlepar) {
+			// FIXME: It should be possible to redraw only the area around 
+			// the button by doing this:
+			//
+			//metrics_info_.singlepar = false;
+			//metrics_info_.y1 = ymin of button;
+			//metrics_info_.y2 = ymax of button;
+			//
+			// Unfortunately, rowpainter.C:paintText() does not distinguish
+			// between background updates and text updates. So we use the hammer
+			// solution for now. We could also avoid the updateMetrics() below
+			// by using the first and last pit of the CoordCache. Have a look
+			// at LyXText::getPitNearY() to see what I mean.
+			//
+			//metrics_info_.pit1 = first pit of CoordCache;
+			//metrics_info_.pit2 = last pit of CoordCache;
+			//metrics_info_.singlepar = false;
+			//metrics_info_.y1 = 0;
+			//metrics_info_.y2 = height_;
+			//
+			updateMetrics(false);
+		}
+
+		// This event (moving without mouse click) is not passed further.
+		// This should be changed if it is further utilized.
+		return need_redraw;
+	}
+
 	// Put anchor at the same position.
 	cur.resetAnchor();
 
@@ -1095,23 +1106,20 @@ bool BufferView::workAreaDispatch(FuncRequest const & cmd0)
 	// via the temp cursor. If the inset wishes to change the real
 	// cursor it has to do so explicitly by using
 	//  cur.bv().cursor() = cur;  (or similar)
-	if (inset)
+	if (inset) {
 		inset->dispatch(cur, cmd);
+	}
 
 	// Now dispatch to the temporary cursor. If the real cursor should
 	// be modified, the inset's dispatch has to do so explicitly.
 	if (!cur.result().dispatched())
 		cur.dispatch(cmd);
 
-	if (cur.result().dispatched()) {
-		// Redraw if requested or necessary.
-		if (cur.result().update())
-			update(Update::FitCursor | Update::Force);
-		else
-			update(Update::FitCursor | Update::MultiParSel);
-	}
+	// Redraw if requested and necessary.
+	if (cur.result().dispatched() && cur.result().update())
+		return update(cur.result().update());
 
-	return true;
+	return false;
 }
 
 
@@ -1198,7 +1206,7 @@ void BufferView::setCursor(DocIterator const & dit)
 }
 
 
-void BufferView::mouseSetCursor(LCursor & cur)
+bool BufferView::mouseSetCursor(LCursor & cur)
 {
 	BOOST_ASSERT(&cur.bv() == this);
 
@@ -1209,14 +1217,15 @@ void BufferView::mouseSetCursor(LCursor & cur)
 
 	// do the dEPM magic if needed
 	// FIXME: move this to InsetText::notifyCursorLeaves?
+	bool update = false;
 	if (!badcursor && cursor_.inTexted())
-		cursor_.text()->deleteEmptyParagraphMechanism(cur, cursor_);
+		update = cursor_.text()->deleteEmptyParagraphMechanism(cur, cursor_);
 
 	cursor_ = cur;
 	cursor_.clearSelection();
 	cursor_.setTargetX();
 	finishUndo();
-
+	return update;
 }
 
 
@@ -1263,14 +1272,9 @@ ViewMetricsInfo const & BufferView::viewMetricsInfo()
 
 void BufferView::updateMetrics(bool singlepar)
 {
-	// FIXME (Abdel 19/10/2006):
-	// There's something fishy in tabular. The coord_cache_ is not
-	// correctly reconstructed when a character is trying to be inserted.
-	// Not clearing out the coord_cache_ fixes the crash but there is a
-	// bad side effect: buffer-begin and buffer-end do not update the screen.
-	//
-	// Remove old position cache
-	coord_cache_.clear();
+	// Clear out the position cache in case of full screen redraw.
+	if (!singlepar)
+		coord_cache_.clear();
 
 	LyXText & buftext = buffer_->text();
 	pit_type size = int(buftext.paragraphs().size());
@@ -1388,7 +1392,7 @@ void BufferView::menuInsertLyXFile(string const & filenm)
 		if (buffer_) {
 			string const trypath = buffer_->filePath();
 			// If directory is writeable, use this as default.
-			if (isDirWriteable(trypath))
+			if (isDirWriteable(FileName(trypath)))
 				initpath = trypath;
 		}
 
@@ -1419,7 +1423,7 @@ void BufferView::menuInsertLyXFile(string const & filenm)
 
 	// Get absolute path of file and add ".lyx"
 	// to the filename if necessary
-	filename = fileSearch(string(), filename, "lyx");
+	filename = fileSearch(string(), filename, "lyx").absFilename();
 
 	docstring const disp_fn = makeDisplayPath(filename);
 	// emit message signal.
@@ -1427,10 +1431,11 @@ void BufferView::menuInsertLyXFile(string const & filenm)
 
 	docstring res;
 	Buffer buf("", false);
-	if (lyx::loadLyXFile(&buf, makeAbsPath(filename))) {
+	if (lyx::loadLyXFile(&buf, FileName(filename))) {
 		ErrorList & el = buffer_->errorList("Parse");
 		// Copy the inserted document error list into the current buffer one.
 		el = buf.errorList("Parse");
+		recordUndo(cursor_);
 		cap::pasteParagraphList(cursor_, buf.paragraphs(),
 					     buf.params().textclass, el);
 		res = _("Document %1$s inserted.");