From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Thu, 8 Nov 2012 01:24:14 +0000 (-0500)
Subject: * lisp/emacs-lisp/gv.el (gv-define-simple-setter): Fix last change.
X-Git-Tag: emacs-24.2.90~141
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=41626722272734aa3a7e4fdfafd3b085133db665;p=emacs.git

* lisp/emacs-lisp/gv.el (gv-define-simple-setter): Fix last change.

Fixes: debbugs:12812
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 98e47dd83d9..6a574f4b26d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* emacs-lisp/gv.el (gv-define-simple-setter): Fix last change
+	(bug#12812).
+
 2012-11-07  Chong Yidong  <cyd@gnu.org>
 
 	* minibuf-eldef.el (minibuffer-eldef-shorten-default): Convert to
diff --git a/lisp/emacs-lisp/gv.el b/lisp/emacs-lisp/gv.el
index 145c48c670e..38bb6319a03 100644
--- a/lisp/emacs-lisp/gv.el
+++ b/lisp/emacs-lisp/gv.el
@@ -220,7 +220,8 @@ so as to preserve the semantics of `setf'."
   `(gv-define-setter ,name (val &rest args)
      ,(if fix-return
           `(macroexp-let2 nil v val
-             (cons ',setter (append args (list v))))
+             (cons ',setter (append args (list v)))
+             v)
         `(cons ',setter (append args (list val))))))
 
 ;;; Typical operations on generalized variables.