* keyboard.c (read_char): If we're returning an event from a

* keyboard.c (read_char): If we're returning an event from a
	macro, set Vlast_event_frame to Qmacro, instead of leaving it set
	to the frame of the previous real event.
	(read_key_sequence): If Vlast_event_frame isn't a frame, don't
	bother switching buffers.
	(syms_of_keyboard): Doc fix for Vlast_event_frame.
	(Vlast_event_frame): Doc fix.

	* keyboard.c (format_modifiers, reorder_modifiers): Handle the new
	modifier bits.