diff options
| author | Philipp Stephani | 2017-06-14 10:46:45 +0200 |
|---|---|---|
| committer | Philipp Stephani | 2017-06-14 10:47:32 +0200 |
| commit | a2f7cc3499a0d5132bf075aa0da87121be1ed178 (patch) | |
| tree | c1edbd57cbc2a14ebbb21f2aff67ab394485691b | |
| parent | 63ec338c988f3ac661fd68591d688b3874c88511 (diff) | |
| download | emacs-a2f7cc3499a0d5132bf075aa0da87121be1ed178.tar.gz emacs-a2f7cc3499a0d5132bf075aa0da87121be1ed178.zip | |
Define --module-assertions only of modules are available
Fixes Bug#27352.
* src/emacs.c (usage_message, standard_args): Define
--module-assertions only if Emacs has been compiled with module
support.
| -rw-r--r-- | src/emacs.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/emacs.c b/src/emacs.c index b0892c7ebb8..da8df1bf1c7 100644 --- a/src/emacs.c +++ b/src/emacs.c | |||
| @@ -223,8 +223,12 @@ Initialization options:\n\ | |||
| 223 | --fg-daemon[=NAME] start a (named) server in the foreground\n\ | 223 | --fg-daemon[=NAME] start a (named) server in the foreground\n\ |
| 224 | --debug-init enable Emacs Lisp debugger for init file\n\ | 224 | --debug-init enable Emacs Lisp debugger for init file\n\ |
| 225 | --display, -d DISPLAY use X server DISPLAY\n\ | 225 | --display, -d DISPLAY use X server DISPLAY\n\ |
| 226 | ", | ||
| 227 | #ifdef HAVE_MODULES | ||
| 228 | "\ | ||
| 226 | --module-assertions assert behavior of dynamic modules\n\ | 229 | --module-assertions assert behavior of dynamic modules\n\ |
| 227 | ", | 230 | ", |
| 231 | #endif | ||
| 228 | "\ | 232 | "\ |
| 229 | --no-build-details do not add build details such as time stamps\n\ | 233 | --no-build-details do not add build details such as time stamps\n\ |
| 230 | --no-desktop do not load a saved desktop\n\ | 234 | --no-desktop do not load a saved desktop\n\ |
| @@ -1733,7 +1737,9 @@ static const struct standard_args standard_args[] = | |||
| 1733 | { "-nl", "--no-loadup", 70, 0 }, | 1737 | { "-nl", "--no-loadup", 70, 0 }, |
| 1734 | { "-nsl", "--no-site-lisp", 65, 0 }, | 1738 | { "-nsl", "--no-site-lisp", 65, 0 }, |
| 1735 | { "-no-build-details", "--no-build-details", 63, 0 }, | 1739 | { "-no-build-details", "--no-build-details", 63, 0 }, |
| 1740 | #ifdef HAVE_MODULES | ||
| 1736 | { "-module-assertions", "--module-assertions", 62, 0 }, | 1741 | { "-module-assertions", "--module-assertions", 62, 0 }, |
| 1742 | #endif | ||
| 1737 | /* -d must come last before the options handled in startup.el. */ | 1743 | /* -d must come last before the options handled in startup.el. */ |
| 1738 | { "-d", "--display", 60, 1 }, | 1744 | { "-d", "--display", 60, 1 }, |
| 1739 | { "-display", 0, 60, 1 }, | 1745 | { "-display", 0, 60, 1 }, |