* lisp/obsolete/assoc.el (aget): Prefix dynamic variable.

2 files changed, 12 insertions, 6 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8fb153fec66..2fd6cbc1aca 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2013-11-14  Glenn Morris  <rgm@gnu.org>
+
+        * obsolete/assoc.el (aget): Prefix dynamic variable.
+
+        * allout-widgets.el (allout-widgets): No need to autoload defgroup.
+
 2013-11-14  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * widget.el, hfy-cmap.el: Remove bogus package version number.
diff --git a/lisp/obsolete/assoc.el b/lisp/obsolete/assoc.el
index 9d8ffed4c9c..acf79a284c0 100644
--- a/lisp/obsolete/assoc.el
+++ b/lisp/obsolete/assoc.el
@@ -102,14 +102,14 @@ returned.
 
 If no key-value pair matching KEY could be found in ALIST, or ALIST is
 nil then nil is returned.  ALIST is not altered."
-  (defvar copy)
-  (let ((copy (copy-alist alist)))
+  (defvar assoc--copy)
+  (let ((assoc--copy (copy-alist alist)))
     (cond ((null alist) nil)
-          ((progn (asort 'copy key)
-                  (anot-head-p copy key)) nil)
-          ((cdr (car copy)))
+          ((progn (asort 'assoc--copy key) ; dynamic binding
+                  (anot-head-p assoc--copy key)) nil)
+          ((cdr (car assoc--copy)))
           (keynil-p nil)
-          ((car (car copy)))
+          ((car (car assoc--copy)))
           (t nil))))