Merged in changes from CVS trunk. Plus added lisp/term tweaks.

[gnu-emacs] / src / fns.c

diff --git a/src/fns.c b/src/fns.c
index 60a98fd5709cc3782b187039d6aa3168342b0a68..1e26ec9a392c89f80be5b1a417344a6700ddb12d 100644 (file)
--- a/src/fns.c
+++ b/src/fns.c
@@ -5833,7 +5833,7 @@ syms_of_fns ()
   DEFVAR_LISP ("features", &Vfeatures,
     doc: /* A list of symbols which are the features of the executing emacs.
 Used by `featurep' and `require', and altered by `provide'.  */);
-  Vfeatures = Qnil;
+  Vfeatures = Fcons (intern ("emacs"), Qnil);
   Qsubfeatures = intern ("subfeatures");
   staticpro (&Qsubfeatures);