[Emacs-diffs] /srv/bzr/emacs/trunk r110832: * lisp/emacs-lisp/gv.el (gv-deref): Move setter declaration, to fix bootstrap.

[Stefan Monnier]

------------------------------------------------------------
revno: 110832
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Thu 2012-11-08 09:54:03 -0500
message:
  * lisp/emacs-lisp/gv.el (gv-deref): Move setter declaration, to fix bootstrap.
modified:
  lisp/emacs-lisp/gv.el

=== modified file 'lisp/emacs-lisp/gv.el'
--- a/lisp/emacs-lisp/gv.el     2012-11-08 14:21:21 +0000
+++ b/lisp/emacs-lisp/gv.el     2012-11-08 14:54:03 +0000
@@ -447,8 +447,11 @@
   "Dereference REF, returning the referenced value.
 This is like the `*' operator of the C language.
 REF must have been previously obtained with `gv-ref'."
-  (declare (gv-setter (lambda (v) `(funcall (cdr ,ref) ,v))))
   (funcall (car ref)))
+;; Don't use `declare' because it seems to introduce circularity problems:
+;; Warning: Eager macro-expansion skipped due to cycle:
+;;  … => (load "gv.el") => (macroexpand-all (defsubst gv-deref …)) => 
(macroexpand (defun …)) => (load "gv.el")
+(gv-define-setter gv-deref (v ref) `(funcall (cdr ,ref) ,v))
 
 ;;; Vaguely related definitions that should be moved elsewhere.