Merge remote-tracking branch 'openscad/master'
This commit is contained in:
commit
1ddc32d613
4 changed files with 4 additions and 6 deletions
|
|
@ -142,9 +142,6 @@
|
|||
(modify-syntax-entry ?= "." st)
|
||||
(modify-syntax-entry ?\; "." st)
|
||||
|
||||
;; _ allowed in word (alternatively "_" as symbol constituent?)
|
||||
(modify-syntax-entry ?_ "w" st)
|
||||
|
||||
st)
|
||||
"Syntax table for `scad-mode'.")
|
||||
|
||||
|
|
|
|||
|
|
@ -1768,7 +1768,7 @@ bool MainWindow::fileChangedOnDisk()
|
|||
*/
|
||||
void MainWindow::compileTopLevelDocument()
|
||||
{
|
||||
resetPrintedDeprecations();
|
||||
resetSuppressedMessages();
|
||||
|
||||
this->last_compiled_doc = editor->toPlainText();
|
||||
|
||||
|
|
|
|||
|
|
@ -119,7 +119,8 @@ void printDeprecation(const std::string &str)
|
|||
}
|
||||
}
|
||||
|
||||
void resetPrintedDeprecations()
|
||||
void resetSuppressedMessages()
|
||||
{
|
||||
printedDeprecations.clear();
|
||||
lastmessages.clear();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ extern std::list<std::string> print_messages_stack;
|
|||
void print_messages_push();
|
||||
void print_messages_pop();
|
||||
void printDeprecation(const std::string &str);
|
||||
void resetPrintedDeprecations();
|
||||
void resetSuppressedMessages();
|
||||
|
||||
#define PRINT_DEPRECATION(_fmt, _arg) do { printDeprecation(str(boost::format(_fmt) % _arg)); } while (0)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue