Oh, 2e actually had Warlocks. They were called Shamans back then, but the idea of mortals getting their spells from powerful entities that weren't gods goes back to 1e at least. In my campaign, paladins are paladins in the classic sense, but I did allow "Champions of [portfolio]" which one of my players found in a 3e/d20 book. They are rather rare, but could be like the hero of a small local area, champion of a faith, or crusaders trying to bring their civilisation over a wilderness area or wipe it from it. The powers differ from portfolio to portfolio.
