Rename locked to lock

diff --git a/src/lisp.h b/src/lisp.h
index 742fce58eacab2670437b30f8287d6576c8b1d7c..b4fdb4700c3d0194acd25092f6d99cf3a53d47eb 100644 (file)
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2231,7 +2231,7 @@ struct Lisp_Package
   Lisp_Object use_list;
 
   /* T means the package is locked, i.e. no symbols can be added to it.  */
-  Lisp_Object locked;
+  Lisp_Object lock;
 
   /* List of shadowing symbols.  */
   Lisp_Object shadowing_symbols;

diff --git a/src/pkg.c b/src/pkg.c
index 9a9eece4f65e1d0f7c09d2fbd5affa9f64e55b49..2b9367bff0e80ccfe3948df00186dee8fc2d0447 100644 (file)
--- a/src/pkg.c
+++ b/src/pkg.c
@@ -858,20 +858,20 @@ DEFUN ("package-%set-shadowing-symbols", Fpackage_percent_set_shadowing_symbols,
   return XPACKAGE (package)->shadowing_symbols = shadowing_symbols;
 }
 
-DEFUN ("package-%locked", Fpackage_percent_locked,
-       Spackage_percent_locked, 1, 1, 0, doc:  /* Internal use only.  */)
+DEFUN ("package-%lock", Fpackage_percent_lock,
+       Spackage_percent_lock, 1, 1, 0, doc:  /* Internal use only.  */)
   (Lisp_Object package)
 {
   CHECK_PACKAGE (package);
-  return XPACKAGE (package)->locked;
+  return XPACKAGE (package)->lock;
 }
 
-DEFUN ("package-%set-locked", Fpackage_percent_set_locked,
-       Spackage_percent_set_locked, 2, 2, 0, doc: /* Internal use only.  */)
-  (Lisp_Object package, Lisp_Object locked)
+DEFUN ("package-%set-lock", Fpackage_percent_set_lock,
+       Spackage_percent_set_lock, 2, 2, 0, doc: /* Internal use only.  */)
+  (Lisp_Object package, Lisp_Object lock)
 {
   CHECK_PACKAGE (package);
-  return XPACKAGE (package)->locked = locked;
+  return XPACKAGE (package)->lock = lock;
 }
 
 DEFUN ("package-%symbols", Fpackage_percent_symbols,
@@ -1007,8 +1007,8 @@ syms_of_pkg (void)
   defsubr (&Spackage_percent_set_symbol_package);
   defsubr (&Spackage_percent_set_use_list);
   defsubr (&Spackage_percent_shadowing_symbols);
-  defsubr (&Spackage_percent_locked);
-  defsubr (&Spackage_percent_set_locked);
+  defsubr (&Spackage_percent_lock);
+  defsubr (&Spackage_percent_set_lock);
   defsubr (&Spackage_percent_symbols);
   defsubr (&Spackage_percent_use_list);
   defsubr (&Spackagep);