# HG changeset patch
# User Markus Mützel <markus.muetzel@gmx.de>
# Date 1591878591 -7200
# Node ID b659b7f085c6125ad274e41d6f3b7e2a45f83878
# Parent  a68e892970d0043fe1dda2b406422912fa314b52# Parent  d0f5f42e2cf78b5acd54b718030c89d20d083a40
maint: merge stable to default.

diff -r a68e892970d0 -r b659b7f085c6 libinterp/octave-value/ov-fcn-handle.cc
--- a/libinterp/octave-value/ov-fcn-handle.cc	Thu Jun 11 14:21:59 2020 +0200
+++ b/libinterp/octave-value/ov-fcn-handle.cc	Thu Jun 11 14:29:51 2020 +0200
@@ -1191,10 +1191,10 @@
 
     if (m_fcn.is_defined ())
       {
-        octave_function *fcn = m_fcn.function_value ();
-
-        if (fcn)
-          m_file = fcn->fcn_file_name ();
+        octave_function *oct_fcn = m_fcn.function_value ();
+
+        if (oct_fcn)
+          m_file = oct_fcn->fcn_file_name ();
       }
 
     m_parentage.push_front (name);