sync with org-mode changes