Fix bug #17615 with C-g during macro definition.