* output_plaintext.C: cosmetics in comment: line length cannot be < 0

[lyx.git] / src / lyxfunc.C

diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index 3552d17a0f0c3f57189d8db4737479aa63907537..6bea04231801bbc5aa72691266e08322d1c294dc 100644 (file)
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -899,7 +899,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                                text, 0, 1, _("&Revert"), _("&Cancel"));
 
                        if (ret == 0)
-                               view()->reload();
+                               reloadBuffer();
                        break;
                }
 
@@ -1121,8 +1121,9 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                                break;
                        if (!lyx_view_->buffer()->lyxvc().inUse()) {
                                lyx_view_->buffer()->lyxvc().registrer();
-                               view()->reload();
+                               reloadBuffer();
                        }
+                       updateFlags = Update::Force;
                        break;
 
                case LFUN_VC_CHECK_IN:
@@ -1132,7 +1133,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                        if (lyx_view_->buffer()->lyxvc().inUse()
                                        && !lyx_view_->buffer()->isReadonly()) {
                                lyx_view_->buffer()->lyxvc().checkIn();
-                               view()->reload();
+                               reloadBuffer();
                        }
                        break;
 
@@ -1143,20 +1144,20 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                        if (lyx_view_->buffer()->lyxvc().inUse()
                                        && lyx_view_->buffer()->isReadonly()) {
                                lyx_view_->buffer()->lyxvc().checkOut();
-                               view()->reload();
+                               reloadBuffer();
                        }
                        break;
 
                case LFUN_VC_REVERT:
                        BOOST_ASSERT(lyx_view_ && lyx_view_->buffer());
                        lyx_view_->buffer()->lyxvc().revert();
-                       view()->reload();
+                       reloadBuffer();
                        break;
 
                case LFUN_VC_UNDO_LAST:
                        BOOST_ASSERT(lyx_view_ && lyx_view_->buffer());
                        lyx_view_->buffer()->lyxvc().undoLast();
-                       view()->reload();
+                       reloadBuffer();
                        break;
 
                // --- buffers ----------------------------------------
@@ -2049,6 +2050,13 @@ void LyXFunc::closeBuffer()
 }
 
 
+void LyXFunc::reloadBuffer()
+{
+       FileName filename(lyx_view_->buffer()->fileName());
+       closeBuffer();
+       lyx_view_->loadLyXFile(filename);
+}
+
 // Each "lyx_view_" should have it's own message method. lyxview and
 // the minibuffer would use the minibuffer, but lyxserver would
 // send an ERROR signal to its client.  Alejandro 970603
@@ -2112,8 +2120,8 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new)
        switch (tag) {
        case LyXRC::RC_ACCEPT_COMPOUND:
        case LyXRC::RC_ALT_LANG:
-       case LyXRC::RC_ASCIIROFF_COMMAND:
-       case LyXRC::RC_ASCII_LINELEN:
+       case LyXRC::RC_PLAINTEXT_ROFF_COMMAND:
+       case LyXRC::RC_PLAINTEXT_LINELEN:
        case LyXRC::RC_AUTOREGIONDELETE:
        case LyXRC::RC_AUTORESET_OPTIONS:
        case LyXRC::RC_AUTOSAVE: