diff --git a/docs/notework.rus b/docs/notework.rus
index 5be2b81..fbc2ae0 100644
--- a/docs/notework.rus
+++ b/docs/notework.rus
@@ -10,6 +10,9 @@ _____________________________________________________________________________
                Заметки для GoldED+ 1.1.5, /snapshot/
 _____________________________________________________________________________
 
+! Исправлена ошибка обработки @-макросов: ранее макрос в конце строки не
+  обрабатывался.
+
 ! Если нет ни одного URLHANDLER и вызывается READpeekURLs, Golded+ теперь не
   падает с segmentation fault.
 
diff --git a/docs/notework.txt b/docs/notework.txt
index 979a1de..e8c58fb 100644
--- a/docs/notework.txt
+++ b/docs/notework.txt
@@ -10,6 +10,9 @@ ______________________________________________________________________
                Notes for GoldED+ 1.1.5, /snapshot/
 ______________________________________________________________________
 
+! Error in parser @-macro is fixed: macro in end of line are ignored
+  before this fix.
+
 ! If not defined any URLHANDLER and key "READpeekURLs" is pressed,
   Golded+ does not trap now (segmentation fault fixed).
 
diff --git a/golded3/gemsgs.cpp b/golded3/gemsgs.cpp
index 54c3c95..09bc838 100644
--- a/golded3/gemsgs.cpp
+++ b/golded3/gemsgs.cpp
@@ -50,7 +50,7 @@ static bool tokenxchg(std::string &input, std::string::iterator &pos,
   size_t toklen = strlen(tok);
   const char* inp_str_tok=it2str(input, pos);
 
-  if ( (strnieql(inp_str_tok, tok, toklen)) && (isspace(inp_str_tok[toklen]) || ispunct(inp_str_tok[toklen])) )
+  if ( (strnieql(inp_str_tok, tok, toklen)) && (isspace(inp_str_tok[toklen]) || ispunct(inp_str_tok[toklen]) || inp_str_tok[toklen]=='\0') )
   {
     std::string str = src;
     std::string::iterator tokend = pos+toklen;