From 70118c82d5d439285759e8ce2fb022867ca7c6ec Mon Sep 17 00:00:00 2001 From: Ianos Gnatiuc Date: Fri, 25 Nov 2005 06:35:56 +0000 Subject: [PATCH] @macroses work for ImportBegin/ImportEnd --- docs/notework.txt | 2 ++ golded3/geedit2.cpp | 10 ++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/docs/notework.txt b/docs/notework.txt index 3172f1d..8abfbc8 100644 --- a/docs/notework.txt +++ b/docs/notework.txt @@ -10,6 +10,8 @@ ______________________________________________________________________ Notes for GoldED+ 1.1.5, /snapshot/ ______________________________________________________________________ ++ @macroses work for ImportBegin and ImportEnd now. + + Node address will be shown on nodelist lookup, if point address is not found. + ')' and '(' chars can be used for advanced search. diff --git a/golded3/geedit2.cpp b/golded3/geedit2.cpp index 8cb8fbd..2d43647 100644 --- a/golded3/geedit2.cpp +++ b/golded3/geedit2.cpp @@ -1015,9 +1015,12 @@ void IEclass::editimport(Line* __line, char* __filename, bool imptxt) { batch_mode = BATCH_MODE; // Add import begin text, if any - if(*CFG->importbegin) { + if (*CFG->importbegin) + { sprintf(_parabuf, "%s\n", CFG->importbegin); strischg(_parabuf, "@file", imp_filename); + TokenXlat(MODE_NEW, _parabuf, msgptr, msgptr, CurrArea); + _parabuf[strlen(_parabuf)-1] = '\n'; _parabuf[margintext] = NUL; _parabuf[margintext-1] = '\n'; __line = insertlinebelow(__line, _parabuf); @@ -1189,9 +1192,12 @@ void IEclass::editimport(Line* __line, char* __filename, bool imptxt) { } // Add import end text, if any - if(*CFG->importend or *CFG->importbegin) { + if (*CFG->importend or *CFG->importbegin) + { sprintf(_parabuf, "%s\n", *CFG->importend ? CFG->importend : CFG->importbegin); strischg(_parabuf, "@file", imp_filename); + TokenXlat(MODE_NEW, _parabuf, msgptr, msgptr, CurrArea); + _parabuf[strlen(_parabuf)-1] = '\n'; _parabuf[margintext] = NUL; _parabuf[margintext-1] = '\n'; __line = insertlinebelow(__line, _parabuf);