1. xemacs
  2. xemacs-base


sperber-guest  committed 10eb34c

Apply Stephen's bugfix to my advice.el changes.

  • Participants
  • Parent commits cb1b4a3
  • Branches default

Comments (0)

Files changed (2)

File ChangeLog

View file
  • Ignore whitespace
+2010-07-21  Aidan Kehoe  <kehoea@parhasard.net>
+	* advice.el (ad-set-arguments):
+	* advice.el (ad-assemble-advised-definition):
+	Correct the order of arguments to #'nsubst; thank you Katsumi
+	Yamaoka for the bug report and testing, and Stephen Turbull for
+	the fix.
 2010-07-05  Norbert Koch  <viteno@xemacs.org>
 	* Makefile (VERSION): XEmacs package 2.26 released.

File advice.el

View file
  • Ignore whitespace
 	       index arglist)
       (if (= (length set-forms) 1)
 	  ;; For exactly one set-form we can use values-form directly,...
-          (nsubst 'ad-vAlUeS values-form (car set-forms))
+          (nsubst 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 'ad-do-it around-form 
+            (nsubst around-form 'ad-do-it
                      (ad-body-forms (ad-advice-definition advice))))))
     (setq after-forms