humor vs fun

humor and fun both are nouns.

Word	Noun	Adjective	Verb	Adverb
humor	Yes	No	Yes	No
fun	Yes	No	No	No

As nouns, fun is a hypernym of humor; that is, fun is a word with a broader meaning than humor:

Other hypernyms of humor include playfulness.

As nouns, fun is a hyponym of humor; that is, fun is a word with a more specific, narrower meaning than humor:

humor: a message whose ingenuity or verbal skill or incongruity has the power to evoke laughter
fun: verbal wit or mockery (often at another's expense but not to be taken seriously)

humor (noun)	fun (noun)
the quality of being funny	activities that are enjoyable or amusing
the trait of appreciating (and being able to express) the humorous	violent and excited activity
the liquid parts of the body	a disposition to find (or make) causes for amusement
(Middle Ages) one of the four fluids in the body whose balance was believed to determine your emotional and physical state	verbal wit or mockery (often at another's expense but not to be taken seriously)
a message whose ingenuity or verbal skill or incongruity has the power to evoke laughter
a characteristic (habitual or relatively temporary) state of feeling

humor (verb)	fun (verb)
put into a good mood