Merge branch 'maint'
This commit is contained in:
commit
d1c7cd3ca4
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue