From 68c534d2ed443399934b24ac92bfa8991ccccf39 Mon Sep 17 00:00:00 2001
From: Fumitoshi UKAI <ukai@debian.or.jp>
Date: Mon, 27 Jan 2003 16:18:48 +0000
Subject: [w3m-dev 03689] Re: fold patch * fm.h (BufferPos): add bpos * main.c
 (save_buffer_position): bpos initialize 	(resetPos): reset bpos From:
 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>

---
 ChangeLog | 9 ++++++++-
 fm.h      | 3 ++-
 main.c    | 4 +++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3844d2f..16b2ae2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-01-28  Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+	* [w3m-dev 03689] Re: fold patch
+	* fm.h (BufferPos): add bpos
+	* main.c (save_buffer_position): bpos initialize
+		(resetPos): reset bpos
+
 2003-01-26  Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
 
 	* [w3m-dev 03686] Re: fold patch
@@ -6869,4 +6876,4 @@ a	* [w3m-dev 03276] compile error on EWS4800
 	* release-0-2-1
 	* import w3m-0.2.1
 
-$Id: ChangeLog,v 1.717 2003/01/25 17:42:17 ukai Exp $
+$Id: ChangeLog,v 1.718 2003/01/27 16:18:48 ukai Exp $
diff --git a/fm.h b/fm.h
index b4925c9..30fd5ab 100644
--- a/fm.h
+++ b/fm.h
@@ -1,4 +1,4 @@
-/* $Id: fm.h,v 1.108 2003/01/25 17:42:17 ukai Exp $ */
+/* $Id: fm.h,v 1.109 2003/01/27 16:18:52 ukai Exp $ */
 /* 
  * w3m: WWW wo Miru utility
  * 
@@ -471,6 +471,7 @@ typedef struct _BufferPos {
     long cur_linenumber;
     int currentColumn;
     int pos;
+    int bpos;
     struct _BufferPos *next;
     struct _BufferPos *prev;
 } BufferPos;
diff --git a/main.c b/main.c
index 2f12fc5..c06573f 100644
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.200 2003/01/25 17:42:17 ukai Exp $ */
+/* $Id: main.c,v 1.201 2003/01/27 16:18:53 ukai Exp $ */
 #define MAINPROGRAM
 #include "fm.h"
 #include <signal.h>
@@ -6313,6 +6313,7 @@ save_buffer_position(Buffer *buf)
     b->cur_linenumber = CUR_LINENUMBER(buf);
     b->currentColumn = buf->currentColumn;
     b->pos = buf->pos;
+    b->bpos = buf->currentLine ? buf->currentLine->bpos : 0;
     b->next = NULL;
     b->prev = buf->undo;
     if (buf->undo)
@@ -6328,6 +6329,7 @@ resetPos(BufferPos * b)
 
     top.linenumber = b->top_linenumber;
     cur.linenumber = b->cur_linenumber;
+    cur.bpos = b->bpos;
     buf.topLine = &top;
     buf.currentLine = &cur;
     buf.pos = b->pos;
-- 
cgit v1.2.3