(syms_of_lread): Make Vbytecomp_version_regexp a Lisp

variable; recognize Emacs 19 elc files.

diff --git a/src/ChangeLog b/src/ChangeLog
index 0b6d54a8db82ae58b5c2a392036a61a19528ac5d..6dbbad6dea9fc273f503792865d466d2000aafb7 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2000-09-04  Gerd Moellmann  <gerd@gnu.org>
+
+       * lread.c (syms_of_lread): Make Vbytecomp_version_regexp a Lisp
+       variable; recognize Emacs 19 elc files.
+
 2000-09-04  Miles Bader  <miles@gnu.org>
 
        * xmenu.c (xmenu_show): Call x_set_menu_resources_from_menu_face

diff --git a/src/lread.c b/src/lread.c
index 2e618633ae3fe44ff9fb38cfd55340cc6389e43a..cb682b2f2ae2cd12d8427d090023822dda554ec6 100644 (file)
--- a/src/lread.c
+++ b/src/lread.c
@@ -3543,8 +3543,14 @@ incompatible byte codes can make Emacs crash when it tries to execute\n\
 them.");
   load_dangerous_libraries = 0;
 
-  Vbytecomp_version_regexp = build_string ("^;;;.in Emacs version");
-  staticpro (&Vbytecomp_version_regexp);
+  DEFVAR_LISP ("bytecomp-version-regexp", &Vbytecomp_version_regexp,
+     "Regular expression matching safe to load compiled Lisp files.\n\
+When Emacs loads a compiled Lisp file, it reads the first 512 bytes\n\
+from the file, and matches them against this regular expression.\n\
+When the regular expression matches, the file is considered to be safe\n\
+to load.  See also `load-dangerous-libraries'.");
+  Vbytecomp_version_regexp
+    = build_string ("^;;;.\\(in Emacs\\|emacs\\) version");
 
   /* Vsource_directory was initialized in init_lread.  */