Ignore ligature breaks and hyphenations during simple search (fixes #1468).

[lyx.git] / src / Buffer.cpp

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 26126da83897de6310ce56470b652a7d7f3d9e1a..c7682d11ebba57a081850b3c538a00fed4938edf 100644 (file)
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -128,7 +128,7 @@ namespace {
 
 // Do not remove the comment below, so we get merge conflict in
 // independent branches. Instead add your own.
-int const LYX_FORMAT = 407; // uwestoehr: support for multirow offset
+int const LYX_FORMAT = 408; // gb add script inset
 
 typedef map<string, bool> DepClean;
 typedef map<docstring, pair<InsetLabel const *, Buffer::References> > RefCache;
@@ -189,7 +189,7 @@ public:
        /// is autosave needed?
        mutable bool bak_clean;
 
-       /// is this a unnamed file (New...)?
+       /// is this an unnamed file (New...)?
        bool unnamed;
 
        /// buffer is r/o
@@ -642,10 +642,11 @@ void Buffer::setReadonly(bool const flag)
 }
 
 
-void Buffer::setFileName(string const & newfile)
+void Buffer::setFileName(FileName const & fname)
 {
-       d->filename = makeAbsPath(newfile);
+       d->filename = fname;
        setReadonly(d->filename.isReadOnly());
+       saveCheckSum();
        updateTitles();
 }
 
@@ -1613,7 +1614,7 @@ void Buffer::writeLyXHTMLSource(odocstream & os,
 
                os << "\n<!-- Text Class Preamble -->\n"
                   << features.getTClassHTMLPreamble()
-                  << "\n<!-- Premable Snippets -->\n"
+                  << "\n<!-- Preamble Snippets -->\n"
                   << from_utf8(features.getPreambleSnippets());
 
                os << "\n<!-- Layout-provided Styles -->\n";
@@ -4145,7 +4146,7 @@ bool Buffer::saveAs(FileName const & fn)
        FileName const old_auto = getAutosaveFileName();
        bool const old_unnamed = isUnnamed();
 
-       setFileName(fn.absFileName());
+       setFileName(fn);
        markDirty();
        setUnnamed(false);
 
@@ -4164,9 +4165,8 @@ bool Buffer::saveAs(FileName const & fn)
        } else {
                // save failed
                // reset the old filename and unnamed state
-               setFileName(old_name.absFileName());
+               setFileName(old_name);
                setUnnamed(old_unnamed);
-               saveCheckSum();
                return false;
        }
 }