diff options
Diffstat (limited to 'lisp/org/org-src.el')
| -rw-r--r-- | lisp/org/org-src.el | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/lisp/org/org-src.el b/lisp/org/org-src.el index dd56b120219..5de55fa455f 100644 --- a/lisp/org/org-src.el +++ b/lisp/org/org-src.el @@ -42,8 +42,6 @@ (declare-function org-at-table.el-p "org" ()) (declare-function org-get-indentation "org" (&optional line)) (declare-function org-switch-to-buffer-other-window "org" (&rest args)) -(declare-function org-pop-to-buffer-same-window - "org-compat" (&optional buffer-or-name norecord label)) (defcustom org-edit-src-region-extra nil "Additional regexps to identify regions for editing with `org-edit-src-code'. @@ -341,7 +339,7 @@ buffer." (defun org-src-switch-to-buffer (buffer context) (case org-src-window-setup ('current-window - (org-pop-to-buffer-same-window buffer)) + (switch-to-buffer buffer)) ('other-window (switch-to-buffer-other-window buffer)) ('other-frame @@ -352,7 +350,7 @@ buffer." (delete-frame frame))) ('save (kill-buffer (current-buffer)) - (org-pop-to-buffer-same-window buffer)) + (switch-to-buffer buffer)) (t (switch-to-buffer-other-frame buffer)))) ('reorganize-frame @@ -364,7 +362,7 @@ buffer." (t (message "Invalid value %s for org-src-window-setup" (symbol-name org-src-window-setup)) - (org-pop-to-buffer-same-window buffer)))) + (switch-to-buffer buffer)))) (defun org-src-construct-edit-buffer-name (org-buffer-name lang) "Construct the buffer name for a source editing buffer." @@ -424,7 +422,7 @@ the fragment in the Org-mode buffer." begline (save-excursion (goto-char beg) (org-current-line))) (if (and (setq buffer (org-edit-src-find-buffer beg end)) (y-or-n-p "Return to existing edit buffer? [n] will revert changes: ")) - (org-pop-to-buffer-same-window buffer) + (switch-to-buffer buffer) (when buffer (with-current-buffer buffer (if (boundp 'org-edit-src-overlay) @@ -444,7 +442,7 @@ the fragment in the Org-mode buffer." (define-key map [mouse-1] 'org-edit-src-continue) map)) (overlay-put ovl :read-only "Leave me alone") - (org-pop-to-buffer-same-window buffer) + (switch-to-buffer buffer) (insert code) (remove-text-properties (point-min) (point-max) '(display nil invisible nil intangible nil)) |