Another merge with master.

Updated Doxygen error numbers yet again, as Python errors got added in the
meanwhile, pushing the Doxygen ones further off.

And re-merged PEP8/whitespace-related conflicts in autodoc_runme.py once again
(if anybody is looking for a motivating example about why significant
whitespace is bad, here is a great use case).
This commit is contained in:
Vadim Zeitlin 2015-07-20 00:40:32 +02:00
commit 302955a152
448 changed files with 8836 additions and 5079 deletions

View file

@ -236,13 +236,17 @@
/* please leave 720-739 free for Scilab */
#define WARN_DOXYGEN_UNKNOWN_COMMAND 740
#define WARN_DOXYGEN_UNEXPECTED_END_OF_COMMENT 741
#define WARN_DOXYGEN_COMMAND_EXPECTED 742
#define WARN_DOXYGEN_UNTERMINATED_STRING 743
#define WARN_DOXYGEN_COMMAND_ERROR 744
#define WARN_PYTHON_INDENT_MISMATCH 740
/* please leave 740-749 free for Doxygen */
/* please leave 740-759 free for Python */
#define WARN_DOXYGEN_UNKNOWN_COMMAND 760
#define WARN_DOXYGEN_UNEXPECTED_END_OF_COMMENT 761
#define WARN_DOXYGEN_COMMAND_EXPECTED 762
#define WARN_DOXYGEN_UNTERMINATED_STRING 763
#define WARN_DOXYGEN_COMMAND_ERROR 764
/* please leave 760-779 free for Doxygen */
#define WARN_RUBY_WRONG_NAME 801
#define WARN_RUBY_MULTIPLE_INHERITANCE 802