--- a/.hgsubstate	Wed Oct 23 22:48:29 2013 -0400
+++ b/.hgsubstate	Tue Nov 05 12:27:42 2013 -0500
@@ -1,1 +1,1 @@
-6057744acd2c71c069a4b171c5fe1ff0d86c9e5f gnulib-hg
+6d4e36653a40da6604507406f2a97e3e64bf9dbf gnulib-hg

--- a/Makefile.am	Wed Oct 23 22:48:29 2013 -0400
+++ b/Makefile.am	Tue Nov 05 12:27:42 2013 -0500
@@ -64,6 +64,7 @@
   etc/README.gnuplot \
   etc/README.kpathsea \
   etc/gdbinit \
+  etc/octave.appdata.xml \
   run-octave.in
 
 include m4/module.mk

--- a/NEWS	Wed Oct 23 22:48:29 2013 -0400
+++ b/NEWS	Tue Nov 05 12:27:42 2013 -0500
@@ -1,22 +1,10 @@
-<pre>
-Summary of important user-visible changes for version 4.0:
+Summary of important user-visible changes for version 3.8:
 ---------------------------------------------------------
 
- ** A new GUI is now available with Octave.
-
- ** Warning states may now be set temporarily, until the end of the
-    current function, using the syntax
-
-      warning STATE ID "local"
-
-    in which STATE may be "on", "off", or "error".  Changes to warning
-    states that are set locally affect the current function and all
-    functions called from the current scope.  The previous warning state
-    is restored on return from the current function.  The "local"
-    option is ignored if used in the top-level workspace.
-
-Summary of important user-visible changes for version 3.8:
----------------------------------------------------------
+ ** A GUI is now available with Octave and is the default when starting
+    an interactive session.  The original command line interface is also
+    available and can be entered by using the "--no-gui" option when
+    invoking Octave.
 
  ** Octave now uses OpenGL graphics by default with FLTK widgets.  If
     OpenGL libraries or FLTK widgets are not available when Octave is
@@ -28,6 +16,12 @@
     Adding this command to your ~/.octaverc file will set the default
     for each session.
 
+ ** Printing or saving figures with OpenGL graphics requires the
+    gl2ps library which is no longer distributed with Octave.  The
+    software is widely available in most package managers.  If a
+    pre-compiled package does not exist for your system, you can find
+    the current sources at http://www.geuz.org/gl2ps/.
+
  ** Octave now supports nested functions with scoping rules that are
     compatible with Matlab.  A nested function is one declared and defined
     within the body of another function.  The nested function is only
@@ -110,6 +104,17 @@
     When classdef-style classes are added to Octave, the exception-id
     will become an MException object.
 
+ ** Warning states may now be set temporarily, until the end of the
+    current function, using the syntax
+
+      warning STATE ID "local"
+
+    in which STATE may be "on", "off", or "error".  Changes to warning
+    states that are set locally affect the current function and all
+    functions called from the current scope.  The previous warning state
+    is restored on return from the current function.  The "local"
+    option is ignored if used in the top-level workspace.
+
  ** Warning IDs renamed:
 
     Octave:array-as-scalar => Octave:array-to-scalar
@@ -158,7 +163,7 @@
     \sl          slanted     \slOblique Text     slanted font
     \rm          normal      \bfBold\rmNormal    normal font
     {}           group       {\bf Bold}Normal    group objects
-                             e^{i*\pi} = -1      complex example
+                             e^{i*\pi} = -1      group objects
 
  ** The m-files in the plot directory have been overhauled.
 
@@ -305,12 +310,12 @@
       copyobj                    history_save     rgbplot
       dawson                     imformats        save_default_options
       dblist                     importdata       shrinkfaces
-      debug_jit                  isaxes           splinefit
-      desktop                    iscolormap       stemleaf
-      doc_cache_create           isequaln         strjoin
-      ellipj                     jit_debug        struct2hdl
-      ellipke                    jit_enable       tetramesh
-      erfcinv                    jit_startcnt     waterfall
+      desktop                    isaxes           splinefit
+      doc_cache_create           iscolormap       stemleaf
+      ellipj                     isequaln         strjoin
+      ellipke                    jit_debug        struct2hdl
+      erfcinv                    jit_enable       tetramesh
+                                 jit_startcnt     waterfall
 
  ** Deprecated functions.
 
@@ -1477,4 +1482,3 @@
       spchol2inv          splu
 
 See NEWS.3 for old news.
-</pre>

--- a/bootstrap.conf	Wed Oct 23 22:48:29 2013 -0400
+++ b/bootstrap.conf	Tue Nov 05 12:27:42 2013 -0500
@@ -38,6 +38,8 @@
   fnmatch
   fopen
   fpucw
+  frexp
+  frexpf
   fseek
   ftell
   getcwd
@@ -70,7 +72,6 @@
   round
   roundf
   select
-  setenv
   sigaction
   signal
   sigprocmask

--- a/build-aux/common.mk	Wed Oct 23 22:48:29 2013 -0400
+++ b/build-aux/common.mk	Tue Nov 05 12:27:42 2013 -0500
@@ -228,6 +228,13 @@
 FFTW_XLDFLAGS = $(FFTW3_LDFLAGS) $(FFTW3F_LDFLAGS)
 FFTW_XLIBS = $(FFTW3_LIBS) $(FFTW3F_LIBS)
 
+## Alias CPPFLAGS to CFLAGS.
+## This is closer to the true meaning of `pkg-config --cflags` output.
+FONTCONFIG_CPPFLAGS = @FONTCONFIG_CFLAGS@
+FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
+
+## Alias CPPFLAGS to CFLAGS.
+FT2_CPPFLAGS = @FT2_CFLAGS@
 FT2_CFLAGS = @FT2_CFLAGS@
 FT2_LIBS = @FT2_LIBS@
 
