Don't alter the underline face. (font-lock-hack-keywords, font-lock-fontify-region): Don't call set-buffer-modified-p if no change in its value. (font-lock-hack-keywords): Avoid changing the narrowing. (c-font-lock-keywords-2): Insist on whitespace before a label.