Mercurial > octave-dspies
changeset 18990:b517b08d2e24
maint: Merge gui-release to default.
author | Rik <rik@octave.org> |
---|---|
date | Tue, 05 Aug 2014 17:53:36 -0700 |
parents | 12d1297d3a38 (current diff) 0b657f4e7780 (diff) |
children | 79d2dd9351cc |
files | scripts/miscellaneous/ls.m |
diffstat | 3 files changed, 18 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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 ());
--- 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);