* font-lock.el (c++-font-lock-keywords-3): Use c-at-toplevel-p to distinguish correctly an object declared via a constructor from a method. (font-lock-defaults-alist): Don't give `.' word syntax for Java. (java-font-lock-keywords-1): Fontify package names individually. (java-font-lock-extra-types): Ensure regexp matches capitalised types only. (java-font-lock-keywords-2): Simplify type fontification. (java-font-lock-keywords-3): Likewise.