模块加载移动到init-research.scm

Author: JackChen

TeXmacs/progs/init-research.scm

@@ -247,6 +247,7 @@
 (lazy-define (table table-widgets) open-cell-properties open-table-properties)
 (tm-property (open-cell-properties) (:interactive #t))
 (tm-property (open-table-properties) (:interactive #t))
+(use-modules (generic text-toolbar))
 ;;(display* "time: " (- (texmacs-time) boot-start) "\n")
 ;;(display* "memory: " (texmacs-memory) " bytes\n")
 
@@ -526,4 +527,3 @@
                   (display "Timing:") (display (- (texmacs-time) start-time)) (newline)
                   ;(quit-TeXmacs)
                   ))))))))))))
-

src/Edit/Interface/edit_mouse.cpp

@@ -1189,12 +1189,6 @@ edit_interface_rep::should_show_text_toolbar () {
   }
   text_toolbar_last_check= now;
 
-  static bool text_toolbar_module_loaded= false;
-  if (!text_toolbar_module_loaded) {
-    eval ("(use-modules (generic text-toolbar))");
-    text_toolbar_module_loaded= true;
-  }
-
   if (!as_bool (call ("text-toolbar-allowed-context?"))) {
     text_toolbar_last_result= false;
     return false;

src/Plugins/Qt/QTMTextToolbar.cpp

@@ -88,7 +88,6 @@ QTMTextToolbar::clearButtons () {
 
 void
 QTMTextToolbar::rebuildButtonsFromScheme () {
-  eval ("(use-modules (generic text-toolbar))");
   object menu= eval ("'(horizontal (link text-toolbar-icons))");
   object obj = call ("make-menu-widget", menu, 0);
   if (!is_widget (obj)) return;