Commits

Aidan Kehoe committed dd26f4d

advice.el: #'subst, not #'nsubst, advice constructed by macro can share structure

ChangeLog addition:

2011-12-30 Aidan Kehoe <kehoea@parhasard.net>

* advice.el (ad-set-arguments):
* advice.el (ad-assemble-advised-definition):
Use #'subst, not #'nsubst; advice constructed by macros may have
shared structure, and any in-place modification will break this.

  • Participants
  • Parent commits 0513a82

Comments (0)

Files changed (2)

+2011-12-30  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* advice.el (ad-set-arguments):
+	* advice.el (ad-assemble-advised-definition):
+	Use #'subst, not #'nsubst; advice constructed by macros may have
+	shared structure, and any in-place modification will break this.
+
 2011-01-10  Norbert Koch  <viteno@xemacs.org>
 
 	* Makefile (VERSION): XEmacs package 2.30 released.
 	       index arglist)
       (if (= (length set-forms) 1)
 	  ;; For exactly one set-form we can use values-form directly,...
-          (nsubst values-form 'ad-vAlUeS (car set-forms))
+          (subst values-form 'ad-vAlUeS (car set-forms))
 	;; ...if we have more we have to bind it to a variable:
 	(` (let ((ad-vAlUeS (, values-form)))
 	     (,@ (reverse set-forms))
       (if (ad-advice-protected advice)
 	  (setq around-form-protected t))
       (setq around-form
-            (nsubst around-form 'ad-do-it
-                    (ad-prognify
-                     (ad-body-forms (ad-advice-definition advice))))))
+            (subst around-form 'ad-do-it
+                   (ad-prognify
+                    (ad-body-forms (ad-advice-definition advice))))))
     (setq after-forms
 	  (if (and around-form-protected before-forms)
 	      (` ((unwind-protect