From f7e286ab964a16dc30214a5d77602d77d4cdeeeb Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Wed, 25 Nov 2020 21:35:01 +0200 Subject: [PATCH 1/2] ob-ruby.el: Don't reuse the same buffer among different named sessions * lisp/ob-ruby.el (org-babel-ruby-initiate-session): Instead of run-ruby that always insists on using the existing buffer, use run-ruby-or-pop-to-buffer that allows using the buffer with the same name as :session header arg. Use the existing buffer returned by inf-ruby-buffer only when :session header arg is nil. https://github.com/nonsequitur/inf-ruby/issues/121 --- lisp/ob-ruby.el | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lisp/ob-ruby.el b/lisp/ob-ruby.el index 5ad006429..5ed29f889 100644 --- a/lisp/ob-ruby.el +++ b/lisp/ob-ruby.el @@ -39,7 +39,8 @@ (require 'ob) (require 'org-macs) -(declare-function run-ruby "ext:inf-ruby" (&optional command name)) +(declare-function run-ruby-or-pop-to-buffer "ext:inf-ruby" (command &optional name buffer)) +(declare-function inf-ruby-buffer "ext:inf-ruby" ()) (declare-function xmp "ext:rcodetools" (&optional option)) (defvar inf-ruby-default-implementation) @@ -163,7 +164,10 @@ then create one. Return the initialized session." inf-ruby-implementations)))) (buffer (get-buffer (format "*%s*" session))) (session-buffer (or buffer (save-window-excursion - (run-ruby cmd session) + (run-ruby-or-pop-to-buffer + cmd (or session "ruby") + (unless session + (inf-ruby-buffer))) (current-buffer))))) (if (org-babel-comint-buffer-livep session-buffer) (progn (sit-for .25) session-buffer) From c974467fe543466c37b5100005b170059ca508b3 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Sat, 28 Nov 2020 17:21:14 -0500 Subject: [PATCH 2/2] org-goto: Explicitly load org.el and org-refile.el MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * lisp/org-goto.el: Require org.el and org-refile.el. org-goto.el depends on org.el and org-refile.el being loaded, and the autoloaded org-goto command may be called before org.el and org-refile.el are loaded (and an org-refile.el load won't be triggered just by visiting an Org file). Reported-by: Omar Antolín Camarena Ref: https://orgmode.org/list/87h7pil2v5.fsf@matem.unam.mx --- lisp/org-goto.el | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/lisp/org-goto.el b/lisp/org-goto.el index 56786696e..93e6f940c 100644 --- a/lisp/org-goto.el +++ b/lisp/org-goto.el @@ -22,27 +22,8 @@ ;;; Code: -(require 'org-macs) -(require 'org-compat) - -(declare-function org-at-heading-p "org" (&optional ignored)) -(declare-function org-beginning-of-line "org" (&optional n)) -(declare-function org-defkey "org" (keymap key def)) -(declare-function org-mark-ring-push "org" (&optional pos buffer)) -(declare-function org-overview "org" ()) -(declare-function org-refile-check-position "org" (refile-pointer)) -(declare-function org-refile-get-location "org" (&optional prompt default-buffer new-nodes)) -(declare-function org-show-context "org" (&optional key)) -(declare-function org-show-set-visibility "org" (detail)) - -(defvar org-complex-heading-regexp) -(defvar org-startup-align-all-tables) -(defvar org-startup-folded) -(defvar org-startup-truncated) -(defvar org-special-ctrl-a/e) -(defvar org-refile-target-verify-function) -(defvar org-refile-use-outline-path) -(defvar org-refile-targets) +(require 'org) +(require 'org-refile) (defvar org-goto-exit-command nil) (defvar org-goto-map nil)