@@ -238,6 +245,8 @@
 GRAPHICS_CFLAGS = @GRAPHICS_CFLAGS@
 GRAPHICS_LIBS = @GRAPHICS_LIBS@
 
+GL2PS_LIBS = @GL2PS_LIBS@
+
 HDF5_CPPFLAGS = @HDF5_CPPFLAGS@
 HDF5_LDFLAGS = @HDF5_LDFLAGS@
 HDF5_LIBS = @HDF5_LIBS@
@@ -257,6 +266,9 @@
 
 OPENGL_LIBS = @OPENGL_LIBS@
 
+PCRE_CPPFLAGS = @PCRE_CPPFLAGS@
+PCRE_LIBS = @PCRE_LIBS@
+
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
 PTHREAD_LIBS = @PTHREAD_LIBS@
 
@@ -268,8 +280,6 @@
 QRUPDATE_LDFLAGS = @QRUPDATE_LDFLAGS@
 QRUPDATE_LIBS = @QRUPDATE_LIBS@
 
-REGEX_LIBS = @REGEX_LIBS@
-
 READLINE_LIBS = @READLINE_LIBS@
 
 SPARSE_XCPPFLAGS = \
@@ -553,6 +563,7 @@
   -e "s|%OCTAVE_CONF_FFTW3F_LDFLAGS%|\"${FFTW3F_LDFLAGS}\"|" \
   -e "s|%OCTAVE_CONF_FFTW3F_LIBS%|\"${FFTW3F_LIBS}\"|" \
   -e "s|%OCTAVE_CONF_FLIBS%|\"${FLIBS}\"|" \
+  -e "s|%OCTAVE_CONF_FONTCONFIG_CFLAGS%|\"${FONTCONFIG_CFLAGS}\"|" \
   -e "s|%OCTAVE_CONF_FPICFLAG%|\"${FPICFLAG}\"|" \
   -e "s|%OCTAVE_CONF_FT2_CFLAGS%|\"${FT2_CFLAGS}\"|" \
   -e "s|%OCTAVE_CONF_FT2_LIBS%|\"${FT2_LIBS}\"|" \
@@ -601,6 +612,8 @@
   -e "s|%OCTAVE_CONF_OCT_LINK_DEPS%|\"${OCT_LINK_DEPS}\"|" \
   -e "s|%OCTAVE_CONF_OCT_LINK_OPTS%|\"${OCT_LINK_OPTS}\"|" \
   -e "s|%OCTAVE_CONF_OPENGL_LIBS%|\"${OPENGL_LIBS}\"|" \
+  -e "s|%OCTAVE_CONF_PCRE_CPPFLAGS%|\"${PCRE_CPPFLAGS}\"|" \
+  -e "s|%OCTAVE_CONF_PCRE_LIBS%|\"${PCRE_LIBS}\"|" \
   -e "s|%OCTAVE_CONF_PREFIX%|\"${prefix}\"|" \
   -e "s|%OCTAVE_CONF_PTHREAD_CFLAGS%|\"${PTHREAD_CFLAGS}\"|" \
   -e "s|%OCTAVE_CONF_PTHREAD_LIBS%|\"${PTHREAD_LIBS}\"|" \
@@ -616,7 +629,6 @@
   -e "s|%OCTAVE_CONF_RANLIB%|\"${RANLIB}\"|" \
   -e "s|%OCTAVE_CONF_RDYNAMIC_FLAG%|\"${RDYNAMIC_FLAG}\"|" \
   -e "s|%OCTAVE_CONF_READLINE_LIBS%|\"${READLINE_LIBS}\"|" \
-  -e "s|%OCTAVE_CONF_REGEX_LIBS%|\"${REGEX_LIBS}\"|" \
   -e "s|%OCTAVE_CONF_SED%|\"${SED}\"|" \
   -e "s|%OCTAVE_CONF_SHARED_LIBS%|\"${SHARED_LIBS}\"|" \
   -e "s|%OCTAVE_CONF_SHLEXT%|\"${SHLEXT}\"|" \

--- a/configure.ac	Wed Oct 23 22:48:29 2013 -0400
+++ b/configure.ac	Tue Nov 05 12:27:42 2013 -0500
@@ -664,7 +664,7 @@
 
 ### Check for PCRE regex library.
 
-REGEX_LIBS=
+PCRE_LIBS=
 
 pcre_fail_msg="to build Octave, you must have the PCRE library and header files installed"
 
@@ -687,18 +687,19 @@
     ac_cv_pcre_h_macros_present=yes, ac_cv_pcre_h_macros_present=no)])
 
 if test $ac_cv_pcre_h_macros_present = yes; then
-  ## check for pcre-config, and if so, set XTRA_CXXFLAGS appropriately
+  ## check for pcre-config, and if so, get build variables
   AC_CHECK_PROG(HAVE_PCRE_CONFIG, pcre-config, [yes], [no])
   if test $HAVE_PCRE_CONFIG = yes; then
-    XTRA_CXXFLAGS="$XTRA_CXXFLAGS `pcre-config --cflags`"
-    REGEX_LIBS=`pcre-config --libs`
+    PCRE_CPPFLAGS=`pcre-config --cflags`
+    PCRE_LIBS=`pcre-config --libs`
   else
-    REGEX_LIBS="-lpcre"
+    PCRE_LIBS="-lpcre"
   fi
   save_LIBS="$LIBS"
