# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1523368603 14400
# Node ID e3034c1956a369ba9a861e2984fb4dbebedca7c5
# Parent  d2558ba799d8956e2b797392b53545b815458008# Parent  6f1fde568e46360f76d99566856a97ff8326374b
maint: Merge stable to default.

diff -r d2558ba799d8 -r e3034c1956a3 doc/interpreter/basics.txi
--- a/doc/interpreter/basics.txi	Mon Apr 09 14:59:14 2018 -0700
+++ b/doc/interpreter/basics.txi	Tue Apr 10 09:56:43 2018 -0400
@@ -113,9 +113,9 @@
 in the system or user startup files that set the built-in variable
 @w{@env{EXEC_PATH}}.
 
-@item --force-gui
-@cindex @sortas{options, Octave command --force-gui} @ @ @code{--force-gui}
-Force the graphical user interface (GUI) to start.
+@item --gui
+@cindex @sortas{options, Octave command --gui} @ @ @code{--gui}
+Start the graphical user interface (GUI).
 
 @item  --help
 @itemx -h
@@ -165,7 +165,8 @@
 @item --no-gui
 @cindex @sortas{options, Octave command --no-gui} @ @ @code{--no-gui}
 Disable the graphical user interface (GUI) and use the command line
-interface (CLI) instead.
+interface (CLI) instead.  This is the default behavior, but this option
+may be useful to override a previous @option{--gui}.
 
 @item  --no-history
 @itemx -H
diff -r d2558ba799d8 -r e3034c1956a3 libgui/languages/ca_ES.ts
--- a/libgui/languages/ca_ES.ts	Mon Apr 09 14:59:14 2018 -0700
+++ b/libgui/languages/ca_ES.ts	Tue Apr 10 09:56:43 2018 -0400
@@ -3085,8 +3085,8 @@
     </message>
     <message>
         <location line="+68"/>
-        <source>Import shortcuts from file ...</source>
-        <translation>Importa dreceres des d'un fitxer ...</translation>
+        <source>Import shortcuts from file...</source>
+        <translation>Importa dreceres des d'un fitxer...</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -3096,8 +3096,8 @@
     </message>
     <message>
         <location line="-1"/>
-        <source>Export shortcuts into file ...</source>
-        <translation>Exporta dreceres a un fitxer ...</translation>
+        <source>Export shortcuts into file...</source>
+        <translation>Exporta dreceres a un fitxer...</translation>
     </message>
     <message>
         <location line="+11"/>
diff -r d2558ba799d8 -r e3034c1956a3 libgui/languages/de_DE.ts
--- a/libgui/languages/de_DE.ts	Mon Apr 09 14:59:14 2018 -0700
+++ b/libgui/languages/de_DE.ts	Tue Apr 10 09:56:43 2018 -0400
@@ -3065,8 +3065,8 @@
     </message>
     <message>
         <location line="+68"/>
-        <source>Import shortcuts from file ...</source>
-        <translation>Tastenkürzel aus Datei importieren ...</translation>
+        <source>Import shortcuts from file...</source>
+        <translation>Tastenkürzel aus Datei importieren...</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -3076,7 +3076,7 @@
     </message>
     <message>
         <location line="-1"/>
-        <source>Export shortcuts into file ...</source>
+        <source>Export shortcuts into file...</source>
         <translation>Tastenkürzel in Datei exportieren...</translation>
     </message>
     <message>
@@ -3228,7 +3228,7 @@
     <message>
         <location line="+2"/>
         <source>Another paste clipboard into variable data</source>
-        <translation>Tabelle aus Zwischenablage in Variabendaten einfügen</translation>
+        <translation>Tabelle aus Zwischenablage in Variablendaten einfügen</translation>
     </message>
     <message>
         <location line="+9"/>
diff -r d2558ba799d8 -r e3034c1956a3 libgui/languages/en_US.ts
--- a/libgui/languages/en_US.ts	Mon Apr 09 14:59:14 2018 -0700
+++ b/libgui/languages/en_US.ts	Tue Apr 10 09:56:43 2018 -0400
@@ -2946,7 +2946,7 @@
     </message>
     <message>
         <location line="+68"/>
-        <source>Import shortcuts from file ...</source>
+        <source>Import shortcuts from file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2957,7 +2957,7 @@
     </message>
     <message>
         <location line="-1"/>
