summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog1
-rw-r--r--lisp/emacs-lisp/assoc.el1
2 files changed, 2 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a02521ca147..87b525d7e66 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,6 @@
2012-04-26 Stefan Monnier <monnier@iro.umontreal.ca>
+ * emacs-lisp/assoc.el (aget): Fix dynamic-scoping issue (bug#11352).
* term/ns-win.el (ns-define-service):
* progmodes/pascal.el (pascal-goto-defun):
diff --git a/lisp/emacs-lisp/assoc.el b/lisp/emacs-lisp/assoc.el
index d3185c444d7..8e6f7711d5b 100644
--- a/lisp/emacs-lisp/assoc.el
+++ b/lisp/emacs-lisp/assoc.el
@@ -101,6 +101,7 @@ 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)))
(cond ((null alist) nil)
((progn (asort 'copy key)