-  LIBS="$REGEX_LIBS $LIBS"
+  LIBS="$PCRE_LIBS $LIBS"
   AC_CHECK_FUNCS([pcre_compile],
-    [AC_SUBST(REGEX_LIBS)],
+    [AC_SUBST(PCRE_CPPFLAGS)
+     AC_SUBST(PCRE_LIBS)],
     [AC_MSG_ERROR([$pcre_fail_msg])])
   LIBS="$save_LIBS"
 else
@@ -718,12 +719,12 @@
 
  ### Check for the LLVM library
 
-build_jit=no
+build_jit=yes
 AC_ARG_ENABLE([jit],
   [AS_HELP_STRING([--enable-jit],
     [(EXPERIMENTAL) enable JIT compiler])],
-  [if test "$enableval" = yes; then
-     build_jit=yes
+  [if test "$enableval" = no; then
+     build_jit=no
    fi],
   [])
 
@@ -772,9 +773,7 @@
     CPPFLAGS="-D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS $LLVM_CPPFLAGS $CPPFLAGS"
     CXXFLAGS="$LLVM_CXXFLAGS $CXXFLAGS"
     AC_LANG_PUSH(C++)
-    AC_CHECK_HEADER([llvm/Support/TargetSelect.h], [
-      warn_llvm=
-      XTRA_CXXFLAGS="$XTRA_CXXFLAGS $LLVM_CXXFLAGS $LLVM_CPPFLAGS"])
+    AC_CHECK_HEADER([llvm/Support/TargetSelect.h], [warn_llvm=""])
 
     have_function_h=no
     AC_CHECK_HEADERS([llvm/IR/Function.h llvm/Function.h],
@@ -953,9 +952,9 @@
   ## packages add extra flags that are useful when building
   ## Graphics/ImageMagick++ extentions.  These extra flags break the
   ## Octave build. 
+  MAGICK_CPPFLAGS=`$PKG_CONFIG --cflags-only-I $magick++`
   MAGICK_LDFLAGS=`$PKG_CONFIG --libs-only-L $magick++`
   MAGICK_LIBS=`$PKG_CONFIG --libs-only-l $magick++`
-  MAGICK_CPPFLAGS=`$PKG_CONFIG --cflags-only-I $magick++`
 
   warn_magick="$magick++ library fails tests.  The imread function for reading image files will not be fully functional."
 
@@ -1072,25 +1071,24 @@
 
   PKG_CHECK_MODULES([FT2], [freetype2], [
     min_ft2_version=9.03
-    AC_MSG_CHECKING([for FreeType -- version >= $min_ft2_version])
+    AC_MSG_CHECKING([for FreeType2 version >= $min_ft2_version])
     $PKG_CONFIG freetype2 --atleast-version=$min_ft2_version
     ac_status=$?
     if test $ac_status = 0; then
       AC_MSG_RESULT(yes)
       AC_DEFINE(HAVE_FREETYPE, 1, [Define to 1 if you have Freetype library.])
-      XTRA_CXXFLAGS="$XTRA_CXXFLAGS $FT2_CFLAGS"
       save_LIBS="$LIBS"
       LIBS="$FT2_LIBS $LIBS"
       AC_CHECK_FUNCS([FT_Reference_Face])
       LIBS="$save_LIBS"
     else
       AC_MSG_RESULT(no)
-      warn_freetype="FreeType library not found.  Native graphics will be disabled."
+      warn_freetype="FreeType library >= 9.03 not found.  Native graphics will be disabled."
     fi])
 
   if test -n "$warn_freetype"; then
+    native_graphics=no
     OCTAVE_CONFIGURE_WARNING([warn_freetype])
-    native_graphics=no
   fi
 
   ## Check for fontconfig library
@@ -1100,7 +1098,6 @@
     PKG_CHECK_MODULES(FONTCONFIG, [fontconfig],
       [have_fontconfig=yes
        OPENGL_LIBS="$FONTCONFIG_LIBS $OPENGL_LIBS"
-       XTRA_CXXFLAGS="$XTRA_CXXFLAGS $FONTCONFIG_CFLAGS"
        AC_DEFINE(HAVE_FONTCONFIG, 1, [Define to 1 if fontconfig is present.])],
       [have_fontconfig=no
        warn_fontconfig="Fontconfig library not found.  Native graphics will be disabled."])
@@ -1190,6 +1187,15 @@
 AC_SUBST(GRAPHICS_CFLAGS)
 AC_SUBST(GRAPHICS_LIBS)
 
+## Check for gl2ps which is required for printing with OpenGL graphics
+if test $native_graphics = yes; then
+  AC_CHECK_HEADERS([gl2ps.h],
+    [GL2PS_LIBS="-lgl2ps"],
+    [AC_MSG_WARN([gl2ps library not found.  OpenGL printing is disabled.])])
+fi
+
+AC_SUBST(GL2PS_LIBS)
+
 ### Start determination of shared vs. static libraries
 
 ## Use -static if compiling on Alpha OSF/1 1.3 systems.
@@ -1904,13 +1910,13 @@
 
 if test "$cross_compiling" = yes && test -n "$ac_tool_prefix"; then
   CROSS_TOOL_PREFIX="$ac_tool_prefix"
-  MKOCTFILE_AR='$(shell echo $(AR) | $SED "s,$(CROSS_TOOL_PREFIX),,")'
-  MKOCTFILE_CC='$(shell echo $(CC) | $SED "s,$(CROSS_TOOL_PREFIX),,")'
-  MKOCTFILE_CXX='$(shell echo $(CXX) | $SED "s,$(CROSS_TOOL_PREFIX),,")'
-  MKOCTFILE_DL_LD='$(shell echo $(DL_LD) | $SED "s,$(CROSS_TOOL_PREFIX),,")'
-  MKOCTFILE_F77='$(shell echo $(F77) | $SED "s,$(CROSS_TOOL_PREFIX),,")'
-  MKOCTFILE_LD_CXX='$(shell echo $(LD_CXX) | $SED "s,$(CROSS_TOOL_PREFIX),,")'
-  MKOCTFILE_RANLIB='$(shell echo $(RANLIB) | $SED "s,$(CROSS_TOOL_PREFIX),,")'
+  MKOCTFILE_AR='$(shell echo $(AR) | $(SED) "s,$(CROSS_TOOL_PREFIX),,")'
+  MKOCTFILE_CC='$(shell echo $(CC) | $(SED) "s,$(CROSS_TOOL_PREFIX),,")'
+  MKOCTFILE_CXX='$(shell echo $(CXX) | $(SED) "s,$(CROSS_TOOL_PREFIX),,")'
+  MKOCTFILE_DL_LD='$(shell echo $(DL_LD) | $(SED) "s,$(CROSS_TOOL_PREFIX),,")'
+  MKOCTFILE_F77='$(shell echo $(F77) | $(SED) "s,$(CROSS_TOOL_PREFIX),,")'
+  MKOCTFILE_LD_CXX='$(shell echo $(LD_CXX) | $(SED) "s,$(CROSS_TOOL_PREFIX),,")'
+  MKOCTFILE_RANLIB='$(shell echo $(RANLIB) | $(SED) "s,$(CROSS_TOOL_PREFIX),,")'
 else
   MKOCTFILE_AR="$AR"
   MKOCTFILE_CC="$CC"
@@ -2374,6 +2380,7 @@
 JAVA_LIBS=
 
 ## Fake loop so that "break" can be used to skip code blocks.
+warn_java=""
 while test $build_java = yes
 do
   ## Unset build_java.  Variable is set only if all configuration tests pass.
@@ -2381,8 +2388,8 @@
 
   ## Warn if JAVA_HOME is unset.  It is *strongly* advised to specify JAVA_HOME.
   if test -z "$JAVA_HOME"; then
-    AC_MSG_WARN([JAVA_HOME environment variable not initialized.])
-    AC_MSG_WARN([Auto-detection will proceed but is unreliable.])
+    warn_java_home="JAVA_HOME environment variable not initialized. Auto-detection will proceed but is unreliable."
+    OCTAVE_CONFIGURE_WARNING([warn_java_home])
   fi
 
   ## Search for a viable Java executable.
@@ -2394,7 +2401,7 @@
   AC_PATH_PROG(JAVA, java, [], [$JAVA_PATH])
 
   if test -z "$JAVA"; then
-    AC_MSG_WARN([No Java executable found.  Octave will not be able to call Java methods.])   
+    warn_java="No Java executable found.  Octave will not be able to call Java methods."
     break
   fi
 
@@ -2447,13 +2454,13 @@
   if test $java_major -ge 1 && test $java_minor -ge 5; then
     :  # Version is ok.  Do nothing.
   else
-    AC_MSG_WARN([Java version is too old (< 1.5).  Octave will not be able to call Java methods.])
+    warn_java="Java version is too old (< 1.5).  Octave will not be able to call Java methods."
     break
   fi
 
-  ## At this point Win32/MSVC systems have enough configuration data.  We
-  ## assume that all appropriate variables (e.g. INCLUDE and LIB) already have
-  ## the required paths to compile and link against JDK.
+  ## At this point Win32 systems have enough configuration data.
+  ## We assume that all appropriate variables (e.g. INCLUDE and LIB) already
+  ## contain the required paths to compile and link against JDK.
   case $host_os in
     msdosmsvc)
       build_java=yes
@@ -2462,14 +2469,20 @@
         [Define to 1 if Java is available and is at least version 1.5])
       break
     ;;
