It seems that the discussion regarding a short-term fix has died,
so I'm assuming that Hui is OK for now with changing nquery to query.

Here is a patch that I tested on x86_64-linux, no regression.
Will commit in the head and 7.0 branches in a couple of days pending
objections.

MarcK, did you write a patch like this one, a while ago. You should
get credit for it if you did.

2009-09-22  Joel Brobecker  <brobecker@adacore.com>

        * record.c (record_open, record_store_registers, record_xfer_partial):
        Replace calls to nquery by calls to query.

-- 
Joel