[COMMIT] mmm-mode changes