Thanks!
The raise was actually half-merit increase and half-market adjustment. My boss would still like me to be making more, though (he actually recommended a higher merit increase, but there was some across-the-board adjustment, which is slightly irritating because right now my salary is $XX,900, and would it be too much to ask for $100 more just to give three zeroes at the end for convenience?).
I feel like I could at least satisfy one of my parents' requests and buy a better car.