Supernovae are classified as type I and type II and further subdivided into Ia, Ib, Ic, II-P, II-L, and IIb. The origin of this observational diversity has not been well understood. The recent nearby supernovae SN 1993J and SN 1994I have provided particularly useful material to clarify the supernova — progenitor connection. For a progenitor of type IIb supernova 1993J, we propose that merging of two stars in a close binary is responsible for the formation of a thin H-rich envelope. As a progenitor of type Ic supernova 1994I, we propose a bare C+O star that has lost both its H and He envelope after a common-envelope phase. By generalizing these scenarios, we show that common-envelope evolution in massive close binary stars leads to various degrees of stripping off of the envelope of a massive star. This naturally leads to an explanation of the origin of type II-L, IIn, IIb, Ib, and Ic in a unified manner. The binary hypothesis to explain the diversity of supernovae can be substantiated with new information on SN IIb 1993J and SN Ic 1994I. Model light curves are compared with observations. Since extensive mass loss is essential for the binary scenario, circumstellar interactions are examined for comparison with X-ray observations.