(turn-on-font-lock-if-enabled): Don't use it. (font-lock-symbol-category-alist): Delete. (font-lock-default-function): Use new `char-property-alias-alist' to make `font-lock-face' an alias for `face' when font-lock mode is enabled.
(font-lock-default-function): New function, created from `font-lock-mode'. (font-lock-mode): Just funcall `font-lock-default-function'.