-        <source>Export shortcuts into file ...</source>
+        <source>Export shortcuts into file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff -r d2558ba799d8 -r e3034c1956a3 libgui/languages/es_ES.ts
--- a/libgui/languages/es_ES.ts	Mon Apr 09 14:59:14 2018 -0700
+++ b/libgui/languages/es_ES.ts	Tue Apr 10 09:56:43 2018 -0400
@@ -3077,8 +3077,8 @@
     </message>
     <message>
         <location line="+68"/>
-        <source>Import shortcuts from file ...</source>
-        <translation>Importar accesos directos de archivo ...</translation>
+        <source>Import shortcuts from file...</source>
+        <translation>Importar accesos directos de archivo...</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -3088,8 +3088,8 @@
     </message>
     <message>
         <location line="-1"/>
-        <source>Export shortcuts into file ...</source>
-        <translation>Exportar accesos directos al archivo ...</translation>
+        <source>Export shortcuts into file...</source>
+        <translation>Exportar accesos directos al archivo...</translation>
     </message>
     <message>
         <location line="+11"/>
diff -r d2558ba799d8 -r e3034c1956a3 libgui/languages/eu_ES.ts
--- a/libgui/languages/eu_ES.ts	Mon Apr 09 14:59:14 2018 -0700
+++ b/libgui/languages/eu_ES.ts	Tue Apr 10 09:56:43 2018 -0400
@@ -4675,8 +4675,8 @@
     </message>
     <message>
         <location line="+68"/>
-        <source>Import shortcuts from file ...</source>
-        <translation type="unfinished">Inportatu lasterbideen fitxategia ...</translation>
+        <source>Import shortcuts from file...</source>
+        <translation type="unfinished">Inportatu lasterbideen fitxategia...</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -4686,8 +4686,8 @@
     </message>
     <message>
         <location line="-1"/>
-        <source>Export shortcuts into file ...</source>
-        <translation type="unfinished">Esportatu lasterbideen fitxategia ...</translation>
+        <source>Export shortcuts into file...</source>
+        <translation type="unfinished">Esportatu lasterbideen fitxategia...</translation>
     </message>
     <message>
         <location line="+11"/>
diff -r d2558ba799d8 -r e3034c1956a3 libgui/languages/fr_FR.ts
--- a/libgui/languages/fr_FR.ts	Mon Apr 09 14:59:14 2018 -0700
+++ b/libgui/languages/fr_FR.ts	Tue Apr 10 09:56:43 2018 -0400
@@ -3055,8 +3055,8 @@
     </message>
     <message>
         <location line="+68"/>
-        <source>Import shortcuts from file ...</source>
-        <translation>Importer des raccourcis depuis un fichier ...</translation>
+        <source>Import shortcuts from file...</source>
+        <translation>Importer des raccourcis depuis un fichier...</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -3066,8 +3066,8 @@
     </message>
     <message>
         <location line="-1"/>
-        <source>Export shortcuts into file ...</source>
-        <translation>Exporter les raccourcis vers un fichier ...</translation>
+        <source>Export shortcuts into file...</source>
+        <translation>Exporter les raccourcis vers un fichier...</translation>
     </message>
     <message>
         <location line="+11"/>
diff -r d2558ba799d8 -r e3034c1956a3 libgui/languages/it_IT.ts
--- a/libgui/languages/it_IT.ts	Mon Apr 09 14:59:14 2018 -0700
+++ b/libgui/languages/it_IT.ts	Tue Apr 10 09:56:43 2018 -0400
@@ -3091,7 +3091,7 @@
     </message>
     <message>
         <location line="+68"/>
-        <source>Import shortcuts from file ...</source>
+        <source>Import shortcuts from file...</source>
         <translation>Importa scorciatoie da file...</translation>
     </message>
     <message>
@@ -3102,7 +3102,7 @@
     </message>
     <message>
         <location line="-1"/>
-        <source>Export shortcuts into file ...</source>
+        <source>Export shortcuts into file...</source>
         <translation>Esporta scorciatoie su file...</translation>
     </message>
     <message>
diff -r d2558ba799d8 -r e3034c1956a3 libgui/languages/ja_JP.ts
--- a/libgui/languages/ja_JP.ts	Mon Apr 09 14:59:14 2018 -0700
+++ b/libgui/languages/ja_JP.ts	Tue Apr 10 09:56:43 2018 -0400
@@ -3701,8 +3701,8 @@
     </message>
     <message>
         <location line="+68"/>
