Thanks, the fixed patch is below. Another minor change to the last patch is settign project-switch-use-entire-map to nil, so that by default not all keys in project-prefix-map are usable, as to avoid the potential for confusion mentioned before. -- Philip K.