From f532db40ca8634b95ec8d911cde1d3403926e86b Mon Sep 17 00:00:00 2001
From: Dave Peticolas <dave@krondo.com>
Date: Mon, 10 Jul 2000 00:26:40 +0000
Subject: [PATCH] Merge from stable branch.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@2551 57a11ea4-9604-0410-9ed3-97b8803252fd
---
 AUTHORS                         | 2 +-
 doc/html/C/xacc-about.html      | 2 +-
 src/scm/qif-import/qif-file.scm | 6 +++++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 3c7e171d91..38ea32c354 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -103,7 +103,7 @@ Henning Spruth <spruth@bigfoot.com> for German text & euro date rework
 Robby Stephenson <robby.stephenson@usa.net> register & file history patches
 Herbert Thoma <tma@iis.fhg.de> gnome register & euro support patches
 Diane Trout <detrout@earthlink.net> scheme qif import patch
-Richard Wackerbarth <rkw@dataplex.net> patch to gnc-prices
+Richard Wackerbarth <rkw@dataplex.net> patch to gnc-prices, qif import fixes
 Rob Walker <rob@valinux.com> guile and register patches
 David Woodhouse <dwmw2@infradead.org> Great Britain translations
 Ken Yamaguchi <gooch@ic.EECS.Berkeley.EDU> QIF import fixes; MYM import
diff --git a/doc/html/C/xacc-about.html b/doc/html/C/xacc-about.html
index 45a9b93110..cc94397341 100644
--- a/doc/html/C/xacc-about.html
+++ b/doc/html/C/xacc-about.html
@@ -516,7 +516,7 @@
       <dt><a href="mailto:rkw@dataplex.net">Richard
       Wackerbarth</a></dt>
 
-      <dd>patch to gnc-prices</dd>
+      <dd>patch to gnc-prices, qif import fixes</dd>
 
       <dt><a href="mailto:rob@valinux.com">Rob Walker</a></dt>
 
diff --git a/src/scm/qif-import/qif-file.scm b/src/scm/qif-import/qif-file.scm
index 695172d44e..ffb03600ba 100644
--- a/src/scm/qif-import/qif-file.scm
+++ b/src/scm/qif-import/qif-file.scm
@@ -23,6 +23,7 @@
         (current-xtn #f)
         (current-split #f)
         (current-account-name #f)
+        (last-seen-account-name #f)
         (default-split #f)
         (first-xtn #f)
         (ignore-accounts #f)
@@ -60,6 +61,8 @@
                    (case qstate-type 
                      ((type:bank type:cash type:ccard type:invst
                                  #{type:oth\ a}#  #{type:oth\ l}#)
+                      (if ignore-accounts (set! current-account-name last-seen-account-name))
+                      (set! ignore-accounts #f)
                       (set! current-xtn (make-qif-xtn))
                       (set! default-split (make-qif-split))
                       (qif-split:set-category! default-split "")
@@ -234,7 +237,8 @@
                    ((account)
                     (case tag
                       ((#\N)
-                       (qif-acct:set-name! current-xtn value))
+                       (qif-acct:set-name! current-xtn value)
+                       (set! last-seen-account-name value))
                       ((#\D)
                        (qif-acct:set-description! current-xtn value))
                       ((#\T)