Mercurial > octave-nkf
changeset 18470:044bbf569cd3 gui-release
maint: Merge stable to gui-release.
| author | Rik <rik@octave.org> |
|---|---|
| date | Sat, 15 Feb 2014 20:19:04 -0800 |
| parents | f959c63934e6 (current diff) 343718b2eee4 (diff) |
| children | b2a2f097c5e0 2b01c11197d6 |
| files | |
| diffstat | 2 files changed, 14 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/corefcn/sighandlers.cc Thu Feb 13 22:17:44 2014 +0100 +++ b/libinterp/corefcn/sighandlers.cc Sat Feb 15 20:19:04 2014 -0800 @@ -139,6 +139,12 @@ octave_jump_to_enclosing_context_sync (); else { + // 64-bit Windows does not appear to have threadContext.Eip. + // Something else must be done here to allow interrupts to + // properly work across threads. + +#if ! (defined (__MINGW64__) || defined (_WIN64)) + CONTEXT threadContext; SuspendThread (thread); @@ -147,6 +153,7 @@ threadContext.Eip = (DWORD) octave_jump_to_enclosing_context_sync; SetThreadContext (thread, &threadContext); ResumeThread (thread); +#endif } }
--- a/scripts/plot/appearance/axis.m Thu Feb 13 22:17:44 2014 +0100 +++ b/scripts/plot/appearance/axis.m Sat Feb 15 20:19:04 2014 -0800 @@ -197,10 +197,14 @@ ## (useful with the x11 gnuplot terminal after a window resize) set (ca, "dataaspectratiomode", "auto"); endif - set (ca, "dataaspectratio", [1, 1, 1]); + set (ca, "dataaspectratio", [1, 1, 1], "plotboxaspectratio", [5 4 4]); + elseif (strcmpi (ax, "normal")) - set (ca, "plotboxaspectratio", [1, 1, 1]); - set (ca, "plotboxaspectratiomode", "auto"); + ## Set plotboxaspectratio to something obtuse so that switching + ## back to "auto" will force a re-calculation. + set (ca, "plotboxaspectratio", [3 2 1]); + set (ca, "plotboxaspectratiomode", "auto", + "dataaspectratiomode", "auto"); ## axis limits elseif (len >= 4 && strcmpi (ax(1:4), "auto"))