[Emacs-diffs] /srv/bzr/emacs/trunk r103431: * lisp/emacs-lisp/assoc.el: Remove misleading `sort'.

[Stefan Monnier]

------------------------------------------------------------
revno: 103431
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Sat 2011-02-26 16:09:03 -0500
message:
  * lisp/emacs-lisp/assoc.el: Remove misleading `sort'.
  (aput, adelete, amake): Replace `eval' -> `symbol-value'.
  Suggested by Michael Heerdegen <address@hidden>.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/assoc.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-02-25 23:52:19 +0000
+++ b/lisp/ChangeLog    2011-02-26 21:09:03 +0000
@@ -1,3 +1,9 @@
+2011-02-26  Stefan Monnier  <address@hidden>
+
+       * emacs-lisp/assoc.el: Remove misleading `sort' (bug#8126).
+       (aput, adelete, amake): Replace `eval' -> `symbol-value'.
+       Suggested by Michael Heerdegen <address@hidden>.
+
 2011-02-25  Teodor Zlatanov  <address@hidden>
 
        * password-cache.el (password-in-cache-p): Convenience function to

=== modified file 'lisp/emacs-lisp/assoc.el'
--- a/lisp/emacs-lisp/assoc.el  2011-01-25 04:08:28 +0000
+++ b/lisp/emacs-lisp/assoc.el  2011-02-26 21:09:03 +0000
@@ -1,4 +1,4 @@
-;;; assoc.el --- insert/delete/sort functions on association lists
+;;; assoc.el --- insert/delete functions on association lists
 
 ;; Copyright (C) 1996, 2001-2011  Free Software Foundation, Inc.
 
@@ -35,7 +35,7 @@
 the order of any other key-value pair.  Side effect sets alist to new
 sorted list."
   (set alist-symbol
-       (sort (copy-alist (eval alist-symbol))
+       (sort (copy-alist (symbol-value alist-symbol))
             (function (lambda (a b) (equal (car a) key))))))
 
 
@@ -75,7 +75,7 @@
   (lexical-let ((elem (aelement key value))
                alist)
     (asort alist-symbol key)
-    (setq alist (eval alist-symbol))
+    (setq alist (symbol-value alist-symbol))
     (cond ((null alist) (set alist-symbol elem))
          ((anot-head-p alist key) (set alist-symbol (nconc elem alist)))
          (value (setcar alist (car elem)))
@@ -87,7 +87,7 @@
 Alist is referenced by ALIST-SYMBOL and the key-value pair to remove
 is pair matching KEY.  Returns the altered alist."
   (asort alist-symbol key)
-  (lexical-let ((alist (eval alist-symbol)))
+  (lexical-let ((alist (symbol-value alist-symbol)))
     (cond ((null alist) nil)
          ((anot-head-p alist key) alist)
          (t (set alist-symbol (cdr alist))))))
@@ -133,7 +133,7 @@
          (t
           (amake alist-symbol keycdr valcdr)
           (aput alist-symbol keycar valcar))))
-  (eval alist-symbol))
+  (symbol-value alist-symbol))
 
 (provide 'assoc)