1. Humor (as a feeling)
* Humour (British spelling)
* Humor (American spelling)
This refers to the quality of being funny or amusing.
Example:
"The comedian's performance was full of humor."
2. Act of indulging someone
* Humoring
This refers to the act of indulging someone's wishes or whims, even if you don't agree with them.
Example:
"I'm just humoring her when I pretend to like her new hairstyle."
3. Act of making someone laugh
* Humoring
This refers to the act of trying to make someone laugh or feel better.
Example:
"He tried to humor the crying child with silly jokes."
So, the correct noun depends on what you want to convey.