[Emacs-diffs] trunk r115097: * lisp/obsolete/assoc.el (aget): Prefix dynamic variable.

[Glenn Morris]

------------------------------------------------------------
revno: 115097
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2013-11-13 18:44:54 -0800
message:
  * lisp/obsolete/assoc.el (aget): Prefix dynamic variable.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/obsolete/assoc.el         assoc.el-20091113204419-o5vbwnq5f7feedwu-565

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-11-14 00:41:58 +0000
+++ b/lisp/ChangeLog    2013-11-14 02:44:54 +0000
@@ -1,3 +1,9 @@
+2013-11-14  Glenn Morris  <address@hidden>
+
+       * obsolete/assoc.el (aget): Prefix dynamic variable.
+
+       * allout-widgets.el (allout-widgets): No need to autoload defgroup.
+
 2013-11-14  Stefan Monnier  <address@hidden>
 
        * widget.el, hfy-cmap.el: Remove bogus package version number.

=== modified file 'lisp/obsolete/assoc.el'
--- a/lisp/obsolete/assoc.el    2013-01-01 09:11:05 +0000
+++ b/lisp/obsolete/assoc.el    2013-11-14 02:44:54 +0000
@@ -102,14 +102,14 @@
 
 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))))