(c-postprocess-file-styles): If a file style or file offsets are set,

(c-postprocess-file-styles): If a file style or file offsets are set,
make the variables local to the buffer (via make-local-variable).

(c-java-method-key): Variable deleted.

(c-C-extra-toplevel-key)
(c-C++-extra-toplevel-key, c-extra-toplevel-key): New variables
which parameterize the search for additional top-level enclosing
constructs.

(c-mode-base-map): c-mark-function moved back to M-C-h.