update default branch to release as 4.0 Now that we plan to release default instead of the gui-release branch as 4.0, restore functions removed from the default branch. * java_new.m, default_save_options.m, gen_doc_cache.m, interp1q.m, isequalwithequalnans.m, java_convert_matrix.m, java_debug.m, java_invoke.m, java_unsigned_conversion.m, javafields.m, javamethods.m, re_read_readline_init_file.m, read_readline_init_file.m, saving_history.m: Restore deprecated functions. * scripts/deprecated/module.mk: Update. * NEWS: Update. * configure.ac (AC_INIT): Set version to 3.9.0+. (OCTAVE_MAJOR_VERSION): Now 3. (OCTAVE_MINOR_VERSION): Now 9.

--- a/scripts/deprecated/nfields.m
+++ b/scripts/deprecated/nfields.m
@@ -20,11 +20,13 @@
 ## @deftypefn {Function File} {} nfields (@var{s})
 ## Return the number of fields of the structure @var{s}.
 ##
-## @strong{Warning:} @code{nfields} is scheduled for removal in version 4.6.
+## @strong{Warning:} @code{nfields} is scheduled for removal in version 4.4.
 ## Use @code{numfields} instead.
 ## @seealso{numfields, fieldnames}
 ## @end deftypefn
 
+## Deprecated in 4.0
+
 function retval = nfields (varargin)
 
   persistent warned = false;