summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2012-11-07 20:24:14 -0500
committerStefan Monnier <monnier@iro.umontreal.ca>2012-11-07 20:24:14 -0500
commit41626722272734aa3a7e4fdfafd3b085133db665 (patch)
tree74166b5a62f424e78aabec4ac17f932b77da3b76
parent2b4da3ff4a742a51c036c5186b00ed51f0abe7dd (diff)
downloademacs-41626722272734aa3a7e4fdfafd3b085133db665.tar.gz
* lisp/emacs-lisp/gv.el (gv-define-simple-setter): Fix last change.
Fixes: debbugs:12812
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/emacs-lisp/gv.el3
2 files changed, 7 insertions, 1 deletions
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.