Um... I beg to differ. Originally, a martyr was someone who would rather die than renounce their religion. However, it hasn't had only that meaning for quite some time now. Now the term means someone who has died (or is willing to die) for any cause they believe in. Or, it can even mean generically to suffer from something.

The meaning is neither metaphoric nor vernacular.

I believe the original assessment is correct.