mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-07-16 18:16:27 +00:00
Trying to resolve conflict while understanding very little about git
This commit is contained in:
Dan Davison
commit
8deae3517b
93
lisp/org-babel-comint.el
Normal file
93
lisp/org-babel-comint.el
Normal file
|
|
@ -0,0 +1,93 @@
|
|||
;;; org-babel-comint.el --- org-babel functions for interaction with comint buffers
|
||||
|
||||
;; Copyright (C) 2009 Eric Schulte
|
||||
|
||||
;; Author: Eric Schulte
|
||||
;; Keywords: literate programming, reproducible research, comint
|
||||
;; Homepage: http://orgmode.org
|
||||
;; Version: 0.01
|
||||
|
||||
;;; License:
|
||||
|
||||
;; This program is free software; you can redistribute it and/or modify
|
||||
;; it under the terms of the GNU General Public License as published by
|
||||
;; the Free Software Foundation; either version 3, or (at your option)
|
||||
;; any later version.
|
||||
;;
|
||||
;; This program is distributed in the hope that it will be useful,
|
||||
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
;; GNU General Public License for more details.
|
||||
;;
|
||||
;; You should have received a copy of the GNU General Public License
|
||||
;; along with GNU Emacs; see the file COPYING. If not, write to the
|
||||
;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
||||
;; Boston, MA 02110-1301, USA.
|
||||
|
||||
;;; Commentary:
|
||||
|
||||
;; This file should provide support for passing commands and results
|
||||
;; to and from `comint-mode' buffers.
|
||||
|
||||
;;; Code:
|
||||
(require 'org-babel)
|
||||
|
||||
(defun org-babel-comint-initiate-buffer (buffer ignite)
|
||||
"If BUFFER does not currently have a process use IGNITE to
|
||||
create one."
|
||||
(unless (and (buffer-live-p buffer) (get-buffer buffer))
|
||||
(save-excursion
|
||||
(eval ignite)
|
||||
(setf buffer (current-buffer))
|
||||
(org-babel-comint-wait-for-output)
|
||||
(org-babel-comint-input-command ""))))
|
||||
|
||||
(defun org-babel-comint-command-to-string (buffer command)
|
||||
"Send COMMEND to BUFFER's process, and return the results as a string."
|
||||
(org-babel-comint-input-command buffer command)
|
||||
(org-babel-comint-last-output buffer))
|
||||
|
||||
(defun org-babel-comint-input-command (buffer command)
|
||||
"Pass COMMAND to the process running in BUFFER."
|
||||
(save-excursion
|
||||
(save-match-data
|
||||
(set-buffer buffer)
|
||||
(goto-char (process-mark (get-buffer-process (current-buffer))))
|
||||
(insert command)
|
||||
(comint-send-input)
|
||||
(org-babel-comint-wait-for-output))))
|
||||
|
||||
(defun org-babel-comint-wait-for-output (buffer)
|
||||
"Wait until output arrives"
|
||||
(save-excursion
|
||||
(save-match-data
|
||||
(set-buffer buffer)
|
||||
(while (progn
|
||||
(goto-char comint-last-input-end)
|
||||
(not (re-search-forward comint-prompt-regexp nil t)))
|
||||
(accept-process-output (get-buffer-process (current-buffer)))))))
|
||||
|
||||
(defun org-babel-comint-last-output (buffer)
|
||||
"Return BUFFER's the last output as a string"
|
||||
(save-excursion
|
||||
(save-match-data
|
||||
(set-buffer buffer)
|
||||
(goto-char (process-mark (get-buffer-process (current-buffer))))
|
||||
(forward-line 0)
|
||||
(let ((raw (buffer-substring comint-last-input-end (- (point) 1)))
|
||||
output output-flag)
|
||||
(mapconcat
|
||||
(lambda (el)
|
||||
(if (stringp el)
|
||||
(format "%s" el)
|
||||
(format "%S" el)))
|
||||
(delq nil
|
||||
(mapcar
|
||||
(lambda (line)
|
||||
(unless (string-match "^>" line)
|
||||
(and (string-match "\\[[[:digit:]]+\\] *\\(.*\\)$" line)
|
||||
(match-string 1 line))))
|
||||
;; drop first, because it's the last line of input
|
||||
(cdr (split-string raw "[\n\r]")))) "\n")))))
|
||||
|
||||
;;; org-babel-comint.el ends here
|
||||
|
|
@ -34,7 +34,6 @@
|
|||
(load "htmlize.el") ;; other versions of htmlize can cause export problems
|
||||
(require 'org-babel)
|
||||
(require 'org-babel-ref)
|
||||
(require 'org-babel-ui)
|
||||
(require 'org-babel-exp)
|
||||
(require 'org-babel-table)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,69 +0,0 @@
|
|||
;;; org-babel-ui.el --- UI elements for org-babel
|
||||
|
||||
;; Copyright (C) 2009 Eric Schulte, Dan Davison, Austin F. Frank
|
||||
|
||||
;; Author: Eric Schulte, Dan Davison, Austin F. Frank
|
||||
;; Keywords: literate programming, reproducible research
|
||||
;; Homepage: http://orgmode.org
|
||||
;; Version: 0.01
|
||||
|
||||
;;; License:
|
||||
|
||||
;; This program is free software; you can redistribute it and/or modify
|
||||
;; it under the terms of the GNU General Public License as published by
|
||||
;; the Free Software Foundation; either version 3, or (at your option)
|
||||
;; any later version.
|
||||
;;
|
||||
;; This program is distributed in the hope that it will be useful,
|
||||
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
;; GNU General Public License for more details.
|
||||
;;
|
||||
;; You should have received a copy of the GNU General Public License
|
||||
;; along with GNU Emacs; see the file COPYING. If not, write to the
|
||||
;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
||||
;; Boston, MA 02110-1301, USA.
|
||||
|
||||
;;; Commentary:
|
||||
|
||||
;; UI elements of org-babel
|
||||
;; - code folding
|
||||
;; - marking working code blocks
|
||||
|
||||
;;; Code:
|
||||
(require 'org-babel)
|
||||
|
||||
(defun org-babel-ui-src-block-cycle-maybe ()
|
||||
"Detect if this is context for a org-babel src-block and if so
|
||||
then run `org-babel-execute-src-block'."
|
||||
(let ((case-fold-search t))
|
||||
(if (save-excursion
|
||||
(beginning-of-line 1)
|
||||
(looking-at org-babel-src-block-regexp))
|
||||
(progn (call-interactively 'org-babel-ui-src-block-cycle)
|
||||
t) ;; to signal that we took action
|
||||
nil))) ;; to signal that we did not
|
||||
|
||||
(defun org-babel-ui-src-block-cycle ()
|
||||
"Cycle the visibility of the current source code block"
|
||||
(interactive)
|
||||
;; should really do this once in an (org-mode hook)
|
||||
(add-to-invisibility-spec '(org-babel-ui . t))
|
||||
(message "trying out source block")
|
||||
(save-excursion
|
||||
(beginning-of-line)
|
||||
(if (re-search-forward org-babel-src-block-regexp nil t)
|
||||
(let ((start (- (match-beginning 4) 1)) ;; beginning of body
|
||||
(end (match-end 0))) ;; end of entire body
|
||||
(if (memq t (mapcar (lambda (overlay)
|
||||
(eq (overlay-get overlay 'invisible) 'org-babel-ui))
|
||||
(overlays-at start)))
|
||||
(remove-overlays start end 'invisible 'org-babel-ui)
|
||||
(overlay-put (make-overlay start end) 'invisible 'org-babel-ui)))
|
||||
(error "not looking at a source block"))))
|
||||
|
||||
;; org-tab-after-check-for-cycling-hook
|
||||
(add-hook 'org-tab-first-hook 'org-babel-ui-src-block-cycle-maybe)
|
||||
|
||||
(provide 'org-babel-ui)
|
||||
;;; org-babel-ui ends here
|
||||
|
|
@ -229,9 +229,6 @@ tabel
|
|||
|
||||
Another example is in the [[*operations%20in%20on%20tables][grades example]].
|
||||
|
||||
** PROPOSED conversion between org-babel and noweb (e.g. .Rnw) format
|
||||
I haven't thought about this properly. Just noting it down. What
|
||||
Sweave uses is called "R noweb" (.Rnw).
|
||||
** PROPOSED pass multiple reference arguments into R
|
||||
Can we do this? I wasn't sure how to supply multiple 'var' header
|
||||
args. Just delete this if I'm being dense.
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#name : #+begin_src...#+end_src
|
||||
# --
|
||||
#+srcname: ${1:name}
|
||||
${1:$(if (> (length text) 1) "#+srcname:" "")} ${1: }
|
||||
#+begin_src ${2:language} $3
|
||||
$0
|
||||
#+end_src
|
||||
|
|
|
|||
Loading…
Reference in a new issue