* lisp/emacs-lisp/assoc.el (aput): Fix return value

Fixes: debbugs:10146

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8cb089d523e99e7e66cbd4b3705291407b156a67..2bc6b658823fea9c055f7820bdad0b4b918f5528 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2011-12-05  Christopher Genovese  <genovese.cr@gmail.com>  (tiny change)
+
+       * emacs-lisp/assoc.el (aput): Fix return value (bug#10146)
+
 2011-12-05  Eli Zaretskii  <eliz@gnu.org>
 
        * descr-text.el (describe-char): Fix display of strong

diff --git a/lisp/emacs-lisp/assoc.el b/lisp/emacs-lisp/assoc.el
index 31be851f2dd5ad5e9cda5899cb0ab29343b77a98..e650995d3fe15439dd07faa81d93f004839608e2 100644 (file)
--- a/lisp/emacs-lisp/assoc.el
+++ b/lisp/emacs-lisp/assoc.el
@@ -61,10 +61,9 @@ pair is not at the head of alist.  ALIST is not altered."
 
 
 (defun aput (alist-symbol key &optional value)
-  "Inserts a key-value pair into an alist.
+  "Insert a key-value pair into an alist.
 The alist is referenced by ALIST-SYMBOL.  The key-value pair is made
-from KEY and optionally, VALUE.  Returns the altered alist or nil if
-ALIST is nil.
+from KEY and optionally, VALUE.  Returns the altered alist.
 
 If the key-value pair referenced by KEY can be found in the alist, and
 VALUE is supplied non-nil, then the value of KEY will be set to VALUE.
@@ -78,7 +77,7 @@ of the alist (with value nil if VALUE is nil or not supplied)."
     (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)))
+         (value (setcar alist (car elem)) alist)
          (t alist))))