Mercurial > octave
changeset 32577:19f51c7fa341
maint: Merge stable to default.
| author | Markus Mützel <markus.muetzel@gmx.de> |
|---|---|
| date | Sun, 10 Dec 2023 18:01:29 +0100 |
| parents | 9f493031b539 (current diff) 606ac462fa34 (diff) |
| children | ebace755ea13 324c67c33dbd |
| files | |
| diffstat | 2 files changed, 18 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/util/glob-match.cc Sun Dec 10 15:50:54 2023 +0100 +++ b/liboctave/util/glob-match.cc Sun Dec 10 18:01:29 2023 +0100 @@ -67,7 +67,7 @@ #if defined (OCTAVE_USE_WINDOWS_API) m_glob = nullptr; #else - m_glob {new glob_match (pattern)}; + m_glob = std::unique_ptr<glob_match> {new glob_match {pattern}}; #endif }
--- a/scripts/startup/site-rcfile Sun Dec 10 15:50:54 2023 +0100 +++ b/scripts/startup/site-rcfile Sun Dec 10 18:01:29 2023 +0100 @@ -5,3 +5,20 @@ ## ## This file contains commands that should be executed each time Octave starts ## for every user at this site. + +if ispc () && isguirunning () ... + && ~strcmp (winqueryreg ("HKEY_CURRENT_USER", 'Console\%%Startup', "DelegationConsole"), ... + "{B23D10C0-E52E-411E-9D5B-C09FDF709C7D}") + warn_str = ["WARNING: You are using an incompatible Windows configuration!\n", ... + "Microsoft's new Terminal App is not compatible with Octave.\n", ... + "Please follow the instructions on the following page and set the ", ... + "default terminal to \"Windows Console Host\":\n", ... + "https://octave.discourse.group/t/4981/"]; + warning ("octave:terminal-app", warn_str); + answer = questdlg ([warn_str, "\n\nWould you like to open that page in your browser?"], ... + "Incompatible Configuration", "Yes", "No", "Yes"); + if strcmp (answer, "Yes") + system ("start https://octave.discourse.group/t/4981/"); + endif + clear warn_str answer +endif