-        <source>Import shortcuts from file ...</source>
-        <translation>ショートカットのファイルからのインポート ...</translation>
+        <source>Import shortcuts from file...</source>
+        <translation>ショートカットのファイルからのインポート...</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -3712,8 +3712,8 @@
     </message>
     <message>
         <location line="-1"/>
-        <source>Export shortcuts into file ...</source>
-        <translation>ショートカットのファイルへのエクスポート ...</translation>
+        <source>Export shortcuts into file...</source>
+        <translation>ショートカットのファイルへのエクスポート...</translation>
     </message>
     <message>
         <location line="+11"/>
diff -r d2558ba799d8 -r e3034c1956a3 libgui/languages/nl_NL.ts
--- a/libgui/languages/nl_NL.ts	Mon Apr 09 14:59:14 2018 -0700
+++ b/libgui/languages/nl_NL.ts	Tue Apr 10 09:56:43 2018 -0400
@@ -4711,8 +4711,8 @@
     </message>
     <message>
         <location line="+68"/>
-        <source>Import shortcuts from file ...</source>
-        <translation>Importeer sneltoetsen uit bestand ...</translation>
+        <source>Import shortcuts from file...</source>
+        <translation>Importeer sneltoetsen uit bestand...</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -4722,8 +4722,8 @@
     </message>
     <message>
         <location line="-1"/>
-        <source>Export shortcuts into file ...</source>
-        <translation>Exporteer sneltoetsen naar bestand ...</translation>
+        <source>Export shortcuts into file...</source>
+        <translation>Exporteer sneltoetsen naar bestand...</translation>
     </message>
     <message>
         <location line="+11"/>
diff -r d2558ba799d8 -r e3034c1956a3 libgui/languages/pt_BR.ts
--- a/libgui/languages/pt_BR.ts	Mon Apr 09 14:59:14 2018 -0700
+++ b/libgui/languages/pt_BR.ts	Tue Apr 10 09:56:43 2018 -0400
@@ -3044,7 +3044,7 @@
     </message>
     <message>
         <location line="+68"/>
-        <source>Import shortcuts from file ...</source>
+        <source>Import shortcuts from file...</source>
         <translation>Importar teclas de atalho de arquivo...</translation>
     </message>
     <message>
@@ -3055,7 +3055,7 @@
     </message>
     <message>
         <location line="-1"/>
-        <source>Export shortcuts into file ...</source>
+        <source>Export shortcuts into file...</source>
         <translation>Exportar teclas de atalho para arquivo...</translation>
     </message>
     <message>
diff -r d2558ba799d8 -r e3034c1956a3 libgui/languages/pt_PT.ts
--- a/libgui/languages/pt_PT.ts	Mon Apr 09 14:59:14 2018 -0700
+++ b/libgui/languages/pt_PT.ts	Tue Apr 10 09:56:43 2018 -0400
@@ -3681,7 +3681,7 @@
     </message>
     <message>
         <location line="+68"/>
-        <source>Import shortcuts from file ...</source>
+        <source>Import shortcuts from file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -3692,7 +3692,7 @@
     </message>
     <message>
         <location line="-1"/>
-        <source>Export shortcuts into file ...</source>
+        <source>Export shortcuts into file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff -r d2558ba799d8 -r e3034c1956a3 libgui/languages/ru_RU.ts
--- a/libgui/languages/ru_RU.ts	Mon Apr 09 14:59:14 2018 -0700
+++ b/libgui/languages/ru_RU.ts	Tue Apr 10 09:56:43 2018 -0400
@@ -3685,7 +3685,7 @@
     </message>
     <message>
         <location line="+68"/>
-        <source>Import shortcuts from file ...</source>
+        <source>Import shortcuts from file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -3696,7 +3696,7 @@
     </message>
     <message>
         <location line="-1"/>
-        <source>Export shortcuts into file ...</source>
+        <source>Export shortcuts into file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff -r d2558ba799d8 -r e3034c1956a3 libgui/languages/uk_UA.ts
--- a/libgui/languages/uk_UA.ts	Mon Apr 09 14:59:14 2018 -0700
+++ b/libgui/languages/uk_UA.ts	Tue Apr 10 09:56:43 2018 -0400
@@ -3603,7 +3603,7 @@
     </message>
     <message>
         <location line="+68"/>
