summaryrefslogtreecommitdiff
path: root/lisp/obarray.el
diff options
context:
space:
mode:
authorArtur Malabarba <bruce.connor.am@gmail.com>2015-11-11 22:30:22 +0000
committerArtur Malabarba <bruce.connor.am@gmail.com>2015-11-11 22:30:22 +0000
commit952395d3eb813e1c21b8bace10e54aa67bee9122 (patch)
tree91ce9ffe74d5913807e98ecf8fd2fc801212081e /lisp/obarray.el
parent436d3307211db86d5606e6cec51d6fbe9f7572a8 (diff)
downloademacs-952395d3eb813e1c21b8bace10e54aa67bee9122.tar.gz
* lisp/obarray.el: Fix shadowed variables
(obarray-map, obarray-remove, obarray-put, obarray-get): Change OBARRAY arg to OB to avoid shadowing ‘obarray’.
Diffstat (limited to 'lisp/obarray.el')
-rw-r--r--lisp/obarray.el25
1 files changed, 13 insertions, 12 deletions
diff --git a/lisp/obarray.el b/lisp/obarray.el
index bf8bb3ee2ca..a93c9a94c33 100644
--- a/lisp/obarray.el
+++ b/lisp/obarray.el
@@ -42,24 +42,25 @@
(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