Mercurial > octave
comparison libgui/src/m-editor/file-editor.cc @ 29934:116dbaba5a74 stable
fix opening a file in a custom editor (bug #60990)
* external-editor-interface.cc (call_custom_editor): call custom editor
even for valid line numbers, avoid negative line numbers
* file-editor.cc (request_open_file): check preference for custom editor
and if set, do nothing in case of debugging
| author | Torsten Lilge <ttl-octave@mailbox.org> |
|---|---|
| date | Sat, 31 Jul 2021 16:07:45 +0200 |
| parents | c0466e8ab704 |
| children | fb0436a0c126 |
comparison
equal
deleted
inserted
replaced
| 29933:9ec1715a9aae | 29934:116dbaba5a74 |
|---|---|
| 1485 const QString& encoding, | 1485 const QString& encoding, |
| 1486 int line, bool debug_pointer, | 1486 int line, bool debug_pointer, |
| 1487 bool breakpoint_marker, bool insert, | 1487 bool breakpoint_marker, bool insert, |
| 1488 const QString& cond, int index) | 1488 const QString& cond, int index) |
| 1489 { | 1489 { |
| 1490 if (call_custom_editor (openFileName, line)) | |
| 1491 return; // custom editor called | |
| 1492 | |
| 1493 resource_manager& rmgr = m_octave_qobj.get_resource_manager (); | 1490 resource_manager& rmgr = m_octave_qobj.get_resource_manager (); |
| 1494 gui_settings *settings = rmgr.get_settings (); | 1491 gui_settings *settings = rmgr.get_settings (); |
| 1492 | |
| 1493 if (settings->value (global_use_custom_editor).toBool ()) | |
| 1494 { | |
| 1495 // Custom editor | |
| 1496 if (debug_pointer || breakpoint_marker) | |
| 1497 return; // Do not call custom editor during debugging | |
| 1498 | |
| 1499 if (call_custom_editor (openFileName, line)) | |
| 1500 return; // Custom editor called | |
| 1501 } | |
| 1502 | |
| 1495 bool show_dbg_file | 1503 bool show_dbg_file |
| 1496 = settings->value (ed_show_dbg_file).toBool (); | 1504 = settings->value (ed_show_dbg_file).toBool (); |
| 1497 | 1505 |
| 1498 if (openFileName.isEmpty ()) | 1506 if (openFileName.isEmpty ()) |
| 1499 { | 1507 { |