-    mingw*)
-      if test $have_msvc = yes; then
-        build_java=yes
-        JAVA_LIBS=-ladvapi32
-        AC_DEFINE(HAVE_JAVA, 1,
-          [Define to 1 if Java is available and is at least version 1.5])
-        break
+    mingw* | cygwin*)
+      build_java=yes
+      JAVA_LIBS=-ladvapi32
+      if test $have_msvc = no; then
+        if test -n "$JAVA_CPPFLAGS"; then
+          JAVA_CPPFLAGS="-I${JAVA_CPPFLAGS}/include -I${JAVA_CPPFLAGS}/include/win32"
+        else
+          JAVA_CPPFLAGS="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/win32"
+        fi
+        LDFLAGS="$LDFLAGS -Wl,--export-all-symbols"
       fi
+      AC_DEFINE(HAVE_JAVA, 1,
+        [Define to 1 if Java is available and is at least version 1.5])
+      break
     ;;
   esac
 
@@ -2478,9 +2491,6 @@
     darwin*)
       jvmlib=libjvm.dylib
     ;;
-    mingw* | cygwin*)
-      jvmlib=jvm.dll
-    ;;
     *)
       jvmlib=libjvm.so
     ;;
@@ -2539,7 +2549,7 @@
 
   if test -z "$JAVA_LDPATH"; then
     AC_MSG_RESULT([not found])
-    AC_MSG_WARN([Library $jvmlib not found.  Octave will not be able to call Java methods.])
+    warn_java="Library $jvmlib not found.  Octave will not be able to call Java methods."
     break
   else
     AC_MSG_RESULT([$JAVA_LDPATH])
