merge "namespace octave" and OCTAVE_NAMESPACE_BEGIN/END blocks In files with both OCTAVE_NAMESPACE_BEGIN/END and "namespace octave" blocks, merge adjacent blocks. Use the macros in place of "namespace octave" in affected files and the corresponding header files. Files affected: call-stack.cc, call-stack.h, defaults.cc, defaults.h, defun-int.h, display.cc, display.h, environment.cc, environment.h, error.cc, error.h, event-manager.cc, event-manager.h, fcn-info.cc, fcn-info.h, help.cc, help.h, input.cc, input.h, interpreter.cc, interpreter.h, load-path.cc, load-path.h, load-save.cc, load-save.h, oct-hist.cc, oct-hist.h, pager.cc, pager.h, settings.cc, settings.h, sighandlers.cc, sighandlers.h, symtab.cc, symtab.h, sysdep.cc, sysdep.h, utils.cc, utils.h, __ode15__.cc, gzip.cc, ov-fcn-handle.cc, ov-fcn-handle.h, ov-java.cc, ov-java.h, ov-typeinfo.cc, ov-typeinfo.h, ov.cc, ov.h, octave.cc, octave.h, lex.ll, oct-parse.yy, profiler.cc, profiler.h, pt-eval.cc, and pt-eval.h.

--- a/libinterp/corefcn/load-path.cc	Sat Aug 14 18:55:37 2021 -0400
+++ b/libinterp/corefcn/load-path.cc	Sat Aug 14 21:50:26 2021 -0400
@@ -49,8 +49,8 @@
 #include "unwind-prot.h"
 #include "utils.h"
 
-namespace octave
-{
+OCTAVE_NAMESPACE_BEGIN
+
   // Canonicalize file name (keeping the path relative) if it exists.
   // Return it unmodified otherwise.
 
@@ -2399,9 +2399,6 @@
 
     return retval;
   }
-}
-
-OCTAVE_NAMESPACE_BEGIN
 
 DEFUN (genpath, args, ,
        doc: /* -*- texinfo -*-