Mercurial > jwe > octave

changeset 23152:0d4107676ddf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Periodic merge of stale to default.
author Rik <rik@octave.org>
date Sun, 05 Feb 2017 10:00:19 -0800
parents f81c759dfae7 (current diff) 8419d24ab8f7 (diff)
children c0561b7034a9 c35b258ee5a2
files libgui/src/m-editor/file-editor.cc libgui/src/qtinfo/parser.cc
diffstat 2 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/src/m-editor/file-editor.cc	Sat Feb 04 15:08:53 2017 -0500
+++ b/libgui/src/m-editor/file-editor.cc	Sun Feb 05 10:00:19 2017 -0800
@@ -1878,6 +1878,9 @@
   setWidget (editor_widget);
 
   // signals
+  connect (this, SIGNAL (execute_command_in_terminal_signal (const QString&)),
+           main_win (), SLOT (execute_command_in_terminal (const QString&)));
+
   connect (this, SIGNAL (request_settings_dialog (const QString&)),
            main_win (),
            SLOT (process_settings_dialog_request (const QString&)));
--- a/libgui/src/qtinfo/parser.cc	Sat Feb 04 15:08:53 2017 -0500
+++ b/libgui/src/qtinfo/parser.cc	Sun Feb 05 10:00:19 2017 -0800
@@ -579,10 +579,10 @@
   QString results;
   QStringList words = text.split (" ",QString::SkipEmptyParts);
 
-  QString re_program ("(" + words.at (0));
+  QString re_program ("(" + QRegExp::escape (words.at (0)));
   for (int i = 1; i < words.size (); i++)
     {
-      re_program += "|" + words.at (i);
+      re_program += "|" + QRegExp::escape (words.at (i));
     }
   re_program += ")";