@@ -2562,15 +2572,6 @@
       fi
       JAVA_LIBS="-framework JavaVM"
     ;;
-    mingw* | cygwin*)
-      if test -n "$JAVA_CPPFLAGS"; then
-        JAVA_CPPFLAGS="-I${JAVA_CPPFLAGS}/include -I${JAVA_CPPFLAGS}/include/win32"
-      else
-        JAVA_CPPFLAGS="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/win32"
-      fi
-      JAVA_LIBS=-ladvapi32
-      LDFLAGS="$LDFLAGS -Wl,--export-all-symbols"
-    ;;
     *)
       if test -n "$JAVA_CPPFLAGS"; then
         JAVA_CPPFLAGS="-I${JAVA_CPPFLAGS}/include -I${JAVA_CPPFLAGS}/include/linux"
@@ -2590,7 +2591,7 @@
     AC_MSG_RESULT([$dir])
   else
     AC_MSG_RESULT([not found])
-    AC_MSG_WARN([Include file <jni.h> not found.  Octave will not be able to call Java methods.])
+    warn_java="Include file <jni.h> not found.  Octave will not be able to call Java methods."
     break
   fi
 
@@ -2600,6 +2601,9 @@
     [Define to 1 if Java is available and is at least version 1.5])
   break
 done
+if test -n "$warn_java"; then
+  OCTAVE_CONFIGURE_WARNING([warn_java])
+fi
 
 AM_CONDITIONAL([AMCOND_HAVE_JAVA], [test $build_java = yes])
 AC_SUBST(JAVA)
@@ -2622,10 +2626,12 @@
   [if test "$enableval" = no; then build_gui=no; fi], [])
 
 if test $build_gui = yes; then
+
+  warn_gui=""
   ## Check for Qt libraries
   PKG_CHECK_MODULES(QT, [QtCore, QtGui, QtNetwork],
     [],
-    [AC_MSG_WARN([Qt libraries not found -- disabling GUI])
+    [warn_gui="Qt libraries not found -- disabling GUI"
      build_gui=no])
 
   if test $build_gui = yes; then
@@ -2636,7 +2642,7 @@
 
     ## Check for Qt4
     if ! `$PKG_CONFIG --atleast-version=4.0.0 QtCore`; then
-      AC_MSG_WARN([Qt >= 4.0.0 not found -- disabling GUI])
+      warn_gui="Qt >= 4.0.0 not found -- disabling GUI"
       build_gui=no
     fi
   fi
@@ -2650,7 +2656,7 @@
       AC_DEFINE(HAVE_QT, 1, 
         [Define to 1 if Qt is available (libraries, developer header files, utility programs (moc, uic, rcc, and lrelease))])
     else
-      AC_MSG_WARN([Qt utility programs moc, uic, rcc, and lrelease not found -- disabling GUI])
+      warn_gui="Qt utility programs moc, uic, rcc, and lrelease not found -- disabling GUI"
       build_gui=no
     fi
   fi
@@ -2658,7 +2664,7 @@
   if test $build_gui = yes; then
     OCTAVE_CHECK_FUNC_QABSTRACTITEMMODEL_BEGINRESETMODEL
     if test $octave_cv_func_qabstractitemmodel_beginresetmodel = no; then
-      AC_MSG_WARN([QAbstractItemModel::beginResetModel() not found -- disabling GUI])
+      warn_gui="QAbstractItemModel::beginResetModel() not found -- disabling GUI"
       build_gui=no
     fi
   fi
@@ -2691,7 +2697,8 @@
       AC_LANG_POP([C++])
     ])
     if test $octave_cv_lib_qscintilla = no; then
-      AC_MSG_WARN([Qscintilla library not found -- disabling built-in GUI editor])
+      warn_gui_editor="Qscintilla library not found -- disabling built-in GUI editor"
+      OCTAVE_CONFIGURE_WARNING([warn_gui_editor])
     else
       ## Let's assume Qscintilla library is at the same location as
       ## other regular Qt libraries.
@@ -2709,14 +2716,14 @@
     fi
 
     AC_CHECK_FUNCS([setlocale], [],
-      [AC_MSG_WARN([setlocale not found -- disabling GUI])
+      [warn_gui="setlocale not found -- disabling GUI"
        build_gui=no])
 
     if test $build_gui = yes; then
       case $host_os in
         mingw* | msdosmsvc*)
           AC_CHECK_FUNCS([setvbuf], [win32_terminal=yes],
-            [AC_MSG_WARN([setvbuf not found -- disabling GUI])
+            [warn_gui="setvbuf not found -- disabling GUI"
              build_gui=no])
           ;;
         *)
@@ -2730,6 +2737,10 @@
       esac
     fi
   fi
+
+  if test -n "$warn_gui"; then
+    OCTAVE_CONFIGURE_WARNING([warn_gui])
+  fi
 fi
 
 AM_CONDITIONAL([AMCOND_BUILD_GUI], [test $build_gui = yes])
@@ -2853,6 +2864,8 @@
   Magick++ LDFLAGS:            $MAGICK_LDFLAGS
   Magick++ libraries:          $MAGICK_LIBS
   OPENGL libraries:            $OPENGL_LIBS
+  PCRE CPPFLAGS:               $PCRE_CPPFLAGS
+  PCRE libraries:              $PCRE_LIBS
   PTHREAD flags:               $PTHREAD_CFLAGS
   PTHREAD libraries:           $PTHREAD_LIBS
   QHULL CPPFLAGS:              $QHULL_CPPFLAGS
@@ -2865,7 +2878,6 @@
   Qt LDFLAGS:                  $QT_LDFLAGS
   Qt libraries:                $QT_LIBS
   READLINE libraries:          $READLINE_LIBS
