Re: lethal bug--insert lyx file destroyed document

2003-01-16 Thread Dr. Richard E. Hawkins
On Thu, Jan 16, 2003 at 10:12:46PM +0100, Lars Gullik Bj?nnes wrote:
> "Dr. Richard E. Hawkins" <[EMAIL PROTECTED]> writes:
> 
> | I used insert lyx file to insert another file into an appendix.  It
> | wiped out *everything* but the new file!  Undo gave me back only the
> | most recent paragraph upon which I was working.

> | Fortunately, I had just saved.

> Am I correct in guessing that the file you inserted is not created
> with lyx 1.3.0cvs?
> I.e. it had to be run throught lyx2lyx?

There are two possible files that it could have been; one was dated Jan
8 2001, the other Jan 5 2002.  (I needed a syllabus to work with; any
syllabus).  Either would have come from reasonably current cvs lyx
(whatever the devel version would have been on those dates).

hawk
-- 
Richard E. Hawkins, Asst. Prof. of Economics/"\   ASCII ribbon campaign
[EMAIL PROTECTED]  Smeal 178  (814) 375-4700  \ /   against HTML mail
These opinions will not be those of  Xand postings. 
Penn State until it pays my retainer.   / \   



Re: lethal bug--insert lyx file destroyed document

2003-01-16 Thread Lars Gullik Bjønnes
"Dr. Richard E. Hawkins" <[EMAIL PROTECTED]> writes:

| I used insert lyx file to insert another file into an appendix.  It
| wiped out *everything* but the new file!  Undo gave me back only the
| most recent paragraph upon which I was working.
| 
| Fortunately, I had just saved.

Am I correct in guessing that the file you inserted is not created
with lyx 1.3.0cvs?
I.e. it had to be run throught lyx2lyx?

-- 
Lgb



Re: lethal bug--insert lyx file destroyed document

2003-01-16 Thread Lars Gullik Bjønnes
"Dr. Richard E. Hawkins" <[EMAIL PROTECTED]> writes:

| I used insert lyx file to insert another file into an appendix.  It
| wiped out *everything* but the new file!  Undo gave me back only the
| most recent paragraph upon which I was working.
| 
| Fortunately, I had just saved.
| 
| hawk, heart still pounding

Ooops...

I belive this is the fix:


Index: src/buffer.C
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/buffer.C,v
retrieving revision 1.396
diff -u -p -r1.396 buffer.C
--- src/buffer.C	13 Jan 2003 10:52:17 -	1.396
+++ src/buffer.C	16 Jan 2003 21:06:50 -
@@ -1216,7 +1216,7 @@ bool Buffer::readFile(LyXLex & lex, stri
 	istringstream is(STRCONV(ret.second));
 	LyXLex tmplex(0, 0);
 	tmplex.setStream(is);
-	return readFile(tmplex, string());
+	return readFile(tmplex, string(), par);
 } else {
 	// This code is reached if lyx2lyx failed (for
 	// some reason) to change the file format of



Can you please check if that is the case.
(And if it is not the correct fix, it is still a serious bug.)

(I know who the culpist is...)

-- 
Lgb