* lisp/emacs-lisp/gv.el (gv-define-simple-setter): One more fix.

Fixes: debbugs:12871

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a927c01072487f22d61c2aba327d0555e8cc3713..2ad7230e9123a99c76792da6cc89dcd5a1182cf6 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * emacs-lisp/gv.el (gv-define-simple-setter): One more fix (bug#12871).
+
 2012-11-12  Wolfgang Jenkner  <wjenkner@inode.at>
 
        * ansi-color.el (ansi-color-apply-sequence): Implement SGR codes
@@ -13,7 +17,7 @@
        correctly.
        (python-nav-end-of-defun): Rename from
        python-end-of-defun-function.  Ensure forward movement.
-       (python-info-current-defun): Reimplemented to work as intended
+       (python-info-current-defun): Reimplement to work as intended
        with new fixed python-nav-{end,beginning}-of-defun.  Stop scanning
        parent defuns as soon as possible.
 
@@ -62,7 +66,7 @@
 
 2012-11-09  Jan Djärv  <jan.h.d@swipnet.se>
 
-       * server.el (server-create-window-system-frame): Improved comment.
+       * server.el (server-create-window-system-frame): Improve comment.
 
 2012-11-08  Jan Djärv  <jan.h.d@swipnet.se>
 

diff --git a/lisp/emacs-lisp/gv.el b/lisp/emacs-lisp/gv.el
index 38bb6319a038eb5861bc6d45a2e29922c78244f9..965fc1c3ef02d21ab8a531ebdbc3d658e7cf9536 100644 (file)
--- a/lisp/emacs-lisp/gv.el
+++ b/lisp/emacs-lisp/gv.el
@@ -220,8 +220,9 @@ 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)))
-             v)
+             `(progn
+                (,',setter ,@(append args (list v)))
+                ,v))
         `(cons ',setter (append args (list val))))))
 
 ;;; Typical operations on generalized variables.