# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1412520506 14400
# Node ID 6443693a176f007fbb26c5acf8b91e564b1b2f1d
# Parent  c61deba773ab0d2695ebfbd49179ca33f3def3c5# Parent  3978a5509f40ffc964162be443465f984764558f
maint: Periodic merge of gui-release to default.

diff -r c61deba773ab -r 6443693a176f libgui/src/m-editor/file-editor-tab.cc
--- a/libgui/src/m-editor/file-editor-tab.cc	Sat Oct 04 20:16:10 2014 -0700
+++ b/libgui/src/m-editor/file-editor-tab.cc	Sun Oct 05 10:48:26 2014 -0400
@@ -560,6 +560,8 @@
   lexer->readSettings (*settings);
 
   _edit_area->setLexer (lexer);
+  _edit_area->setCaretForegroundColor (lexer->color (0));
+  _edit_area->setIndentationGuidesForegroundColor (lexer->color (0));
 
   // fix line number width with respect to the font size of the lexer
   if (settings->value ("editor/showLineNumbers", true).toBool ())
diff -r c61deba773ab -r 6443693a176f libgui/src/main-window.cc
--- a/libgui/src/main-window.cc	Sat Oct 04 20:16:10 2014 -0700
+++ b/libgui/src/main-window.cc	Sun Oct 05 10:48:26 2014 -0400
@@ -1511,6 +1511,7 @@
     = file_menu->addAction (QIcon (":/actions/icons/folder_documents.png"),
                             tr ("Open..."));
   _open_action->setShortcutContext (Qt::ApplicationShortcut);
+  _open_action->setToolTip (tr ("Open an existing file in editor"));
 
 #ifdef HAVE_QSCINTILLA
   editor_window->insert_new_open_actions (_new_script_action,
@@ -1567,11 +1568,11 @@
                            tr ("New Script"));
   _new_script_action->setShortcutContext (Qt::ApplicationShortcut);
 
-  _new_function_action = new_menu->addAction (tr ("Function..."));
+  _new_function_action = new_menu->addAction (tr ("New Function..."));
   _new_function_action->setEnabled (true);
   _new_function_action->setShortcutContext (Qt::ApplicationShortcut);
 
-  _new_figure_action = new_menu->addAction (tr ("Figure"));
+  _new_figure_action = new_menu->addAction (tr ("New Figure"));
   _new_figure_action->setEnabled (true);
 
 #ifdef HAVE_QSCINTILLA
diff -r c61deba773ab -r 6443693a176f libgui/src/workspace-view.cc
--- a/libgui/src/workspace-view.cc	Sat Oct 04 20:16:10 2014 -0700
+++ b/libgui/src/workspace-view.cc	Sun Oct 05 10:48:26 2014 -0400
@@ -49,6 +49,8 @@
 
   view->setWordWrap (false);
   view->setContextMenuPolicy (Qt::CustomContextMenu);
+  view->setShowGrid (false);
+  view->setAlternatingRowColors (true);
   view_previous_row_count = 0;
 
   // Set an empty widget, so we can assign a layout to it.
diff -r c61deba773ab -r 6443693a176f libinterp/corefcn/ls-hdf5.h
--- a/libinterp/corefcn/ls-hdf5.h	Sat Oct 04 20:16:10 2014 -0700
+++ b/libinterp/corefcn/ls-hdf5.h	Sun Oct 05 10:48:26 2014 -0400
@@ -204,7 +204,7 @@
                       const char *attr_name, void *buf);
 
 #ifdef USE_64_BIT_IDX_T
-#define H5T_NATIVE_IDX H5T_NATIVE_LONG
+#define H5T_NATIVE_IDX H5T_NATIVE_INT64
 #else
 #define H5T_NATIVE_IDX H5T_NATIVE_INT
 #endif
diff -r c61deba773ab -r 6443693a176f libinterp/corefcn/urlwrite.cc
--- a/libinterp/corefcn/urlwrite.cc	Sat Oct 04 20:16:10 2014 -0700
+++ b/libinterp/corefcn/urlwrite.cc	Sun Oct 05 10:48:26 2014 -0400
@@ -299,7 +299,7 @@
 \n\
 @example\n\
 @group\n\
-urlwrite (\"ftp://ftp.octave.org/pub/octave/README\",\n\
+urlwrite (\"ftp://ftp.octave.org/pub/README\",\n\
           \"README.txt\");\n\
 @end group\n\
 @end example\n\
@@ -462,7 +462,7 @@
 in string @var{s}.  For example:\n\
 \n\
 @example\n\
-s = urlread (\"ftp://ftp.octave.org/pub/octave/README\");\n\
+s = urlread (\"ftp://ftp.octave.org/pub/README\");\n\
 @end example\n\
 \n\
 The variable @var{success} is 1 if the download was successful,\n\
diff -r c61deba773ab -r 6443693a176f libinterp/octave-value/ov-base-mat.cc
--- a/libinterp/octave-value/ov-base-mat.cc	Sat Oct 04 20:16:10 2014 -0700
+++ b/libinterp/octave-value/ov-base-mat.cc	Sun Oct 05 10:48:26 2014 -0400
@@ -477,7 +477,10 @@
               octave_print_internal (buf, matrix(j*nr+i));
               std::string tmp = buf.str ();
               size_t pos = tmp.find_first_not_of (" ");
-              os << tmp.substr (pos);
+              if (pos != std::string::npos)
+                os << tmp.substr (pos);
+              else if (! tmp.empty ())
+                os << tmp[0];
 
               if (++elts >= max_elts)
                 goto done;
diff -r c61deba773ab -r 6443693a176f libinterp/octave-value/ov-base-scalar.cc
--- a/libinterp/octave-value/ov-base-scalar.cc	Sat Oct 04 20:16:10 2014 -0700
+++ b/libinterp/octave-value/ov-base-scalar.cc	Sun Oct 05 10:48:26 2014 -0400
@@ -176,7 +176,10 @@
   octave_print_internal (buf, scalar);
   std::string tmp = buf.str ();
   size_t pos = tmp.find_first_not_of (" ");
-  os << tmp.substr (pos);
+  if (pos != std::string::npos)
+    os << tmp.substr (pos);
+  else if (! tmp.empty ())
+    os << tmp[0];
 }
 
 template <class ST>
diff -r c61deba773ab -r 6443693a176f libinterp/parse-tree/pt-eval.cc
--- a/libinterp/parse-tree/pt-eval.cc	Sat Oct 04 20:16:10 2014 -0700
+++ b/libinterp/parse-tree/pt-eval.cc	Sun Oct 05 10:48:26 2014 -0400
@@ -336,21 +336,10 @@
         Range rng = rhs.range_value ();
 
         octave_idx_type steps = rng.nelem ();
-        double b = rng.base ();
-        double increment = rng.inc ();
 
         for (octave_idx_type i = 0; i < steps; i++)
           {
-            // Use multiplication here rather than declaring a
-            // temporary variable outside the loop and using
-            //
-            //   tmp_val += increment
-            //
-            // to avoid problems with limited precision.  Also, this
-            // is consistent with the way Range::matrix_value is
-            // implemented.
-
-            octave_value val (b + i * increment);
+            octave_value val (rng.elem (i));
 
             ult.assign (octave_value::op_asn_eq, val);