emacs: started upgrading type enclosing to new protocol