Mercurial > octave-nkf
changeset 10444:537d9fbba9c0
don't call missing_function_hook inside try block
| author | Jaroslav Hajek <highegg@gmail.com> |
|---|---|
| date | Wed, 24 Mar 2010 13:10:36 +0100 |
| parents | 34e51d4e199b |
| children | 62f8ae5ab2cc |
| files | scripts/miscellaneous/unimplemented.m src/ChangeLog src/variables.cc |
| diffstat | 3 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/miscellaneous/unimplemented.m Wed Mar 24 12:56:18 2010 +0100 +++ b/scripts/miscellaneous/unimplemented.m Wed Mar 24 13:10:36 2010 +0100 @@ -58,7 +58,7 @@ endif endswitch - txt = [txt, "\nPlease read @url{http://www.octave.org/missing.html}",... + txt = [txt, "\nPlease read @url{http://www.octave.org/missing.html} ",... "to find out how you can help with contributing missing functionality."]; warning ("Octave:missing-function",["\n", __makeinfo__(txt)]);
--- a/src/ChangeLog Wed Mar 24 12:56:18 2010 +0100 +++ b/src/ChangeLog Wed Mar 24 13:10:36 2010 +0100 @@ -1,3 +1,8 @@ +2010-03-24 Jaroslav Hajek <highegg@gmail.com> + + * variables.cc (maybe_missing_function_hook): Don't call hook if + errors are being handled. + 2010-03-24 Jaroslav Hajek <highegg@gmail.com> * variables.cc (Fmissing_function_hook): New pseudo-variable.
--- a/src/variables.cc Wed Mar 24 12:56:18 2010 +0100 +++ b/src/variables.cc Wed Mar 24 13:10:36 2010 +0100 @@ -2392,6 +2392,7 @@ void maybe_missing_function_hook (const std::string& name) { - if (! Vmissing_function_hook.empty ()) + // Don't do this if we're handling errors. + if (buffer_error_messages == 0 && ! Vmissing_function_hook.empty ()) feval (Vmissing_function_hook, octave_value (name)); }