-  REGEX libraries:             $REGEX_LIBS
   TERM libraries:              $TERM_LIBS
   UMFPACK CPPFLAGS:            $UMFPACK_CPPFLAGS
   UMFPACK LDFLAGS:             $UMFPACK_LDFLAGS

--- a/doc/interpreter/basics.txi	Wed Oct 23 22:48:29 2013 -0400
+++ b/doc/interpreter/basics.txi	Tue Nov 05 12:27:42 2013 -0500
@@ -156,6 +156,10 @@
 remote shell command or inside an Emacs shell buffer.  For another way
 to run Octave within Emacs, @pxref{Emacs Octave Support}.
 
+@item --jit-compiler
+@cindex @code{--jit-compiler}
+Enable the JIT compiler used for accelerating loops.
+
 @item --line-editing
 @cindex @code{--line-editing}
 Force readline use for command-line editing.
@@ -180,10 +184,6 @@
 Don't initialize the search path for function files to include default 
 locations.
 
-@item --no-jit-compiler
-@cindex @code{--no-jit-compiler}
-Disable the JIT compiler used for accelerating loops.
-
 @item --no-line-editing
 @cindex @code{--no-line-editing}
 Disable command-line editing.

--- a/doc/interpreter/contributors.in	Wed Oct 23 22:48:29 2013 -0400
+++ b/doc/interpreter/contributors.in	Tue Nov 05 12:27:42 2013 -0500
@@ -138,6 +138,7 @@
 Daniel Kraft
 Aravindh Krishnamoorthy
 Oyvind Kristiansen
+Artem Krosheninnikov
 Piotr Krzyzanowski
 Volker Kuhlmann
 Tetsuro Kurita
@@ -190,6 +191,7 @@
 Todd Neal
 Philip Nienhuis
 Al Niessner
+Felipe G. Nievinski
 Rick Niles
 Takuji Nishimura
 Kai Noda

--- a/doc/interpreter/debug.txi	Wed Oct 23 22:48:29 2013 -0400
+++ b/doc/interpreter/debug.txi	Tue Nov 05 12:27:42 2013 -0500
@@ -306,7 +306,7 @@
 foo;
 profile off;
 
-data = profile ('info');
+data = profile ("info");
 profshow (data, 10);
 @end group
 @end example
@@ -386,7 +386,7 @@
 bar (20);
 profile off;
 
-profshow (profile ('info'));
+profshow (profile ("info"));
 @end group
 @end example
 
@@ -424,7 +424,7 @@
 foo;
 profile off;
 
-profshow (profile ('info'), 10);
+profshow (profile ("info"), 10);
 @end group
 @end example
 

--- a/doc/interpreter/doccheck/aspell-octave.en.pws	Wed Oct 23 22:48:29 2013 -0400
+++ b/doc/interpreter/doccheck/aspell-octave.en.pws	Tue Nov 05 12:27:42 2013 -0500
@@ -409,6 +409,7 @@
 Haddad
 HandleVisibility
 Hankel
+hanning
 Hanning
 hardcode
 hardcoding
@@ -429,6 +430,7 @@
 Higham
 Hindmarsh
 Hindmarsh's
+histc
 Hodel
 holomorphic
 Horner's
@@ -1167,6 +1169,7 @@
 xb
 xc
 xcorr
+xdata
 xdigit
 xerrorbar
 xerrorbars
@@ -1176,6 +1179,7 @@
 xGETRF
 xGTSV
 xl
+xmax
 xmin
 xPBTRF
 xPOTRF
@@ -1193,6 +1197,8 @@
 yerrorbar
 yerrorbars
 ylim
+ymax
+ymin
 yy
 YY
 yyyy

--- a/doc/interpreter/doccheck/mk_undocumented_list	Wed Oct 23 22:48:29 2013 -0400
+++ b/doc/interpreter/doccheck/mk_undocumented_list	Tue Nov 05 12:27:42 2013 -0500
@@ -82,6 +82,7 @@
 comma
 debug
 dbnext
+end
 exit
 F_DUPFD
 F_GETFD

--- a/doc/interpreter/errors.txi	Wed Oct 23 22:48:29 2013 -0400
+++ b/doc/interpreter/errors.txi	Tue Nov 05 12:27:42 2013 -0500
@@ -268,9 +268,9 @@
 @example
 @group
 function rand42
