* lisp/simple.el (save-mark-and-excursion): Add declare forms.

[gnu-emacs] / lisp / obarray.el

diff --git a/lisp/obarray.el b/lisp/obarray.el
index 0e57381a9c5ee67c4ccbf814ab44363032b2a898..f015212653cff8f1fb6cb70f67d1985e7d8af8ec 100644 (file)
--- a/lisp/obarray.el
+++ b/lisp/obarray.el
@@ -1,6 +1,6 @@
 ;;; obarray.el --- obarray functions -*- lexical-binding: t -*-
 
-;; Copyright (C) 2015 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2016 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: obarray functions
@@ -37,29 +37,30 @@
         (make-vector size 0)
       (signal 'wrong-type-argument '(size 0)))))
 
-(defun obarray-p (object)
+(defun obarrayp (object)
   "Return t if OBJECT is an obarray."
   (and (vectorp object)
        (< 0 (length object))))
 
-(defun obarray-get (obarray name)
-  "Return symbol named NAME if it is contained in OBARRAY.
+;; Don’t use obarray as a variable name to avoid shadowing.
+(defun obarray-get (ob name)
+  "Return symbol named NAME if it is contained in obarray OB.
 Return nil otherwise."
-  (intern-soft name obarray))
+  (intern-soft name ob))
 
-(defun obarray-put (obarray name)
-  "Return symbol named NAME from OBARRAY.
+(defun obarray-put (ob name)
+  "Return symbol named NAME from obarray OB.
 Creates and adds the symbol if doesn't exist."
-  (intern name obarray))
+  (intern name ob))
 
-(defun obarray-remove (obarray name)
-  "Remove symbol named NAME if it is contained in OBARRAY.
+(defun obarray-remove (ob name)
+  "Remove symbol named NAME if it is contained in obarray OB.
 Return t on success, nil otherwise."
-  (unintern name obarray))
+  (unintern name ob))
 
-(defun obarray-map (fn obarray)
-  "Call function FN on every symbol in OBARRAY and return nil."
-  (mapatoms fn obarray))
+(defun obarray-map (fn ob)
+  "Call function FN on every symbol in obarray OB and return nil."
+  (mapatoms fn ob))
 
 (provide 'obarray)
 ;;; obarray.el ends here