master e68f95e634f 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs

[Eli Zaretskii]

branch: master
commit e68f95e634f7b7248253979f47aaabd46d422e95
Merge: e18a6fbb44a 093c2e1ab9d
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
---
 doc/lispref/symbols.texi | 2 +-
 lisp/obarray.el          | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/doc/lispref/symbols.texi b/doc/lispref/symbols.texi
index 5207ea4ea7b..6f9b1ef0ec7 100644
--- a/doc/lispref/symbols.texi
+++ b/doc/lispref/symbols.texi
@@ -231,7 +231,7 @@ Emacs Lisp provides a different namespacing system called
 This function creates and returns a new obarray.
 The optional @var{size} may be used to specify the number of symbols
 that it is expected to hold, but since obarrays grow automatically
-as needed, this rarely provide any benefit.
+as needed, this rarely provides any benefit.
 @end defun
 
 @defun obarrayp object
diff --git a/lisp/obarray.el b/lisp/obarray.el
index e6e51c1382a..5e646db9ab7 100644
--- a/lisp/obarray.el
+++ b/lisp/obarray.el
@@ -29,10 +29,11 @@
 
 (defconst obarray-default-size 4)
 (make-obsolete-variable 'obarray-default-size
-                        "obarrays now grow automatically" "30.1")
+                        "obarrays now grow automatically." "30.1")
 
-(defun obarray-size (_ob) obarray-default-size)
-(make-obsolete 'obarray-size "obarrays now grow automatically" "30.1")
+(defun obarray-size (_ob)
+  (declare (obsolete "obarrays now grow automatically." "30.1"))
+  obarray-default-size)
 
 ;; Don’t use obarray as a variable name to avoid shadowing.
 (defun obarray-get (ob name)
@@ -42,7 +43,7 @@ Return nil otherwise."
 
 (defun obarray-put (ob name)
   "Return symbol named NAME from obarray OB.
-Creates and adds the symbol if doesn't exist."
+Creates and adds the symbol if it doesn't exist."
   (intern name ob))
 
 (defun obarray-remove (ob name)