-  old_state = rand ('state');
-  restore_state = onCleanup (@@() rand ('state', old_state);
-  rand ('state', 42);
+  old_state = rand ("state");
+  restore_state = onCleanup (@@() rand ("state", old_state);
+  rand ("state", 42);
   @dots{}
 endfunction  # rand generator state restored by onCleanup
 @end group

--- a/doc/interpreter/gui.txi	Wed Oct 23 22:48:29 2013 -0400
+++ b/doc/interpreter/gui.txi	Tue Nov 05 12:27:42 2013 -0500
@@ -68,10 +68,14 @@
 programs that do.  @strong{Warning:} The functions @code{uiwait},
 @code{uiresume}, and @code{waitfor} are only available for the FLTK tooolkit.
 
+@DOCSTRING(desktop)
+
 @DOCSTRING(guidata)
 
 @DOCSTRING(guihandles)
 
+@DOCSTRING(isguirunning)
+
 @DOCSTRING(uiwait)
 
 @DOCSTRING(uiresume)

--- a/doc/interpreter/install.txi	Wed Oct 23 22:48:29 2013 -0400
+++ b/doc/interpreter/install.txi	Tue Nov 05 12:27:42 2013 -0500
@@ -45,7 +45,7 @@
 @cindex installing Octave
 
 The procedure for installing Octave from source on a Unix-like system is
-described below.  Building on other platforms will follow similar
+described next.  Building on other platforms will follow similar
 steps.  Note that this description applies to Octave releases.  Building
 the development sources from the Mercurial archive requires additional
 steps as described in @ref{Building the Development Sources}.
@@ -514,14 +514,15 @@
 instead of just @command{make}.
 
 @item
-If you encounter errors while compiling Octave, first check the list of
-known problems below to see if there is a workaround or solution for
-your problem.  If not,
+If you encounter errors while compiling Octave, first
+see @ref{Installation Problems} for a list of
+known problems and if there is a workaround or solution for
+your problem.  If not, see
 @ifclear INSTALLONLY
-@pxref{Trouble},
+@ref{Trouble}
 @end ifclear
 @ifset INSTALLONLY
-see the file BUGS
+the file BUGS
 @end ifset
 for information about how to report bugs.
 

--- a/doc/interpreter/interp.txi	Wed Oct 23 22:48:29 2013 -0400
+++ b/doc/interpreter/interp.txi	Tue Nov 05 12:27:42 2013 -0500
@@ -56,10 +56,10 @@
 ddys = diff (diff (ys)./dti) ./ dti;
 ddyp = diff (diff (yp)./dti) ./ dti;
 figure (1);
-plot (ti,ys,'r-', ti,yp,'g-');
+plot (ti,ys,"r-", ti,yp,"g-");
 legend ("spline", "pchip", 4);
 figure (2);
-plot (ti,ddys,'r+', ti,ddyp,'g*');
+plot (ti,ddys,"r+", ti,ddyp,"g*");
 legend ("spline", "pchip");
 @end group
 @end example
@@ -102,8 +102,8 @@
 y = sin (4*t + 0.3) .* cos (3*t - 0.1);
 yp = sin (4*ti + 0.3) .* cos (3*ti - 0.1);
 plot (ti, yp, "g", ti, interp1 (t, y, ti, "spline"), "b", ...
-      ti, interpft (y, k), "c", t, y, 'r+');
-legend ('sin(4t+0.3)cos(3t-0.1', "spline", "interpft", "data");
+      ti, interpft (y, k), "c", t, y, "r+");
+legend ("sin(4t+0.3)cos(3t-0.1)", "spline", "interpft", "data");
 @end group
 @end example
 

--- a/doc/interpreter/intro.txi	Wed Oct 23 22:48:29 2013 -0400
+++ b/doc/interpreter/intro.txi	Tue Nov 05 12:27:42 2013 -0500
@@ -524,7 +524,7 @@
 @example
 @group
 fieldnames ([1, 2; 3, 4])
-error: fieldnames: wrong type argument 'matrix'
+error: fieldnames: Invalid input argument
 @end group
 @end example
 

--- a/doc/interpreter/java.txi	Wed Oct 23 22:48:29 2013 -0400
+++ b/doc/interpreter/java.txi	Tue Nov 05 12:27:42 2013 -0500
@@ -173,7 +173,7 @@
   persistent cacheval;  % speeds up repeated calls
 
   if isempty (cacheval)
-    cacheval = (exist ('OCTAVE_VERSION', 'builtin') > 0);
+    cacheval = (exist ("OCTAVE_VERSION", "builtin") > 0);
   end
 
   retval = cacheval;
@@ -253,11 +253,11 @@
 Example:
 
 @example
-octave> base_path = 'C:/Octave/java_files';
+octave> base_path = "C:/Octave/java_files";
 
 octave> % add two JARchives to the dynamic classpath
-octave> javaaddpath ([base_path, '/someclasses.jar']);
-octave> javaaddpath ([base_path, '/moreclasses.jar']);
+octave> javaaddpath ([base_path, "/someclasses.jar"]);
+octave> javaaddpath ([base_path, "/moreclasses.jar"]);
 
 octave> % check the dynamic classpath
 octave> p = javaclasspath;
@@ -267,7 +267,7 @@
 C:/Octave/java_files/moreclasses.jar
 
 octave> % remove the first element from the classpath
-octave> javarmpath ([base_path, '/someclasses.jar']);
+octave> javarmpath ([base_path, "/someclasses.jar"]);
 octave> p = javaclasspath;
 octave> disp (p@{1@});
 C:/Octave/java_files/moreclasses.jar
@@ -287,8 +287,8 @@
 @example
 @group
 % contents of .octaverc:
-addpath ('~/octave');
-javaaddpath ('~/octave/myclasses.jar');
+addpath ("~/octave");
+javaaddpath ("~/octave/myclasses.jar");
 @end group
 @end example
 
@@ -305,7 +305,7 @@
 Example:
 
 @example
-Passenger = javaObject ('package.FirstClass', row, seat);
+Passenger = javaObject ("package.FirstClass", row, seat);
 @end example
 
 @c ------------------------------------------------------------------------
@@ -377,7 +377,7 @@
 
 @example
 @group
-octave> javaMethod ('getProperty', 'java.lang.System', 'MyProperty');
+octave> javaMethod ("getProperty", "java.lang.System", "MyProperty");
 ans = 12.34
 @end group
 @end example

--- a/doc/interpreter/octave.texi	Wed Oct 23 22:48:29 2013 -0400
+++ b/doc/interpreter/octave.texi	Tue Nov 05 12:27:42 2013 -0500
@@ -795,6 +795,7 @@
 * The DESCRIPTION File::
 * The INDEX File::
 * PKG_ADD and PKG_DEL Directives::
+* Missing Components::
 
 External Code Interface
 

--- a/doc/interpreter/package.txi	Wed Oct 23 22:48:29 2013 -0400
+++ b/doc/interpreter/package.txi	Tue Nov 05 12:27:42 2013 -0500
@@ -309,6 +309,7 @@
 * The DESCRIPTION File::
 * The INDEX File::
 * PKG_ADD and PKG_DEL Directives::
+* Missing Components::
 @end menu
 
 @node The DESCRIPTION File
@@ -575,3 +576,13 @@
 @w{@code{PKG_ADD}} keyword is replaced with @w{@code{PKG_DEL}} and the commands
 get added to the @w{@code{PKG_DEL}} file.
 
+@node Missing Components
+@subsection Missing Components
+
+If a package relies on a component, such as another Octave package, that may
+not be present it may be useful to install a function which informs users what
+to do when a particular component is missing.  The function must be written by
+the package maintainer and registered with Octave using
+@code{missing_component_hook}.
+
+@DOCSTRING(missing_component_hook)

--- a/etc/HACKING	Wed Oct 23 22:48:29 2013 -0400
+++ b/etc/HACKING	Tue Nov 05 12:27:42 2013 -0500
@@ -131,10 +131,17 @@
 
 An overview of the directory layout of Octave's source files:
 
+  build-aux     -- scripts which support the build process
+
+
   doc           -- Texinfo documentation for Octave
 
 
-  examples      -- some example files
+  etc           -- miscellaneous files, such as this HACKING howto
+
+
+  examples      -- some example files (mkoctfile and mex samples, old class
+                   programming interface)
 
 
   gnulib-hg     -- gnulib subrepo.  This is a clone of the gnulib source
@@ -192,81 +199,75 @@
     numeric     C++ numerical algorithms and interfaces to the Fortran
                 algorithms
 
-    operators   code for operators that act on base classes such as Array
+    operators   code for operators that act on base classes (such as Array)
 
     system      OS-related functions
  
     util        utility and miscellaneous functions
 
-  libinterp     -- The interpreter itself plus lots of infrastructure
+  libinterp     -- the interpreter itself plus lots of infrastructure
                    around it.  Octave's extensive octave_value class
                    hierarchy for polymorphically handling all Octave
                    types is defined here.  The built-in functions are
                    also defined here.
 
-    octave-value     The octave_value class hierarchy.  These are the
+    octave-value     the octave_value class hierarchy.  These are the
                      container classes that hold various Octave data
                      types like struct numerical arrays, structure
                      arrays, and cell arrays.
 
     parse-tree       Classes that define the parse tree for the
-                     interpreter.
-
-    interp-core      Core utilities for the interpreter.  There are no
-                     DEFUN functions (callable from the scripting
-                     language) defined here.
+                     interpreter
 
-    interpfcn        Functions closely related to the interpreter.
-                     Includes DEFUN functions (callable from the
-                     scripting language).  Also may export C++ functions
-                     that are used in other parts of the interpreter.
+    corefcn          statically linked DEFUN functions (callable from
+                     the scripting langauge) as well as internal C++
+                     functions used by the interpreter.
 
-    corefcn          Statically linked DEFUN functions (callable from
-                     the scripting langauge).  No C++ functions exported
-                     for use in other parts of the interpreter.
-
-    dldfcn           Dynamically linked DEFUN functions (callable
+    dldfcn           dynamically linked DEFUN functions (callable
                      from the scripting language).  If you see "help
                      foo" telling you that foo is defined in foo.oct,
                      then foo.cc will be found here and contain the
                      source code.
 
-    operators        Definitions and template instantiations for
+    operators        definitions and template instantiations for
                      operators for all possible Octave type
-                     combinations.
+                     combinations
 
-    template-inst    Some C++ template instantiations.
+    template-inst    some C++ template instantiations
 
 
   libgui        -- the graphical user interface of GNU Octave
 
-    src              source files.
-
-      m-editor       source files for the m-file editor.
+    kb-layouts       various files need by the qterminal widget that has
+                     been derived from Konsole
 
-      qtinfo         source files for the Qt texinfo browser.
-
-      icons          icon files that will be compiled into the
-                     executable via a resource file.
+    languages        translation files and list of translators
 
     qterminal        Qt terminal widget
 
-    languages        translation files and list of translators.
+    src              source files
+
+      icons          icon files that will be compiled into the
+                     executable via a resource file
 
-    kb-layouts       various files need by the qterminal widget that has
-                     been derived from Konsole.
-      
+      m-editor       source files for the m-file editor
+
+      qtinfo         source files for the Qt texinfo browser
+
+
+  m4            -- m4 scripts used by configure during the build process
+
 
   scripts       -- functions written in the Octave language
 
+    @ftp             ftp object class
+
     audio            play and record sound files (system dependent)
 
     deprecated       older deprecated functions
 
     elfun            elementary mathematical functions
 
-    @ftp             ftp object class
-
     general          utility functions
 
     geometry         geometry algorithms
@@ -316,9 +317,14 @@
     time             time and date functions
 
 
+  src           -- code for the actual executables that are created.  This
+                   includes octave, octave-cli, octave-gui, as well as
+                   mkoctfile.
+
+
   test          -- tests for the interpreter
 
-    test_ .m         fixed tests for the interpreter
+    *.tst            fixed tests for the interpreter
 
     fntests.m        script to run function tests embedded in C++ and
                      .m files
@@ -327,7 +333,7 @@
 John W. Eaton
 jwe@octave.org
 
-Last updated: Fri, 4 Oct 2013 16:58:52 PDT 
+Last updated: Tue, 29 Oct 2013 11:42:47 PDT