Mercurial > octave
diff libgui/src/m-editor/file-editor-tab.cc @ 31647:431f80aba37a
maint: Merge stable to default.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Tue, 06 Dec 2022 15:37:43 -0500 |
parents | ad014fc78bd6 c6d54dd31a7e |
children | deb553ac2c54 |
line wrap: on
line diff
--- a/libgui/src/m-editor/file-editor-tab.cc Tue Dec 06 15:17:16 2022 -0500 +++ b/libgui/src/m-editor/file-editor-tab.cc Tue Dec 06 15:37:43 2022 -0500 @@ -96,8 +96,8 @@ #include "utils.h" #include "version.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + //! A file_editor_tab object consists of a text area and three left margins. //! The first holds breakpoints, bookmarks, and the debug program counter. //! The second holds line numbers. The third holds "fold" marks, to hide @@ -597,7 +597,6 @@ } } - void file_editor_tab::update_lexer (void) { // Create a new lexer @@ -703,7 +702,6 @@ } } - // Update settings, which are lexer related and have to be updated // when // a) the lexer changes, @@ -841,7 +839,6 @@ api_entries.append (QString::fromStdString (bfl[i])); } - if (octave_functions) { load_path& lp = interp.get_load_path (); @@ -1140,7 +1137,6 @@ m_edit_area->setCursorPosition (prevline, 0); } - QString file_editor_tab::get_all_bookmarks () { QString bmlist; @@ -2859,7 +2855,6 @@ } - void file_editor_tab::auto_margin_width (void) { m_edit_area->setMarginWidth (2, "1" + QString::number (m_edit_area->lines ())); @@ -3296,6 +3291,7 @@ return QString (); } -} + +OCTAVE_END_NAMESPACE(octave) #endif