Changeset 15251


Ignore:
Timestamp:
Mar 13, 2012, 4:32:46 PM (7 years ago)
Author:
rme
Message:

Merge fix for broken &whole in define-method-combination
to 1.7 branch also. See ticket:913.

Location:
release/1.7/source
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • release/1.7/source

  • release/1.7/source/level-0/l0-cfm-support.lisp

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • release/1.7/source/lib/method-combination.lisp

    r14578 r15251  
    505505             (&whole
    506506              (names arg)
    507               (vals `,args-form)
     507              (vals (list 'quote `,args-form))
    508508              (setq state :required))
    509509             (&optional
     
    523523                  (names spvar)
    524524                  (vals (list 'quote
    525                          `(nth-opt-gf-arg-present-p ,gf-form ,args-form ,opt-idx))))
     525                              `(nth-opt-gf-arg-present-p ,gf-form ,args-form ,opt-idx))))
    526526                (incf opt-idx)))
    527527             (&rest
Note: See TracChangeset for help on using the changeset viewer.