aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/emacs.c6
2 files changed, 10 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 6ac67ca5592..1527c98f052 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12014-03-28 Glenn Morris <rgm@gnu.org>
2
3 * emacs.c (syms_of_emacs) <system-configuration-features>: New var.
4
12014-03-27 Paul Eggert <eggert@cs.ucla.edu> 52014-03-27 Paul Eggert <eggert@cs.ucla.edu>
2 6
3 Port recent signal-related changes to FreeBSD. 7 Port recent signal-related changes to FreeBSD.
diff --git a/src/emacs.c b/src/emacs.c
index 9d070bda51b..07deccd16ec 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -2460,6 +2460,12 @@ Emacs is running. */);
2460 doc: /* String containing the configuration options Emacs was built with. */); 2460 doc: /* String containing the configuration options Emacs was built with. */);
2461 Vsystem_configuration_options = build_string (EMACS_CONFIG_OPTIONS); 2461 Vsystem_configuration_options = build_string (EMACS_CONFIG_OPTIONS);
2462 2462
2463 DEFVAR_LISP ("system-configuration-features", Vsystem_configuration_features,
2464 doc: /* String listing some of the main features this Emacs was compiled with.
2465An element of the form \"FOO\" generally means that HAVE_FOO was
2466defined during the build. */);
2467 Vsystem_configuration_features = build_string (EMACS_CONFIG_FEATURES);
2468
2463 DEFVAR_BOOL ("noninteractive", noninteractive1, 2469 DEFVAR_BOOL ("noninteractive", noninteractive1,
2464 doc: /* Non-nil means Emacs is running without interactive terminal. */); 2470 doc: /* Non-nil means Emacs is running without interactive terminal. */);
2465 2471