Hi, I assume this change was required due to changes in Emacs24, but I had to remove an argument to pop-to-buffer-same-window in org-pop-to-buffer-same-window to fix editing of source code snippets. The patch is attached, although I'm not sure if it would break this function for all other versions of Emacs. Best -- Eric