thanks
john
--
"Not to laugh, not to lament, not to curse, but to understand."
- Spinoza
Index: src/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/ChangeLog,v
retrieving revision 1.299
diff -u -r1.299 ChangeLog
--- src/ChangeLog 2001/08/13 21:46:19 1.299
+++ src/ChangeLog 2001/08/15 20:51:58
@@ -1,3 +1,15 @@
+2001-08-15 John Levon <[EMAIL PROTECTED]>
+
+ * LyxAction.C: add internal LFUN_CITATION_INSERT
+
+ * LyXView.C: actually apply fix
+
+ * bufferlist.C: fix open non-existent file
+
+ * lyxfind.C: fix indentation
+
+ * lyxfunc.C: remove unneeded assert, fix typo
+
2001-08-14 Dekel Tsur <[EMAIL PROTECTED]>
* buffer.C (parseSingleLyXformat2Token): Do not generate errors
Index: src/LyXAction.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/LyXAction.C,v
retrieving revision 1.98
diff -u -r1.98 LyXAction.C
--- src/LyXAction.C 2001/08/03 18:28:03 1.98
+++ src/LyXAction.C 2001/08/15 20:52:02
@@ -153,6 +153,7 @@
ReadOnly },
{ LFUN_CITATION_CREATE, "citation-insert",
N_("Insert citation"), Noop },
+ { LFUN_CITATION_INSERT, "", "internal only", Noop },
{ LFUN_EXEC_COMMAND, "command-execute", "", NoBuffer },
{ LFUN_PREFIX, "command-prefix",
N_("Execute command"), NoBuffer },
Index: src/LyXView.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/LyXView.C,v
retrieving revision 1.57
diff -u -r1.57 LyXView.C
--- src/LyXView.C 2001/08/03 18:28:03 1.57
+++ src/LyXView.C 2001/08/15 20:52:02
@@ -235,6 +235,7 @@
setWindowTitle(title);
last_title = title;
}
+ last_title = title;
}
Index: src/bufferlist.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/bufferlist.C,v
retrieving revision 1.64
diff -u -r1.64 bufferlist.C
--- src/bufferlist.C 2001/08/06 19:12:45 1.64
+++ src/bufferlist.C 2001/08/15 20:52:04
@@ -350,6 +350,12 @@
// File information about normal file
FileInfo fileInfo2(s);
+ if (!fileInfo2.exist()) {
+ WriteAlert(_("Error!"), _("Cannot open file"),
+ MakeDisplayPath(s));
+ return 0;
+ }
+
// Check if emergency save file exists and is newer.
e += OnlyFilename(s) + ".emergency";
FileInfo fileInfoE(e);
Index: src/lyxfind.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/lyxfind.C,v
retrieving revision 1.14
diff -u -r1.14 lyxfind.C
--- src/lyxfind.C 2001/08/13 11:27:53 1.14
+++ src/lyxfind.C 2001/08/15 20:52:04
@@ -104,7 +104,7 @@
bv->update(bv->getLyXText(),
BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
++replace_count;
if (!once)
- found = LyXFind(bv, searchstr, fw, false, casesens, matchwrd);
+ found = LyXFind(bv, searchstr, fw, false, casesens, matchwrd);
} while (!once && replaceall && found);
if (bv->focus())
Index: src/lyxfunc.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/lyxfunc.C,v
retrieving revision 1.253
diff -u -r1.253 lyxfunc.C
--- src/lyxfunc.C 2001/08/05 22:12:00 1.253
+++ src/lyxfunc.C 2001/08/15 20:52:08
@@ -910,8 +910,6 @@
}
}
- lyx::Assert(action != LFUN_SELECT_FILE_SYNC);
-
switch (action) {
case LFUN_ESCAPE:
@@ -1864,7 +1864,7 @@
owner->message(str.str().c_str());
} else {
ostringstream str;
- str << _("Could not open docuent") << ' ' << disp_fn;
+ str << _("Could not open document") << ' ' << disp_fn;
owner->message(str.str().c_str());
}
}
