# HG changeset patch
# User Rik <rik@octave.org>
# Date 1407286416 25200
# Node ID b517b08d2e240d148fed7c0078f32fcf66cd4a19
# Parent  12d1297d3a380e34dca508dcb35fd06c455a17d4# Parent  0b657f4e7780bfeffc65895c5dad7fe73aa37e8b
maint: Merge gui-release to default.

diff -r 12d1297d3a38 -r b517b08d2e24 doc/interpreter/package.txi
--- a/doc/interpreter/package.txi	Tue Aug 05 17:50:55 2014 -0700
+++ b/doc/interpreter/package.txi	Tue Aug 05 17:53:36 2014 -0700
@@ -271,7 +271,7 @@
 loaded.
 @end table
 
-Besides the above mentioned files, a package can also contain on or
+Besides the above mentioned files, a package can also contain one or
 more of the following directories:
 
 @table @code
@@ -359,7 +359,7 @@
 
 @item Version
 Version of the package.  A package version must be 3 numbers separated
-by a dot.
+by dots.
 
 @item Date
 Date of last update.
diff -r 12d1297d3a38 -r b517b08d2e24 libgui/src/m-editor/file-editor.cc
--- a/libgui/src/m-editor/file-editor.cc	Tue Aug 05 17:50:55 2014 -0700
+++ b/libgui/src/m-editor/file-editor.cc	Tue Aug 05 17:53:36 2014 -0700
@@ -261,7 +261,21 @@
       editor.replace ("%f", file_name);
       editor.replace ("%l", QString::number (line));
 
-      QProcess::startDetached (editor);
+      bool started_ok = QProcess::startDetached (editor);
+
+      if (started_ok != true)
+        {
+          QMessageBox *msgBox
+            = new QMessageBox (QMessageBox::Critical,
+                               tr ("Octave Editor"),
+                               tr ("Could not start custom file editor\n%1").
+                               arg (editor),
+                               QMessageBox::Ok, this);
+
+           msgBox->setWindowModality (Qt::NonModal);
+           msgBox->setAttribute (Qt::WA_DeleteOnClose);
+           msgBox->show ();
+        }
 
       if (line < 0 && ! file_name.isEmpty ())
         handle_mru_add_file (QFileInfo (file_name).canonicalFilePath ());
diff -r 12d1297d3a38 -r b517b08d2e24 scripts/miscellaneous/ls.m
diff -r 12d1297d3a38 -r b517b08d2e24 scripts/special-matrix/toeplitz.m
--- a/scripts/special-matrix/toeplitz.m	Tue Aug 05 17:50:55 2014 -0700
+++ b/scripts/special-matrix/toeplitz.m	Tue Aug 05 17:53:36 2014 -0700
@@ -74,7 +74,7 @@
     if (! (isvector (c) && isvector (r))) 
       error ("toeplitz: C and R must be vectors");
     elseif (r(1) != c(1))
-      warning ("toeplitz: column wins anti-diagonal conflict");
+      warning ("toeplitz: column wins diagonal conflict");
     endif
 
     nr = length (c);