-        <source>Import shortcuts from file ...</source>
+        <source>Import shortcuts from file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -3614,7 +3614,7 @@
     </message>
     <message>
         <location line="-1"/>
-        <source>Export shortcuts into file ...</source>
+        <source>Export shortcuts into file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff -r d2558ba799d8 -r e3034c1956a3 libgui/languages/zh_CN.ts
--- a/libgui/languages/zh_CN.ts	Mon Apr 09 14:59:14 2018 -0700
+++ b/libgui/languages/zh_CN.ts	Tue Apr 10 09:56:43 2018 -0400
@@ -3660,8 +3660,8 @@
     </message>
     <message>
         <location line="+68"/>
-        <source>Import shortcuts from file ...</source>
-        <translation type="unfinished">从文件导入快捷键 ...</translation>
+        <source>Import shortcuts from file...</source>
+        <translation type="unfinished">从文件导入快捷键...</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -3671,8 +3671,8 @@
     </message>
     <message>
         <location line="-1"/>
-        <source>Export shortcuts into file ...</source>
-        <translation type="unfinished">导出快捷键到文件 ...</translation>
+        <source>Export shortcuts into file...</source>
+        <translation type="unfinished">导出快捷键到文件...</translation>
     </message>
     <message>
         <location line="+11"/>
diff -r d2558ba799d8 -r e3034c1956a3 libgui/src/variable-editor.cc
--- a/libgui/src/variable-editor.cc	Mon Apr 09 14:59:14 2018 -0700
+++ b/libgui/src/variable-editor.cc	Tue Apr 10 09:56:43 2018 -0400
@@ -1029,6 +1029,7 @@
     m_main->setCentralWidget (central_mdiarea);
 
     setWidget (m_main);
+    setFocusProxy (m_main);
 
     connect (this, SIGNAL (command_signal (const QString&)),
              p, SLOT (execute_command_in_terminal (const QString&)));
@@ -1196,18 +1197,15 @@
     if (parent () != nullptr)
       {
         QList<QTabBar *> barlist = main_win ()->findChildren<QTabBar *> ();
+        QVariant this_value (reinterpret_cast<quintptr> (this));
 
         foreach (QTabBar *tbar, barlist)
-          {
-            for (int i=0; i < tbar->count (); i++)
+          for (int i = 0; i < tbar->count (); i++)
+            if (tbar->tabData (i) == this_value)
               {
-                  if ((QWidget *) tbar->tabData (i).toULongLong () == this)
-                  {
-                    tbar->setCurrentIndex (i);
-                    return;
-                  }
+                tbar->setCurrentIndex (i);
+                return;
               }
-          }
       }
   }
 
diff -r d2558ba799d8 -r e3034c1956a3 libinterp/parse-tree/oct-parse.in.yy
--- a/libinterp/parse-tree/oct-parse.in.yy	Mon Apr 09 14:59:14 2018 -0700
+++ b/libinterp/parse-tree/oct-parse.in.yy	Tue Apr 10 09:56:43 2018 -0400
@@ -4753,6 +4753,8 @@
         octave_function *tmpfcn
           = dyn_loader.load_oct (nm, file, relative_lookup);
 
+        tmpfcn->stash_package_name (package_name);
+
         retval = octave_value (tmpfcn);
       }
     else if (len > 4 && file.substr (len-4, len-1) == ".mex")
@@ -4781,6 +4783,7 @@
         if (tmpfcn)
           {
             tmpfcn->document (doc_string);
+            tmpfcn->stash_package_name (package_name);
 
             retval = octave_value (tmpfcn);
           }
diff -r d2558ba799d8 -r e3034c1956a3 src/main.in.cc
--- a/src/main.in.cc	Mon Apr 09 14:59:14 2018 -0700
+++ b/src/main.in.cc	Tue Apr 10 09:56:43 2018 -0400
@@ -257,7 +257,7 @@
           start_gui = false;
           new_argv[k++] = argv[i];
         }
-      else if (! strcmp (argv[i], "--gui"))
+      else if (! strcmp (argv[i], "--gui") || ! strcmp (argv[i], "--force-gui"))
         {
           // If we see this option, then we fork and exec octave with
           // the --gui option, while continuing to handle signals in the