2015-10-25 20:56:00 -04:00
|
|
|
|
;;; org-src.el --- Source code examples in Org -*- lexical-binding: t; -*-
|
2009-06-07 10:27:07 -04:00
|
|
|
|
;;
|
2018-01-07 00:27:54 -05:00
|
|
|
|
;; Copyright (C) 2004-2018 Free Software Foundation, Inc.
|
2009-06-07 10:27:07 -04:00
|
|
|
|
;;
|
|
|
|
|
;; Author: Carsten Dominik <carsten at orgmode dot org>
|
2013-10-08 02:07:21 -04:00
|
|
|
|
;; Bastien Guerry <bzg@gnu.org>
|
2009-10-27 14:11:09 -04:00
|
|
|
|
;; Dan Davison <davison at stats dot ox dot ac dot uk>
|
2009-06-07 10:27:07 -04:00
|
|
|
|
;; Keywords: outlines, hypermedia, calendar, wp
|
2018-01-16 11:22:00 -05:00
|
|
|
|
;; Homepage: https://orgmode.org
|
2009-06-07 10:27:07 -04:00
|
|
|
|
;;
|
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
;;
|
|
|
|
|
;; GNU Emacs 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 of the License, or
|
|
|
|
|
;; (at your option) any later version.
|
|
|
|
|
|
|
|
|
|
;; GNU Emacs 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
|
2017-09-13 18:52:52 -04:00
|
|
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
2009-06-07 10:27:07 -04:00
|
|
|
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
|
|
|
;;
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
|
2016-07-25 10:01:15 -04:00
|
|
|
|
;; This file contains the code dealing with source code examples in
|
|
|
|
|
;; Org mode.
|
2009-06-07 10:27:07 -04:00
|
|
|
|
|
|
|
|
|
;;; Code:
|
|
|
|
|
|
2016-07-25 10:01:15 -04:00
|
|
|
|
(require 'cl-lib)
|
2009-06-07 10:27:07 -04:00
|
|
|
|
(require 'org-macs)
|
|
|
|
|
(require 'org-compat)
|
2010-08-17 17:45:47 -04:00
|
|
|
|
(require 'ob-keys)
|
2010-08-17 22:37:19 -04:00
|
|
|
|
(require 'ob-comint)
|
2009-06-07 10:27:07 -04:00
|
|
|
|
|
2015-05-30 08:28:35 -04:00
|
|
|
|
(declare-function org-base-buffer "org" (buffer))
|
2009-06-07 11:07:07 -04:00
|
|
|
|
(declare-function org-do-remove-indentation "org" (&optional n))
|
2015-05-30 08:28:35 -04:00
|
|
|
|
(declare-function org-element-at-point "org-element" ())
|
2016-10-25 07:23:31 -04:00
|
|
|
|
(declare-function org-element-class "org-element" (datum &optional parent))
|
2015-05-30 08:28:35 -04:00
|
|
|
|
(declare-function org-element-context "org-element" (&optional element))
|
|
|
|
|
(declare-function org-element-lineage "org-element"
|
|
|
|
|
(blob &optional types with-self))
|
|
|
|
|
(declare-function org-element-property "org-element" (property element))
|
|
|
|
|
(declare-function org-element-type "org-element" (element))
|
|
|
|
|
(declare-function org-footnote-goto-definition "org-footnote"
|
|
|
|
|
(label &optional location))
|
2009-06-11 16:18:47 -04:00
|
|
|
|
(declare-function org-get-indentation "org" (&optional line))
|
2009-10-29 11:34:33 -04:00
|
|
|
|
(declare-function org-switch-to-buffer-other-window "org" (&rest args))
|
2016-06-21 09:24:06 -04:00
|
|
|
|
(declare-function org-trim "org" (s &optional keep-lead))
|
2015-05-30 08:28:35 -04:00
|
|
|
|
|
2015-10-26 04:29:13 -04:00
|
|
|
|
(defvar org-inhibit-startup)
|
2009-06-07 11:07:07 -04:00
|
|
|
|
|
2013-04-16 04:38:01 -04:00
|
|
|
|
(defcustom org-edit-src-turn-on-auto-save nil
|
|
|
|
|
"Non-nil means turn `auto-save-mode' on when editing a source block.
|
|
|
|
|
This will save the content of the source code editing buffer into
|
|
|
|
|
a newly created file, not the base buffer for this source block.
|
|
|
|
|
|
2013-11-17 03:12:41 -05:00
|
|
|
|
If you want to regularly save the base buffer instead of the source
|
2013-04-16 04:38:01 -04:00
|
|
|
|
code editing buffer, see `org-edit-src-auto-save-idle-delay' instead."
|
|
|
|
|
:group 'org-edit-structure
|
|
|
|
|
:version "24.4"
|
|
|
|
|
:package-version '(Org . "8.0")
|
|
|
|
|
:type 'boolean)
|
|
|
|
|
|
2013-03-02 09:04:43 -05:00
|
|
|
|
(defcustom org-edit-src-auto-save-idle-delay 0
|
2013-04-16 04:38:01 -04:00
|
|
|
|
"Delay before saving a source code buffer back into its base buffer.
|
2013-02-16 05:35:39 -05:00
|
|
|
|
When a positive integer N, save after N seconds of idle time.
|
2013-04-16 04:38:01 -04:00
|
|
|
|
When 0 (the default), don't auto-save.
|
|
|
|
|
|
|
|
|
|
If you want to save the source code buffer itself, don't use this.
|
|
|
|
|
Check `org-edit-src-turn-on-auto-save' instead."
|
2013-02-16 05:35:39 -05:00
|
|
|
|
:group 'org-edit-structure
|
2013-02-26 12:21:28 -05:00
|
|
|
|
:version "24.4"
|
|
|
|
|
:package-version '(Org . "8.0")
|
2013-02-16 05:35:39 -05:00
|
|
|
|
:type 'integer)
|
|
|
|
|
|
2009-06-07 10:27:07 -04:00
|
|
|
|
(defcustom org-coderef-label-format "(ref:%s)"
|
|
|
|
|
"The default coderef format.
|
|
|
|
|
This format string will be used to search for coderef labels in literal
|
2009-07-23 15:48:43 -04:00
|
|
|
|
examples (EXAMPLE and SRC blocks). The format can be overwritten in
|
2010-04-30 22:53:53 -04:00
|
|
|
|
an individual literal example with the -l option, like
|
2009-06-07 10:27:07 -04:00
|
|
|
|
|
|
|
|
|
#+BEGIN_SRC pascal +n -r -l \"((%s))\"
|
|
|
|
|
...
|
|
|
|
|
#+END_SRC
|
|
|
|
|
|
|
|
|
|
If you want to use this for HTML export, make sure that the format does
|
|
|
|
|
not introduce special font-locking, and avoid the HTML special
|
|
|
|
|
characters `<', `>', and `&'. The reason for this restriction is that
|
|
|
|
|
the labels are searched for only after htmlize has done its job."
|
|
|
|
|
:group 'org-edit-structure ; FIXME this is not in the right group
|
|
|
|
|
:type 'string)
|
|
|
|
|
|
|
|
|
|
(defcustom org-edit-fixed-width-region-mode 'artist-mode
|
|
|
|
|
"The mode that should be used to edit fixed-width regions.
|
|
|
|
|
These are the regions where each line starts with a colon."
|
|
|
|
|
:group 'org-edit-structure
|
|
|
|
|
:type '(choice
|
|
|
|
|
(const artist-mode)
|
|
|
|
|
(const picture-mode)
|
|
|
|
|
(const fundamental-mode)
|
|
|
|
|
(function :tag "Other (specify)")))
|
|
|
|
|
|
2009-10-07 23:49:37 -04:00
|
|
|
|
(defcustom org-src-preserve-indentation nil
|
2010-07-17 14:53:36 -04:00
|
|
|
|
"If non-nil preserve leading whitespace characters on export.
|
2016-10-15 11:36:47 -04:00
|
|
|
|
\\<org-mode-map>
|
2010-07-17 14:53:36 -04:00
|
|
|
|
If non-nil leading whitespace characters in source code blocks
|
|
|
|
|
are preserved on export, and when switching between the org
|
2014-03-15 02:42:19 -04:00
|
|
|
|
buffer and the language mode edit buffer.
|
|
|
|
|
|
2016-10-15 11:36:47 -04:00
|
|
|
|
When this variable is nil, after editing with `\\[org-edit-src-code]',
|
2014-03-15 02:42:19 -04:00
|
|
|
|
the minimum (across-lines) number of leading whitespace characters
|
|
|
|
|
are removed from all lines, and the code block is uniformly indented
|
|
|
|
|
according to the value of `org-edit-src-content-indentation'."
|
2009-10-07 23:49:37 -04:00
|
|
|
|
:group 'org-edit-structure
|
|
|
|
|
:type 'boolean)
|
|
|
|
|
|
2009-06-08 03:39:19 -04:00
|
|
|
|
(defcustom org-edit-src-content-indentation 2
|
2009-10-07 23:56:37 -04:00
|
|
|
|
"Indentation for the content of a source code block.
|
2016-10-15 11:36:47 -04:00
|
|
|
|
|
2009-06-08 03:39:19 -04:00
|
|
|
|
This should be the number of spaces added to the indentation of the #+begin
|
|
|
|
|
line in order to compute the indentation of the block content after
|
2016-10-15 11:36:47 -04:00
|
|
|
|
editing it with `\\[org-edit-src-code]'.
|
|
|
|
|
|
|
|
|
|
It has no effect if `org-src-preserve-indentation' is non-nil."
|
2009-06-08 03:39:19 -04:00
|
|
|
|
:group 'org-edit-structure
|
|
|
|
|
:type 'integer)
|
|
|
|
|
|
2009-06-07 10:27:07 -04:00
|
|
|
|
(defcustom org-edit-src-persistent-message t
|
|
|
|
|
"Non-nil means show persistent exit help message while editing src examples.
|
|
|
|
|
The message is shown in the header-line, which will be created in the
|
2011-02-01 06:42:28 -05:00
|
|
|
|
first line of the window showing the editing buffer."
|
2009-06-07 10:27:07 -04:00
|
|
|
|
:group 'org-edit-structure
|
|
|
|
|
:type 'boolean)
|
|
|
|
|
|
2014-11-23 17:34:47 -05:00
|
|
|
|
(defcustom org-src-ask-before-returning-to-edit-buffer t
|
|
|
|
|
"Non-nil means ask before switching to an existing edit buffer.
|
|
|
|
|
If nil, when `org-edit-src-code' is used on a block that already
|
|
|
|
|
has an active edit buffer, it will switch to that edit buffer
|
|
|
|
|
immediately; otherwise it will ask whether you want to return to
|
|
|
|
|
the existing edit buffer."
|
|
|
|
|
:group 'org-edit-structure
|
|
|
|
|
:version "24.4"
|
|
|
|
|
:package-version '(Org . "8.0")
|
|
|
|
|
:type 'boolean)
|
|
|
|
|
|
2009-10-27 14:11:09 -04:00
|
|
|
|
(defcustom org-src-window-setup 'reorganize-frame
|
|
|
|
|
"How the source code edit buffer should be displayed.
|
|
|
|
|
Possible values for this option are:
|
|
|
|
|
|
2009-10-27 15:36:24 -04:00
|
|
|
|
current-window Show edit buffer in the current window, keeping all other
|
|
|
|
|
windows.
|
2009-10-27 14:11:09 -04:00
|
|
|
|
other-window Use `switch-to-buffer-other-window' to display edit buffer.
|
|
|
|
|
reorganize-frame Show only two windows on the current frame, the current
|
2012-08-11 13:10:44 -04:00
|
|
|
|
window and the edit buffer. When exiting the edit buffer,
|
2009-10-27 15:36:24 -04:00
|
|
|
|
return to one window.
|
2009-10-27 14:11:09 -04:00
|
|
|
|
other-frame Use `switch-to-buffer-other-frame' to display edit buffer.
|
|
|
|
|
Also, when exiting the edit buffer, kill that frame."
|
|
|
|
|
:group 'org-edit-structure
|
|
|
|
|
:type '(choice
|
|
|
|
|
(const current-window)
|
|
|
|
|
(const other-frame)
|
|
|
|
|
(const other-window)
|
|
|
|
|
(const reorganize-frame)))
|
|
|
|
|
|
2009-06-08 02:52:25 -04:00
|
|
|
|
(defvar org-src-mode-hook nil
|
2015-05-01 04:03:17 -04:00
|
|
|
|
"Hook run after Org switched a source code snippet to its Emacs mode.
|
2015-05-01 03:49:14 -04:00
|
|
|
|
\\<org-mode-map>
|
|
|
|
|
This hook will run:
|
2016-10-15 11:36:47 -04:00
|
|
|
|
- when editing a source code snippet with `\\[org-edit-special]'
|
2015-05-01 03:49:14 -04:00
|
|
|
|
- when formatting a source code snippet for export with htmlize.
|
2009-06-08 02:52:25 -04:00
|
|
|
|
|
|
|
|
|
You may want to use this hook for example to turn off `outline-minor-mode'
|
|
|
|
|
or similar things which you want to have when editing a source code file,
|
|
|
|
|
but which mess up the display of a snippet in Org exported files.")
|
|
|
|
|
|
2009-08-23 13:31:47 -04:00
|
|
|
|
(defcustom org-src-lang-modes
|
2009-09-16 12:54:43 -04:00
|
|
|
|
'(("ocaml" . tuareg) ("elisp" . emacs-lisp) ("ditaa" . artist)
|
2010-10-29 21:18:28 -04:00
|
|
|
|
("asymptote" . asy) ("dot" . fundamental) ("sqlite" . sql)
|
2013-07-13 10:30:04 -04:00
|
|
|
|
("calc" . fundamental) ("C" . c) ("cpp" . c++) ("C++" . c++)
|
2014-06-22 19:49:37 -04:00
|
|
|
|
("screen" . shell-script) ("shell" . sh) ("bash" . sh))
|
2009-08-23 13:31:47 -04:00
|
|
|
|
"Alist mapping languages to their major mode.
|
|
|
|
|
The key is the language name, the value is the string that should
|
|
|
|
|
be inserted as the name of the major mode. For many languages this is
|
|
|
|
|
simple, but for language where this is not the case, this variable
|
|
|
|
|
provides a way to simplify things on the user side.
|
|
|
|
|
For example, there is no ocaml-mode in Emacs, but the mode to use is
|
|
|
|
|
`tuareg-mode'."
|
|
|
|
|
:group 'org-edit-structure
|
|
|
|
|
:type '(repeat
|
|
|
|
|
(cons
|
|
|
|
|
(string "Language name")
|
|
|
|
|
(symbol "Major mode"))))
|
|
|
|
|
|
2016-09-24 04:52:49 -04:00
|
|
|
|
(defcustom org-src-block-faces nil
|
|
|
|
|
"Alist of faces to be used for source-block.
|
|
|
|
|
Each element is a cell of the format
|
|
|
|
|
|
|
|
|
|
(\"language\" FACE)
|
|
|
|
|
|
|
|
|
|
Where FACE is either a defined face or an anonymous face.
|
|
|
|
|
|
|
|
|
|
For instance, the following value would color the background of
|
|
|
|
|
emacs-lisp source blocks and python source blocks in purple and
|
|
|
|
|
green, respectability.
|
|
|
|
|
|
|
|
|
|
\\='((\"emacs-lisp\" (:background \"#EEE2FF\"))
|
|
|
|
|
(\"python\" (:background \"#e5ffb8\")))"
|
|
|
|
|
:group 'org-edit-structure
|
|
|
|
|
:type '(repeat (list (string :tag "language")
|
|
|
|
|
(choice
|
|
|
|
|
(face :tag "Face")
|
|
|
|
|
(sexp :tag "Anonymous face"))))
|
2017-01-25 23:39:18 -05:00
|
|
|
|
:version "26.1"
|
2016-09-24 04:52:49 -04:00
|
|
|
|
:package-version '(Org . "9.0"))
|
|
|
|
|
|
2014-11-11 11:31:40 -05:00
|
|
|
|
(defcustom org-src-tab-acts-natively nil
|
|
|
|
|
"If non-nil, the effect of TAB in a code block is as if it were
|
|
|
|
|
issued in the language major mode buffer."
|
|
|
|
|
:type 'boolean
|
|
|
|
|
:version "24.1"
|
|
|
|
|
:group 'org-babel)
|
|
|
|
|
|
2010-08-17 17:45:47 -04:00
|
|
|
|
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
|
|
|
|
|
;;; Internal functions and variables
|
2009-06-07 10:27:07 -04:00
|
|
|
|
|
2015-04-26 04:04:55 -04:00
|
|
|
|
(defvar org-src--allow-write-back t)
|
2015-05-26 15:47:05 -04:00
|
|
|
|
(defvar org-src--auto-save-timer nil)
|
|
|
|
|
(defvar org-src--babel-info nil)
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
(defvar org-src--beg-marker nil)
|
|
|
|
|
(defvar org-src--block-indentation nil)
|
|
|
|
|
(defvar org-src--end-marker nil)
|
|
|
|
|
(defvar org-src--from-org-mode nil)
|
|
|
|
|
(defvar org-src--overlay nil)
|
2015-05-26 15:47:05 -04:00
|
|
|
|
(defvar org-src--preserve-indentation nil)
|
|
|
|
|
(defvar org-src--remote nil)
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
(defvar org-src--saved-temp-window-config nil)
|
2017-04-29 05:45:45 -04:00
|
|
|
|
(defvar org-src--source-type nil
|
|
|
|
|
"Type of element being edited, as a symbol.")
|
|
|
|
|
(defvar org-src--tab-width nil
|
|
|
|
|
"Contains `tab-width' value from Org source buffer.
|
|
|
|
|
However, if `indent-tabs-mode' is nil in that buffer, its value
|
|
|
|
|
is 0.")
|
2014-11-11 11:31:40 -05:00
|
|
|
|
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
(defun org-src--construct-edit-buffer-name (org-buffer-name lang)
|
|
|
|
|
"Construct the buffer name for a source editing buffer."
|
|
|
|
|
(concat "*Org Src " org-buffer-name "[ " lang " ]*"))
|
2009-10-14 18:43:25 -04:00
|
|
|
|
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
(defun org-src--edit-buffer (beg end)
|
|
|
|
|
"Return buffer editing area between BEG and END.
|
|
|
|
|
Return nil if there is no such buffer."
|
|
|
|
|
(catch 'exit
|
|
|
|
|
(dolist (b (buffer-list))
|
|
|
|
|
(with-current-buffer b
|
|
|
|
|
(and (org-src-edit-buffer-p)
|
2014-12-11 23:34:35 -05:00
|
|
|
|
(= beg org-src--beg-marker)
|
|
|
|
|
(eq (marker-buffer beg) (marker-buffer org-src--beg-marker))
|
|
|
|
|
(= end org-src--end-marker)
|
|
|
|
|
(eq (marker-buffer end) (marker-buffer org-src--end-marker))
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
(throw 'exit b))))))
|
|
|
|
|
|
|
|
|
|
(defun org-src--source-buffer ()
|
|
|
|
|
"Return source buffer edited by current buffer."
|
|
|
|
|
(unless (org-src-edit-buffer-p) (error "Not in a source buffer"))
|
|
|
|
|
(or (marker-buffer org-src--beg-marker)
|
|
|
|
|
(error "No source buffer available for current editing session")))
|
|
|
|
|
|
|
|
|
|
(defun org-src--get-lang-mode (lang)
|
|
|
|
|
"Return major mode that should be used for LANG.
|
|
|
|
|
LANG is a string, and the returned major mode is a symbol."
|
|
|
|
|
(intern
|
|
|
|
|
(concat
|
|
|
|
|
(let ((l (or (cdr (assoc lang org-src-lang-modes)) lang)))
|
|
|
|
|
(if (symbolp l) (symbol-name l) l))
|
|
|
|
|
"-mode")))
|
2009-06-07 10:27:07 -04:00
|
|
|
|
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
(defun org-src--coordinates (pos beg end)
|
|
|
|
|
"Return coordinates of POS relatively to BEG and END.
|
|
|
|
|
POS, BEG and END are buffer positions. Return value is either
|
|
|
|
|
a cons cell (LINE . COLUMN) or symbol `end'. See also
|
|
|
|
|
`org-src--goto-coordinates'."
|
|
|
|
|
(if (>= pos end) 'end
|
|
|
|
|
(org-with-wide-buffer
|
|
|
|
|
(goto-char (max beg pos))
|
|
|
|
|
(cons (count-lines beg (line-beginning-position))
|
|
|
|
|
;; Column is relative to the end of line to avoid problems of
|
|
|
|
|
;; comma escaping or colons appended in front of the line.
|
|
|
|
|
(- (current-column)
|
|
|
|
|
(progn (end-of-line) (current-column)))))))
|
|
|
|
|
|
|
|
|
|
(defun org-src--goto-coordinates (coord beg end)
|
|
|
|
|
"Move to coordinates COORD relatively to BEG and END.
|
|
|
|
|
COORD are coordinates, as returned by `org-src--coordinates',
|
|
|
|
|
which see. BEG and END are buffer positions."
|
|
|
|
|
(goto-char
|
|
|
|
|
(if (eq coord 'end) (max (1- end) beg)
|
|
|
|
|
;; If BEG happens to be located outside of the narrowed part of
|
|
|
|
|
;; the buffer, widen it first.
|
|
|
|
|
(org-with-wide-buffer
|
|
|
|
|
(goto-char beg)
|
|
|
|
|
(forward-line (car coord))
|
|
|
|
|
(end-of-line)
|
|
|
|
|
(org-move-to-column (max (+ (current-column) (cdr coord)) 0))
|
|
|
|
|
(point)))))
|
|
|
|
|
|
2015-05-02 02:37:37 -04:00
|
|
|
|
(defun org-src--contents-area (datum)
|
|
|
|
|
"Return contents boundaries of DATUM.
|
2015-05-22 14:59:31 -04:00
|
|
|
|
DATUM is an element or object. Return a list (BEG END CONTENTS)
|
|
|
|
|
where BEG and END are buffer positions and CONTENTS is a string."
|
2015-05-02 02:37:37 -04:00
|
|
|
|
(let ((type (org-element-type datum)))
|
2015-08-13 18:17:47 -04:00
|
|
|
|
(org-with-wide-buffer
|
|
|
|
|
(cond
|
|
|
|
|
((eq type 'footnote-definition)
|
|
|
|
|
(let* ((beg (progn
|
|
|
|
|
(goto-char (org-element-property :post-affiliated datum))
|
|
|
|
|
(search-forward "]")))
|
|
|
|
|
(end (or (org-element-property :contents-end datum) beg)))
|
|
|
|
|
(list beg end (buffer-substring-no-properties beg end))))
|
2015-11-08 14:55:31 -05:00
|
|
|
|
((eq type 'inline-src-block)
|
|
|
|
|
(let ((beg (progn (goto-char (org-element-property :begin datum))
|
|
|
|
|
(search-forward "{" (line-end-position) t)))
|
|
|
|
|
(end (progn (goto-char (org-element-property :end datum))
|
|
|
|
|
(search-backward "}" (line-beginning-position) t))))
|
|
|
|
|
(list beg end (buffer-substring-no-properties beg end))))
|
2015-08-13 18:17:47 -04:00
|
|
|
|
((org-element-property :contents-begin datum)
|
|
|
|
|
(let ((beg (org-element-property :contents-begin datum))
|
|
|
|
|
(end (org-element-property :contents-end datum)))
|
|
|
|
|
(list beg end (buffer-substring-no-properties beg end))))
|
|
|
|
|
((memq type '(example-block export-block src-block))
|
|
|
|
|
(list (progn (goto-char (org-element-property :post-affiliated datum))
|
|
|
|
|
(line-beginning-position 2))
|
|
|
|
|
(progn (goto-char (org-element-property :end datum))
|
|
|
|
|
(skip-chars-backward " \r\t\n")
|
|
|
|
|
(line-beginning-position 1))
|
|
|
|
|
(org-element-property :value datum)))
|
2017-02-01 15:30:54 -05:00
|
|
|
|
((memq type '(fixed-width latex-environment table))
|
2015-08-13 18:17:47 -04:00
|
|
|
|
(let ((beg (org-element-property :post-affiliated datum))
|
|
|
|
|
(end (progn (goto-char (org-element-property :end datum))
|
|
|
|
|
(skip-chars-backward " \r\t\n")
|
|
|
|
|
(line-beginning-position 2))))
|
|
|
|
|
(list beg
|
|
|
|
|
end
|
|
|
|
|
(if (eq type 'fixed-width) (org-element-property :value datum)
|
|
|
|
|
(buffer-substring-no-properties beg end)))))
|
|
|
|
|
(t (error "Unsupported element or object: %s" type))))))
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
|
|
|
|
|
(defun org-src--make-source-overlay (beg end edit-buffer)
|
|
|
|
|
"Create overlay between BEG and END positions and return it.
|
|
|
|
|
EDIT-BUFFER is the buffer currently editing area between BEG and
|
|
|
|
|
END."
|
|
|
|
|
(let ((overlay (make-overlay beg end)))
|
|
|
|
|
(overlay-put overlay 'face 'secondary-selection)
|
|
|
|
|
(overlay-put overlay 'edit-buffer edit-buffer)
|
|
|
|
|
(overlay-put overlay 'help-echo
|
|
|
|
|
"Click with mouse-1 to switch to buffer editing this segment")
|
|
|
|
|
(overlay-put overlay 'face 'secondary-selection)
|
|
|
|
|
(overlay-put overlay 'keymap
|
|
|
|
|
(let ((map (make-sparse-keymap)))
|
|
|
|
|
(define-key map [mouse-1] 'org-edit-src-continue)
|
|
|
|
|
map))
|
2015-05-01 15:14:19 -04:00
|
|
|
|
(let ((read-only
|
|
|
|
|
(list
|
|
|
|
|
(lambda (&rest _)
|
|
|
|
|
(user-error
|
|
|
|
|
"Cannot modify an area being edited in a dedicated buffer")))))
|
|
|
|
|
(overlay-put overlay 'modification-hooks read-only)
|
|
|
|
|
(overlay-put overlay 'insert-in-front-hooks read-only)
|
|
|
|
|
(overlay-put overlay 'insert-behind-hooks read-only))
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
overlay))
|
|
|
|
|
|
2015-02-17 20:05:57 -05:00
|
|
|
|
(defun org-src--remove-overlay ()
|
|
|
|
|
"Remove overlay from current source buffer."
|
|
|
|
|
(when (overlayp org-src--overlay) (delete-overlay org-src--overlay)))
|
|
|
|
|
|
2015-05-02 02:37:37 -04:00
|
|
|
|
(defun org-src--on-datum-p (datum)
|
|
|
|
|
"Non-nil when point is on DATUM.
|
|
|
|
|
DATUM is an element or an object. Consider blank lines or white
|
|
|
|
|
spaces after it as being outside."
|
|
|
|
|
(and (>= (point) (org-element-property :begin datum))
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
(<= (point)
|
|
|
|
|
(org-with-wide-buffer
|
2015-05-02 02:37:37 -04:00
|
|
|
|
(goto-char (org-element-property :end datum))
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
(skip-chars-backward " \r\t\n")
|
2016-10-25 07:13:26 -04:00
|
|
|
|
(if (eq (org-element-class datum) 'element)
|
2015-05-02 02:37:37 -04:00
|
|
|
|
(line-end-position)
|
|
|
|
|
(point))))))
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
|
|
|
|
|
(defun org-src--contents-for-write-back ()
|
|
|
|
|
"Return buffer contents in a format appropriate for write back.
|
|
|
|
|
Assume point is in the corresponding edit buffer."
|
2017-04-29 05:45:45 -04:00
|
|
|
|
(let ((indentation-offset
|
|
|
|
|
(if org-src--preserve-indentation 0
|
|
|
|
|
(+ (or org-src--block-indentation 0)
|
|
|
|
|
(if (memq org-src--source-type '(example-block src-block))
|
|
|
|
|
org-edit-src-content-indentation
|
|
|
|
|
0))))
|
|
|
|
|
(use-tabs? (and (> org-src--tab-width 0) t))
|
|
|
|
|
(source-tab-width org-src--tab-width)
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
(contents (org-with-wide-buffer (buffer-string)))
|
2015-04-26 04:04:55 -04:00
|
|
|
|
(write-back org-src--allow-write-back))
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
(with-temp-buffer
|
2017-04-29 05:45:45 -04:00
|
|
|
|
;; Reproduce indentation parameters from source buffer.
|
|
|
|
|
(setq-local indent-tabs-mode use-tabs?)
|
|
|
|
|
(when (> source-tab-width 0) (setq-local tab-width source-tab-width))
|
|
|
|
|
;; Apply WRITE-BACK function on edit buffer contents.
|
2015-04-26 04:04:55 -04:00
|
|
|
|
(insert (org-no-properties contents))
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
(goto-char (point-min))
|
2017-04-29 05:45:45 -04:00
|
|
|
|
(when (functionp write-back) (save-excursion (funcall write-back)))
|
|
|
|
|
;; Add INDENTATION-OFFSET to every non-empty line in buffer,
|
|
|
|
|
;; unless indentation is meant to be preserved.
|
|
|
|
|
(when (> indentation-offset 0)
|
|
|
|
|
(while (not (eobp))
|
|
|
|
|
(skip-chars-forward " \t")
|
|
|
|
|
(unless (eolp) ;ignore blank lines
|
|
|
|
|
(let ((i (current-column)))
|
|
|
|
|
(delete-region (line-beginning-position) (point))
|
|
|
|
|
(indent-to (+ i indentation-offset))))
|
|
|
|
|
(forward-line)))
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
(buffer-string))))
|
|
|
|
|
|
2015-04-26 04:32:20 -04:00
|
|
|
|
(defun org-src--edit-element
|
2017-08-21 05:27:41 -04:00
|
|
|
|
(datum name &optional initialize write-back contents remote)
|
2015-05-02 02:37:37 -04:00
|
|
|
|
"Edit DATUM contents in a dedicated buffer NAME.
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
|
2017-08-21 05:27:41 -04:00
|
|
|
|
INITIALIZE is a function to call upon creating the buffer.
|
2015-04-26 04:32:20 -04:00
|
|
|
|
|
|
|
|
|
When WRITE-BACK is non-nil, assume contents will replace original
|
2015-05-02 02:37:37 -04:00
|
|
|
|
region. Moreover, if it is a function, apply it in the edit
|
|
|
|
|
buffer, from point min, before returning the contents.
|
2015-04-26 04:32:20 -04:00
|
|
|
|
|
|
|
|
|
When CONTENTS is non-nil, display them in the edit buffer.
|
2015-05-02 02:37:37 -04:00
|
|
|
|
Otherwise, show DATUM contents as specified by
|
|
|
|
|
`org-src--contents-area'.
|
2015-04-26 04:32:20 -04:00
|
|
|
|
|
|
|
|
|
When REMOTE is non-nil, do not try to preserve point or mark when
|
|
|
|
|
moving from the edit area to the source.
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
|
|
|
|
|
Leave point in edit buffer."
|
|
|
|
|
(setq org-src--saved-temp-window-config (current-window-configuration))
|
2015-05-02 02:37:37 -04:00
|
|
|
|
(let* ((area (org-src--contents-area datum))
|
2015-05-22 14:59:31 -04:00
|
|
|
|
(beg (copy-marker (nth 0 area)))
|
|
|
|
|
(end (copy-marker (nth 1 area) t))
|
2015-05-02 02:37:37 -04:00
|
|
|
|
(old-edit-buffer (org-src--edit-buffer beg end))
|
2015-05-22 14:59:31 -04:00
|
|
|
|
(contents (or contents (nth 2 area))))
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
(if (and old-edit-buffer
|
|
|
|
|
(or (not org-src-ask-before-returning-to-edit-buffer)
|
|
|
|
|
(y-or-n-p "Return to existing edit buffer ([n] will revert changes)? ")))
|
|
|
|
|
;; Move to existing buffer.
|
|
|
|
|
(org-src-switch-to-buffer old-edit-buffer 'return)
|
|
|
|
|
;; Discard old edit buffer.
|
|
|
|
|
(when old-edit-buffer
|
2015-02-17 20:05:57 -05:00
|
|
|
|
(with-current-buffer old-edit-buffer (org-src--remove-overlay))
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
(kill-buffer old-edit-buffer))
|
|
|
|
|
(let* ((org-mode-p (derived-mode-p 'org-mode))
|
2017-04-29 05:45:45 -04:00
|
|
|
|
(source-tab-width (if indent-tabs-mode tab-width 0))
|
2015-05-02 02:37:37 -04:00
|
|
|
|
(type (org-element-type datum))
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
(ind (org-with-wide-buffer
|
2015-05-02 02:37:37 -04:00
|
|
|
|
(goto-char (org-element-property :begin datum))
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
(org-get-indentation)))
|
|
|
|
|
(preserve-ind
|
|
|
|
|
(and (memq type '(example-block src-block))
|
2015-05-02 02:37:37 -04:00
|
|
|
|
(or (org-element-property :preserve-indent datum)
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
org-src-preserve-indentation)))
|
|
|
|
|
;; Store relative positions of mark (if any) and point
|
|
|
|
|
;; within the edited area.
|
2015-04-26 04:32:20 -04:00
|
|
|
|
(point-coordinates (and (not remote)
|
|
|
|
|
(org-src--coordinates (point) beg end)))
|
|
|
|
|
(mark-coordinates (and (not remote)
|
|
|
|
|
(org-region-active-p)
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
(let ((m (mark)))
|
|
|
|
|
(and (>= m beg) (>= end m)
|
|
|
|
|
(org-src--coordinates m beg end)))))
|
|
|
|
|
;; Generate a new edit buffer.
|
|
|
|
|
(buffer (generate-new-buffer name))
|
|
|
|
|
;; Add an overlay on top of source.
|
|
|
|
|
(overlay (org-src--make-source-overlay beg end buffer)))
|
|
|
|
|
;; Switch to edit buffer.
|
2009-10-27 14:11:09 -04:00
|
|
|
|
(org-src-switch-to-buffer buffer 'edit)
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
;; Insert contents.
|
2015-05-02 02:37:37 -04:00
|
|
|
|
(insert contents)
|
2009-06-07 10:27:07 -04:00
|
|
|
|
(remove-text-properties (point-min) (point-max)
|
|
|
|
|
'(display nil invisible nil intangible nil))
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
(unless preserve-ind (org-do-remove-indentation))
|
2009-08-24 08:47:58 -04:00
|
|
|
|
(set-buffer-modified-p nil)
|
2013-04-07 16:43:02 -04:00
|
|
|
|
(setq buffer-file-name nil)
|
2017-08-21 05:27:41 -04:00
|
|
|
|
;; Initialize buffer.
|
|
|
|
|
(when (functionp initialize)
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
(let ((org-inhibit-startup t))
|
2017-08-21 05:27:41 -04:00
|
|
|
|
(condition-case e
|
|
|
|
|
(funcall initialize)
|
|
|
|
|
(error (message "Initialization fails with: %S"
|
|
|
|
|
(error-message-string e))))))
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
;; Transmit buffer-local variables for exit function. It must
|
|
|
|
|
;; be done after initializing major mode, as this operation
|
|
|
|
|
;; may reset them otherwise.
|
2017-04-29 05:45:45 -04:00
|
|
|
|
(setq-local org-src--tab-width source-tab-width)
|
2015-11-05 11:47:38 -05:00
|
|
|
|
(setq-local org-src--from-org-mode org-mode-p)
|
|
|
|
|
(setq-local org-src--beg-marker beg)
|
|
|
|
|
(setq-local org-src--end-marker end)
|
|
|
|
|
(setq-local org-src--remote remote)
|
2017-04-29 05:45:45 -04:00
|
|
|
|
(setq-local org-src--source-type type)
|
2015-11-05 11:47:38 -05:00
|
|
|
|
(setq-local org-src--block-indentation ind)
|
|
|
|
|
(setq-local org-src--preserve-indentation preserve-ind)
|
|
|
|
|
(setq-local org-src--overlay overlay)
|
|
|
|
|
(setq-local org-src--allow-write-back write-back)
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
;; Start minor mode.
|
|
|
|
|
(org-src-mode)
|
|
|
|
|
;; Move mark and point in edit buffer to the corresponding
|
|
|
|
|
;; location.
|
2015-05-02 02:37:37 -04:00
|
|
|
|
(if remote
|
|
|
|
|
(progn
|
|
|
|
|
;; Put point at first non read-only character after
|
|
|
|
|
;; leading blank.
|
|
|
|
|
(goto-char
|
|
|
|
|
(or (text-property-any (point-min) (point-max) 'read-only nil)
|
|
|
|
|
(point-max)))
|
|
|
|
|
(skip-chars-forward " \r\t\n"))
|
|
|
|
|
;; Set mark and point.
|
|
|
|
|
(when mark-coordinates
|
|
|
|
|
(org-src--goto-coordinates mark-coordinates (point-min) (point-max))
|
|
|
|
|
(push-mark (point) 'no-message t)
|
|
|
|
|
(setq deactivate-mark nil))
|
|
|
|
|
(org-src--goto-coordinates
|
|
|
|
|
point-coordinates (point-min) (point-max)))))))
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;; Fontification of source blocks
|
2009-06-07 10:27:07 -04:00
|
|
|
|
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
(defun org-src-font-lock-fontify-block (lang start end)
|
|
|
|
|
"Fontify code block.
|
|
|
|
|
This function is called by emacs automatic fontification, as long
|
|
|
|
|
as `org-src-fontify-natively' is non-nil."
|
|
|
|
|
(let ((lang-mode (org-src--get-lang-mode lang)))
|
|
|
|
|
(when (fboundp lang-mode)
|
|
|
|
|
(let ((string (buffer-substring-no-properties start end))
|
|
|
|
|
(modified (buffer-modified-p))
|
2016-08-07 14:59:05 -04:00
|
|
|
|
(org-buffer (current-buffer)))
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
(remove-text-properties start end '(face nil))
|
|
|
|
|
(with-current-buffer
|
|
|
|
|
(get-buffer-create
|
2016-06-03 09:31:58 -04:00
|
|
|
|
(format " *org-src-fontification:%s*" lang-mode))
|
2017-01-07 16:05:19 -05:00
|
|
|
|
(let ((inhibit-modification-hooks nil))
|
|
|
|
|
(erase-buffer)
|
|
|
|
|
;; Add string and a final space to ensure property change.
|
2017-03-19 18:55:51 -04:00
|
|
|
|
(insert string " "))
|
|
|
|
|
(unless (eq major-mode lang-mode) (funcall lang-mode))
|
|
|
|
|
(org-font-lock-ensure)
|
|
|
|
|
(let ((pos (point-min)) next)
|
|
|
|
|
(while (setq next (next-property-change pos))
|
|
|
|
|
;; Handle additional properties from font-lock, so as to
|
|
|
|
|
;; preserve, e.g., composition.
|
|
|
|
|
(dolist (prop (cons 'face font-lock-extra-managed-props))
|
|
|
|
|
(let ((new-prop (get-text-property pos prop)))
|
|
|
|
|
(put-text-property
|
|
|
|
|
(+ start (1- pos)) (1- (+ start next)) prop new-prop
|
|
|
|
|
org-buffer)))
|
|
|
|
|
(setq pos next))))
|
2016-08-07 14:59:05 -04:00
|
|
|
|
;; Add Org faces.
|
2016-09-22 15:43:38 -04:00
|
|
|
|
(let ((src-face (nth 1 (assoc-string lang org-src-block-faces t))))
|
2016-09-22 03:34:31 -04:00
|
|
|
|
(when (or (facep src-face) (listp src-face))
|
2016-09-21 05:02:49 -04:00
|
|
|
|
(font-lock-append-text-property start end 'face src-face))
|
2016-08-07 14:59:05 -04:00
|
|
|
|
(font-lock-append-text-property start end 'face 'org-block))
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
(add-text-properties
|
|
|
|
|
start end
|
|
|
|
|
'(font-lock-fontified t fontified t font-lock-multiline t))
|
|
|
|
|
(set-buffer-modified-p modified)))))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;; Escape contents
|
2009-06-07 10:27:07 -04:00
|
|
|
|
|
2012-09-30 11:20:27 -04:00
|
|
|
|
(defun org-escape-code-in-region (beg end)
|
|
|
|
|
"Escape lines between BEG and END.
|
|
|
|
|
Escaping happens when a line starts with \"*\", \"#+\", \",*\" or
|
|
|
|
|
\",#+\" by appending a comma to it."
|
2012-09-28 14:47:14 -04:00
|
|
|
|
(interactive "r")
|
2012-09-30 11:20:27 -04:00
|
|
|
|
(save-excursion
|
2015-06-02 11:17:17 -04:00
|
|
|
|
(goto-char end)
|
2017-10-24 03:51:43 -04:00
|
|
|
|
(while (re-search-backward "^[ \t]*\\(,*\\(?:\\*\\|#\\+\\)\\)" beg t)
|
2015-06-02 11:17:17 -04:00
|
|
|
|
(save-excursion (replace-match ",\\1" nil nil nil 1)))))
|
2012-09-30 11:20:27 -04:00
|
|
|
|
|
|
|
|
|
(defun org-escape-code-in-string (s)
|
|
|
|
|
"Escape lines in string S.
|
|
|
|
|
Escaping happens when a line starts with \"*\", \"#+\", \",*\" or
|
|
|
|
|
\",#+\" by appending a comma to it."
|
2017-10-24 03:51:43 -04:00
|
|
|
|
(replace-regexp-in-string "^[ \t]*\\(,*\\(?:\\*\\|#\\+\\)\\)" ",\\1"
|
|
|
|
|
s nil nil 1))
|
2012-09-30 11:20:27 -04:00
|
|
|
|
|
|
|
|
|
(defun org-unescape-code-in-region (beg end)
|
|
|
|
|
"Un-escape lines between BEG and END.
|
|
|
|
|
Un-escaping happens by removing the first comma on lines starting
|
|
|
|
|
with \",*\", \",#+\", \",,*\" and \",,#+\"."
|
|
|
|
|
(interactive "r")
|
|
|
|
|
(save-excursion
|
2015-06-02 11:17:17 -04:00
|
|
|
|
(goto-char end)
|
2017-10-24 03:51:43 -04:00
|
|
|
|
(while (re-search-backward "^[ \t]*,*\\(,\\)\\(?:\\*\\|#\\+\\)" beg t)
|
2015-06-02 11:17:17 -04:00
|
|
|
|
(save-excursion (replace-match "" nil nil nil 1)))))
|
2012-09-30 11:20:27 -04:00
|
|
|
|
|
|
|
|
|
(defun org-unescape-code-in-string (s)
|
|
|
|
|
"Un-escape lines in string S.
|
|
|
|
|
Un-escaping happens by removing the first comma on lines starting
|
|
|
|
|
with \",*\", \",#+\", \",,*\" and \",,#+\"."
|
|
|
|
|
(replace-regexp-in-string
|
2017-10-24 03:51:43 -04:00
|
|
|
|
"^[ \t]*,*\\(,\\)\\(?:\\*\\|#\\+\\)" "" s nil nil 1))
|
2012-09-28 14:47:14 -04:00
|
|
|
|
|
2009-06-07 10:27:07 -04:00
|
|
|
|
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
|
|
|
|
|
;;; Org src minor mode
|
2012-03-19 16:38:12 -04:00
|
|
|
|
|
2015-05-01 03:49:14 -04:00
|
|
|
|
(defvar org-src-mode-map
|
|
|
|
|
(let ((map (make-sparse-keymap)))
|
|
|
|
|
(define-key map "\C-c'" 'org-edit-src-exit)
|
|
|
|
|
(define-key map "\C-c\C-k" 'org-edit-src-abort)
|
|
|
|
|
(define-key map "\C-x\C-s" 'org-edit-src-save)
|
|
|
|
|
map))
|
2012-03-19 16:38:12 -04:00
|
|
|
|
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
(define-minor-mode org-src-mode
|
2015-05-01 04:29:05 -04:00
|
|
|
|
"Minor mode for language major mode buffers generated by Org.
|
2015-05-01 03:49:14 -04:00
|
|
|
|
\\<org-mode-map>
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
This minor mode is turned on in two situations:
|
2016-10-15 11:36:47 -04:00
|
|
|
|
- when editing a source code snippet with `\\[org-edit-special]'
|
2015-05-01 03:49:14 -04:00
|
|
|
|
- when formatting a source code snippet for export with htmlize.
|
|
|
|
|
|
|
|
|
|
\\{org-src-mode-map}
|
|
|
|
|
|
|
|
|
|
See also `org-src-mode-hook'."
|
2015-05-01 04:29:05 -04:00
|
|
|
|
nil " OrgSrc" nil
|
2015-04-29 07:16:21 -04:00
|
|
|
|
(when org-edit-src-persistent-message
|
2015-11-05 11:47:38 -05:00
|
|
|
|
(setq-local
|
|
|
|
|
header-line-format
|
2015-04-29 07:16:21 -04:00
|
|
|
|
(substitute-command-keys
|
2015-04-29 07:25:34 -04:00
|
|
|
|
(if org-src--allow-write-back
|
2016-10-15 11:36:47 -04:00
|
|
|
|
"Edit, then exit with `\\[org-edit-src-exit]' or abort with \
|
|
|
|
|
`\\[org-edit-src-abort]'"
|
|
|
|
|
"Exit with `\\[org-edit-src-exit]' or abort with \
|
|
|
|
|
`\\[org-edit-src-abort]'"))))
|
2015-04-29 07:21:17 -04:00
|
|
|
|
;; Possibly activate various auto-save features (for the edit buffer
|
2015-04-29 07:16:21 -04:00
|
|
|
|
;; or the source buffer).
|
|
|
|
|
(when org-edit-src-turn-on-auto-save
|
|
|
|
|
(setq buffer-auto-save-file-name
|
|
|
|
|
(concat (make-temp-name "org-src-")
|
|
|
|
|
(format-time-string "-%Y-%d-%m")
|
|
|
|
|
".txt")))
|
2015-04-29 07:21:17 -04:00
|
|
|
|
(unless (or org-src--auto-save-timer (zerop org-edit-src-auto-save-idle-delay))
|
|
|
|
|
(setq org-src--auto-save-timer
|
|
|
|
|
(run-with-idle-timer
|
|
|
|
|
org-edit-src-auto-save-idle-delay t
|
|
|
|
|
(lambda ()
|
2015-05-26 11:06:53 -04:00
|
|
|
|
(save-excursion
|
|
|
|
|
(let (edit-flag)
|
|
|
|
|
(dolist (b (buffer-list))
|
|
|
|
|
(with-current-buffer b
|
|
|
|
|
(when (org-src-edit-buffer-p)
|
|
|
|
|
(unless edit-flag (setq edit-flag t))
|
|
|
|
|
(when (buffer-modified-p) (org-edit-src-save)))))
|
|
|
|
|
(unless edit-flag
|
|
|
|
|
(cancel-timer org-src--auto-save-timer)
|
|
|
|
|
(setq org-src--auto-save-timer nil)))))))))
|
2009-06-07 10:27:07 -04:00
|
|
|
|
|
2009-08-24 08:47:58 -04:00
|
|
|
|
(defun org-src-mode-configure-edit-buffer ()
|
2016-06-23 08:18:38 -04:00
|
|
|
|
(when (bound-and-true-p org-src--from-org-mode)
|
Remove final parts of XEmacs compatibility code
* lisp/org-compat.el: Declare `org-add-hook', `org-decompose-region',
`org-detach-overlay', `org-file-equal-p', `org-float-time',
`org-indent-line-to', `org-indent-to-column', `org-looking-at-p',
`org-looking-back', `org-propertize', `org-re' and
`org-select-frame-set-input-focus' as obsolete.
(org-overlay-display, org-overlay-before-string, org-find-overlays):
Move to "org.el"
(org-xemacs-key-equivalents, org-xemacs-p): Remove variables.
(org-region-active-p): Drop XEmacs support.
(org-xemacs-without-invisibility): Remove macro.
(org-get-x-clipboard-compat): Remove function.
* lisp/org-macs.el (org-match-string-no-properties): Remove function.
* lisp/ob-core.el:
* lisp/org-agenda.el:
* lisp/org-archive.el:
* lisp/org-clock.el:
* lisp/org-colview.el:
* lisp/org-crypt.el:
* lisp/org-element.el:
* lisp/org-faces.el:
* lisp/org-feed.el:
* lisp/org-footnote.el:
* lisp/org-habit.el:
* lisp/org-id.el:
* lisp/org-indent.el:
* lisp/org-inlinetask.el:
* lisp/org-lint.el:
* lisp/org-list.el:
* lisp/org-mouse.el:
* lisp/org-pcomplete.el:
* lisp/org-src.el:
* lisp/org-table.el:
* lisp/org-timer.el:
* lisp/org.el:
* lisp/ox-ascii.el:
* lisp/ox-odt.el:
* lisp/ox.el:
* contrib/lisp/org-notify.el:
* contrib/lisp/ox-taskjuggler.el:
* contrib/lisp/org-wikinodes.el:
* testing/lisp/test-org-src.el:
* testing/lisp/test-org.el: Silence byte-compiler.
2016-05-26 06:18:00 -04:00
|
|
|
|
(add-hook 'kill-buffer-hook #'org-src--remove-overlay nil 'local)
|
2016-06-23 08:18:38 -04:00
|
|
|
|
(if (bound-and-true-p org-src--allow-write-back)
|
2010-04-22 17:37:35 -04:00
|
|
|
|
(progn
|
|
|
|
|
(setq buffer-offer-save t)
|
|
|
|
|
(setq buffer-file-name
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
(concat (buffer-file-name (marker-buffer org-src--beg-marker))
|
2017-02-17 16:29:06 -05:00
|
|
|
|
"[" (buffer-name) "]"))
|
|
|
|
|
(setq-local write-contents-functions '(org-edit-src-save)))
|
2010-04-22 17:37:35 -04:00
|
|
|
|
(setq buffer-read-only t))))
|
2009-08-24 08:47:58 -04:00
|
|
|
|
|
Remove final parts of XEmacs compatibility code
* lisp/org-compat.el: Declare `org-add-hook', `org-decompose-region',
`org-detach-overlay', `org-file-equal-p', `org-float-time',
`org-indent-line-to', `org-indent-to-column', `org-looking-at-p',
`org-looking-back', `org-propertize', `org-re' and
`org-select-frame-set-input-focus' as obsolete.
(org-overlay-display, org-overlay-before-string, org-find-overlays):
Move to "org.el"
(org-xemacs-key-equivalents, org-xemacs-p): Remove variables.
(org-region-active-p): Drop XEmacs support.
(org-xemacs-without-invisibility): Remove macro.
(org-get-x-clipboard-compat): Remove function.
* lisp/org-macs.el (org-match-string-no-properties): Remove function.
* lisp/ob-core.el:
* lisp/org-agenda.el:
* lisp/org-archive.el:
* lisp/org-clock.el:
* lisp/org-colview.el:
* lisp/org-crypt.el:
* lisp/org-element.el:
* lisp/org-faces.el:
* lisp/org-feed.el:
* lisp/org-footnote.el:
* lisp/org-habit.el:
* lisp/org-id.el:
* lisp/org-indent.el:
* lisp/org-inlinetask.el:
* lisp/org-lint.el:
* lisp/org-list.el:
* lisp/org-mouse.el:
* lisp/org-pcomplete.el:
* lisp/org-src.el:
* lisp/org-table.el:
* lisp/org-timer.el:
* lisp/org.el:
* lisp/ox-ascii.el:
* lisp/ox-odt.el:
* lisp/ox.el:
* contrib/lisp/org-notify.el:
* contrib/lisp/ox-taskjuggler.el:
* contrib/lisp/org-wikinodes.el:
* testing/lisp/test-org-src.el:
* testing/lisp/test-org.el: Silence byte-compiler.
2016-05-26 06:18:00 -04:00
|
|
|
|
(add-hook 'org-src-mode-hook #'org-src-mode-configure-edit-buffer)
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
|
2009-08-24 08:47:58 -04:00
|
|
|
|
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
|
|
|
|
|
;;; Babel related functions
|
2010-08-16 20:55:24 -04:00
|
|
|
|
|
|
|
|
|
(defun org-src-associate-babel-session (info)
|
|
|
|
|
"Associate edit buffer with comint session."
|
|
|
|
|
(interactive)
|
2016-09-22 13:45:15 -04:00
|
|
|
|
(let ((session (cdr (assq :session (nth 2 info)))))
|
2010-08-16 20:55:24 -04:00
|
|
|
|
(and session (not (string= session "none"))
|
|
|
|
|
(org-babel-comint-buffer-livep session)
|
Backport changes from Emacs revs 115081 and 115082
2013-11-12 Stefan Monnier <monnier@iro.umontreal.ca>
Address some byte-compiler warnings.
* ob-abc.el (org-babel-expand-body:abc): Use dolist.
(org-babel-execute:abc): Fix regexp quoting.
* ob-calc.el (org--var-syms): Rename from `var-syms'.
* ob-lilypond.el (ly-compile-lilyfile): Remove redundant let-binding.
* ob-table.el (sbe): Move debug declaration.
* org-clock.el (org--msg-extra): Rename from `msg-extra'.
* org.el (org-version): Avoid var name starting with _.
(org-inhibit-startup, org-called-with-limited-levels)
(org-link-search-inhibit-query, org-time-was-given)
(org-end-time-was-given, org-def, org-defdecode, org-with-time):
* org-colview.el (org-agenda-overriding-columns-format):
* org-agenda.el (org-agenda-multi, org-depend-tag-blocked)
(org-agenda-show-log-scoped):
* ob-python.el (py-which-bufname, python-shell-buffer-name):
* ob-haskell.el (org-export-copy-to-kill-ring):
* ob-exp.el (org-link-search-inhibit-query):
* ob-R.el (ess-eval-visibly-p):
* ob-core.el (org-src-window-setup): Declare before use.
(org-babel-expand-noweb-references): Remove unused `blocks-in-buffer'.
* ox-odt.el (org-odt-hfy-face-to-css):
* org-src.el (org-src-associate-babel-session, org-src-get-lang-mode):
* org-bibtex.el (org-bibtex-get, org-bibtex-ask, org-bibtex)
(org-bibtex-check):
* ob-tangle.el (org-babel-tangle, org-babel-spec-to-string)
(org-babel-tangle-single-block, org-babel-tangle-comment-links):
* ob-table.el (sbe):
* ob-sqlite.el (org-babel-sqlite-expand-vars):
* ob-sql.el (org-babel-sql-expand-vars):
* ob-shen.el (org-babel-execute:shen):
* ob-sh.el (org-babel-execute:sh, org-babel-sh-evaluate):
* ob-scala.el (org-babel-scala-evaluate):
* ob-ruby.el (org-babel-ruby-table-or-string)
(org-babel-ruby-evaluate):
* ob-python.el (org-babel-python-table-or-string)
(org-babel-python-evaluate-external-process)
(org-babel-python-evaluate-session):
* ob-picolisp.el (org-babel-execute:picolisp):
* ob-perl.el (org-babel-perl-evaluate):
* ob-maxima.el (org-babel-execute:maxima):
* ob-lisp.el (org-babel-execute:lisp):
* ob-java.el (org-babel-execute:java):
* ob-io.el (org-babel-io-evaluate):
* ob-haskell.el (org-babel-execute:haskell):
* ob-fortran.el (org-babel-execute:fortran):
* ob-exp.el (org-babel-exp-code):
* ob-emacs-lisp.el (org-babel-execute:emacs-lisp):
* ob-ditaa.el (org-babel-execute:ditaa):
* ob-core.el (org-babel-execute-src-block, org-babel-sha1-hash)
(org-babel-parse-header-arguments, org-babel-reassemble-table)
(org-babel-goto-src-block-head, org-babel-mark-block)
(org-babel-expand-noweb-references, org-babel-script-escape)
(org-babel-process-file-name):
* ob-clojure.el (org-babel-execute:clojure):
* ob-calc.el (org-babel-execute:calc):
* ob-awk.el (org-babel-execute:awk):
* ob-abc.el (org-babel-execute:abc):
* ob-R.el (org-babel-expand-body:R):
* ob-C.el (org-babel-C-execute): Avoid deprecated ((lambda) ...).
2013-11-12 Glenn Morris <rgm@gnu.org>
* ox-html.el (org-html-scripts): Add 2013 to copyright years.
(org-html-infojs-template): Copyright holder to FSF.
2013-11-12 14:57:31 -05:00
|
|
|
|
(let ((f (intern (format "org-babel-%s-associate-session"
|
|
|
|
|
(nth 0 info)))))
|
|
|
|
|
(and (fboundp f) (funcall f session))))))
|
2010-08-16 20:55:24 -04:00
|
|
|
|
|
|
|
|
|
(defun org-src-babel-configure-edit-buffer ()
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
(when org-src--babel-info
|
|
|
|
|
(org-src-associate-babel-session org-src--babel-info)))
|
|
|
|
|
|
Remove final parts of XEmacs compatibility code
* lisp/org-compat.el: Declare `org-add-hook', `org-decompose-region',
`org-detach-overlay', `org-file-equal-p', `org-float-time',
`org-indent-line-to', `org-indent-to-column', `org-looking-at-p',
`org-looking-back', `org-propertize', `org-re' and
`org-select-frame-set-input-focus' as obsolete.
(org-overlay-display, org-overlay-before-string, org-find-overlays):
Move to "org.el"
(org-xemacs-key-equivalents, org-xemacs-p): Remove variables.
(org-region-active-p): Drop XEmacs support.
(org-xemacs-without-invisibility): Remove macro.
(org-get-x-clipboard-compat): Remove function.
* lisp/org-macs.el (org-match-string-no-properties): Remove function.
* lisp/ob-core.el:
* lisp/org-agenda.el:
* lisp/org-archive.el:
* lisp/org-clock.el:
* lisp/org-colview.el:
* lisp/org-crypt.el:
* lisp/org-element.el:
* lisp/org-faces.el:
* lisp/org-feed.el:
* lisp/org-footnote.el:
* lisp/org-habit.el:
* lisp/org-id.el:
* lisp/org-indent.el:
* lisp/org-inlinetask.el:
* lisp/org-lint.el:
* lisp/org-list.el:
* lisp/org-mouse.el:
* lisp/org-pcomplete.el:
* lisp/org-src.el:
* lisp/org-table.el:
* lisp/org-timer.el:
* lisp/org.el:
* lisp/ox-ascii.el:
* lisp/ox-odt.el:
* lisp/ox.el:
* contrib/lisp/org-notify.el:
* contrib/lisp/ox-taskjuggler.el:
* contrib/lisp/org-wikinodes.el:
* testing/lisp/test-org-src.el:
* testing/lisp/test-org.el: Silence byte-compiler.
2016-05-26 06:18:00 -04:00
|
|
|
|
(add-hook 'org-src-mode-hook #'org-src-babel-configure-edit-buffer)
|
2010-08-16 20:55:24 -04:00
|
|
|
|
|
2016-08-19 10:19:36 -04:00
|
|
|
|
|
|
|
|
|
;;; Public API
|
|
|
|
|
|
|
|
|
|
(defmacro org-src-do-at-code-block (&rest body)
|
|
|
|
|
"Execute BODY from an edit buffer in the Org mode buffer."
|
|
|
|
|
(declare (debug (body)))
|
|
|
|
|
`(let ((beg-marker org-src--beg-marker))
|
|
|
|
|
(when beg-marker
|
|
|
|
|
(with-current-buffer (marker-buffer beg-marker)
|
|
|
|
|
(goto-char beg-marker)
|
|
|
|
|
,@body))))
|
|
|
|
|
|
2010-08-17 22:37:19 -04:00
|
|
|
|
(defun org-src-do-key-sequence-at-code-block (&optional key)
|
|
|
|
|
"Execute key sequence at code block in the source Org buffer.
|
|
|
|
|
The command bound to KEY in the Org-babel key map is executed
|
|
|
|
|
remotely with point temporarily at the start of the code block in
|
|
|
|
|
the Org buffer.
|
|
|
|
|
|
|
|
|
|
This command is not bound to a key by default, to avoid conflicts
|
2012-07-11 12:36:22 -04:00
|
|
|
|
with language major mode bindings. To bind it to C-c @ in all
|
2010-08-17 22:37:19 -04:00
|
|
|
|
language major modes, you could use
|
|
|
|
|
|
2015-09-21 00:23:36 -04:00
|
|
|
|
(add-hook \\='org-src-mode-hook
|
2010-08-17 22:37:19 -04:00
|
|
|
|
(lambda () (define-key org-src-mode-map \"\\C-c@\"
|
2015-09-21 00:23:36 -04:00
|
|
|
|
\\='org-src-do-key-sequence-at-code-block)))
|
2010-08-17 22:37:19 -04:00
|
|
|
|
|
|
|
|
|
In that case, for example, C-c @ t issued in code edit buffers
|
|
|
|
|
would tangle the current Org code block, C-c @ e would execute
|
|
|
|
|
the block and C-c @ h would display the other available
|
|
|
|
|
Org-babel commands."
|
|
|
|
|
(interactive "kOrg-babel key: ")
|
|
|
|
|
(if (equal key (kbd "C-g")) (keyboard-quit)
|
|
|
|
|
(org-edit-src-save)
|
|
|
|
|
(org-src-do-at-code-block
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
(call-interactively (lookup-key org-babel-map key)))))
|
|
|
|
|
|
|
|
|
|
(defun org-src-edit-buffer-p (&optional buffer)
|
|
|
|
|
"Non-nil when current buffer is a source editing buffer.
|
|
|
|
|
If BUFFER is non-nil, test it instead."
|
|
|
|
|
(let ((buffer (org-base-buffer (or buffer (current-buffer)))))
|
|
|
|
|
(and (buffer-live-p buffer)
|
|
|
|
|
(local-variable-p 'org-src--beg-marker buffer)
|
|
|
|
|
(local-variable-p 'org-src--end-marker buffer))))
|
|
|
|
|
|
|
|
|
|
(defun org-src-switch-to-buffer (buffer context)
|
2016-07-25 10:01:15 -04:00
|
|
|
|
(pcase org-src-window-setup
|
|
|
|
|
(`current-window (pop-to-buffer-same-window buffer))
|
|
|
|
|
(`other-window
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
(switch-to-buffer-other-window buffer))
|
2016-07-25 10:01:15 -04:00
|
|
|
|
(`other-frame
|
|
|
|
|
(pcase context
|
|
|
|
|
(`exit
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
(let ((frame (selected-frame)))
|
|
|
|
|
(switch-to-buffer-other-frame buffer)
|
|
|
|
|
(delete-frame frame)))
|
2016-07-25 10:01:15 -04:00
|
|
|
|
(`save
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
(kill-buffer (current-buffer))
|
2016-06-23 04:00:00 -04:00
|
|
|
|
(pop-to-buffer-same-window buffer))
|
2016-07-25 10:01:15 -04:00
|
|
|
|
(_ (switch-to-buffer-other-frame buffer))))
|
|
|
|
|
(`reorganize-frame
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
(when (eq context 'edit) (delete-other-windows))
|
|
|
|
|
(org-switch-to-buffer-other-window buffer)
|
|
|
|
|
(when (eq context 'exit) (delete-other-windows)))
|
2016-07-25 10:01:15 -04:00
|
|
|
|
(`switch-invisibly (set-buffer buffer))
|
|
|
|
|
(_
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
(message "Invalid value %s for `org-src-window-setup'"
|
|
|
|
|
org-src-window-setup)
|
2016-06-23 04:00:00 -04:00
|
|
|
|
(pop-to-buffer-same-window buffer))))
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
|
2016-08-17 17:43:38 -04:00
|
|
|
|
(defun org-src-coderef-format (&optional element)
|
|
|
|
|
"Return format string for block at point.
|
2016-08-08 08:04:11 -04:00
|
|
|
|
|
2016-08-17 17:43:38 -04:00
|
|
|
|
When optional argument ELEMENT is provided, use that block.
|
|
|
|
|
Otherwise, assume point is either at a source block, at an
|
|
|
|
|
example block.
|
|
|
|
|
|
|
|
|
|
If point is in an edit buffer, retrieve format string associated
|
|
|
|
|
to the remote source block."
|
|
|
|
|
(cond
|
|
|
|
|
((and element (org-element-property :label-fmt element)))
|
|
|
|
|
((org-src-edit-buffer-p) (org-src-do-at-code-block (org-src-coderef-format)))
|
|
|
|
|
((org-element-property :label-fmt (org-element-at-point)))
|
|
|
|
|
(t org-coderef-label-format)))
|
|
|
|
|
|
|
|
|
|
(defun org-src-coderef-regexp (fmt &optional label)
|
|
|
|
|
"Return regexp matching a coderef format string FMT.
|
|
|
|
|
|
|
|
|
|
When optional argument LABEL is non-nil, match coderef for that
|
|
|
|
|
label only.
|
2016-08-08 08:04:11 -04:00
|
|
|
|
|
|
|
|
|
Match group 1 contains the full coderef string with surrounding
|
|
|
|
|
white spaces. Match group 2 contains the same string without any
|
2016-08-17 17:43:38 -04:00
|
|
|
|
surrounding space. Match group 3 contains the label.
|
|
|
|
|
|
|
|
|
|
A coderef format regexp can only match at the end of a line."
|
2016-12-07 17:11:10 -05:00
|
|
|
|
(format "\\([ \t]*\\(%s\\)[ \t]*\\)$"
|
2016-08-17 17:43:38 -04:00
|
|
|
|
(replace-regexp-in-string
|
|
|
|
|
"%s"
|
2016-08-17 17:48:53 -04:00
|
|
|
|
(if label (regexp-quote label) "\\([-a-zA-Z0-9_][-a-zA-Z0-9_ ]*\\)")
|
2016-08-17 17:43:38 -04:00
|
|
|
|
(regexp-quote fmt)
|
|
|
|
|
nil t)))
|
2016-08-08 08:04:11 -04:00
|
|
|
|
|
2015-04-26 04:40:30 -04:00
|
|
|
|
(defun org-edit-footnote-reference ()
|
|
|
|
|
"Edit definition of footnote reference at point."
|
|
|
|
|
(interactive)
|
2015-05-02 02:37:37 -04:00
|
|
|
|
(let* ((context (org-element-context))
|
|
|
|
|
(label (org-element-property :label context)))
|
2015-04-26 08:57:36 -04:00
|
|
|
|
(unless (and (eq (org-element-type context) 'footnote-reference)
|
2015-05-02 02:37:37 -04:00
|
|
|
|
(org-src--on-datum-p context))
|
2015-04-26 08:57:36 -04:00
|
|
|
|
(user-error "Not on a footnote reference"))
|
2015-05-02 02:37:37 -04:00
|
|
|
|
(unless label (user-error "Cannot edit remotely anonymous footnotes"))
|
|
|
|
|
(let* ((definition (org-with-wide-buffer
|
|
|
|
|
(org-footnote-goto-definition label)
|
2015-08-14 10:46:09 -04:00
|
|
|
|
(backward-char)
|
2015-05-02 02:37:37 -04:00
|
|
|
|
(org-element-context)))
|
2017-06-07 18:57:38 -04:00
|
|
|
|
(inline? (eq 'footnote-reference (org-element-type definition)))
|
2015-05-02 02:37:37 -04:00
|
|
|
|
(contents
|
2017-06-07 18:57:38 -04:00
|
|
|
|
(org-with-wide-buffer
|
|
|
|
|
(buffer-substring-no-properties
|
|
|
|
|
(or (org-element-property :post-affiliated definition)
|
|
|
|
|
(org-element-property :begin definition))
|
|
|
|
|
(cond
|
|
|
|
|
(inline? (1+ (org-element-property :contents-end definition)))
|
|
|
|
|
((org-element-property :contents-end definition))
|
|
|
|
|
(t (goto-char (org-element-property :post-affiliated definition))
|
|
|
|
|
(line-end-position)))))))
|
|
|
|
|
(add-text-properties
|
|
|
|
|
0
|
|
|
|
|
(progn (string-match (if inline? "\\`\\[fn:.*?:" "\\`.*?\\]") contents)
|
|
|
|
|
(match-end 0))
|
|
|
|
|
'(read-only "Cannot edit footnote label" front-sticky t rear-nonsticky t)
|
|
|
|
|
contents)
|
|
|
|
|
(when inline?
|
|
|
|
|
(let ((l (length contents)))
|
|
|
|
|
(add-text-properties
|
|
|
|
|
(1- l) l
|
|
|
|
|
'(read-only "Cannot edit past footnote reference"
|
|
|
|
|
front-sticky nil rear-nonsticky nil)
|
|
|
|
|
contents)))
|
2015-04-26 08:57:36 -04:00
|
|
|
|
(org-src--edit-element
|
2015-05-02 02:37:37 -04:00
|
|
|
|
definition
|
|
|
|
|
(format "*Edit footnote [%s]*" label)
|
2017-08-21 05:27:41 -04:00
|
|
|
|
(let ((source (current-buffer)))
|
|
|
|
|
(lambda ()
|
|
|
|
|
(org-mode)
|
|
|
|
|
(org-clone-local-variables source)))
|
2017-06-07 18:57:38 -04:00
|
|
|
|
(lambda ()
|
|
|
|
|
(if (not inline?) (delete-region (point) (search-forward "]"))
|
|
|
|
|
(delete-region (point) (search-forward ":" nil t 2))
|
|
|
|
|
(delete-region (1- (point-max)) (point-max))
|
|
|
|
|
(when (re-search-forward "\n[ \t]*\n" nil t)
|
|
|
|
|
(user-error "Inline definitions cannot contain blank lines"))
|
|
|
|
|
;; If footnote reference belongs to a table, make sure to
|
|
|
|
|
;; remove any newline characters in order to preserve
|
|
|
|
|
;; table's structure.
|
|
|
|
|
(when (org-element-lineage definition '(table-cell))
|
|
|
|
|
(while (search-forward "\n" nil t) (replace-match "")))))
|
|
|
|
|
contents
|
2017-08-21 05:27:41 -04:00
|
|
|
|
'remote))
|
2015-04-26 08:57:36 -04:00
|
|
|
|
;; Report success.
|
|
|
|
|
t))
|
2015-04-26 04:40:30 -04:00
|
|
|
|
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
(defun org-edit-table.el ()
|
|
|
|
|
"Edit \"table.el\" table at point.
|
2016-10-15 11:36:47 -04:00
|
|
|
|
\\<org-src-mode-map>
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
A new buffer is created and the table is copied into it. Then
|
|
|
|
|
the table is recognized with `table-recognize'. When done
|
2016-10-15 11:36:47 -04:00
|
|
|
|
editing, exit with `\\[org-edit-src-exit]'. The edited text will \
|
|
|
|
|
then replace
|
|
|
|
|
the area in the Org mode buffer.
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
|
|
|
|
|
Throw an error when not at such a table."
|
|
|
|
|
(interactive)
|
|
|
|
|
(let ((element (org-element-at-point)))
|
|
|
|
|
(unless (and (eq (org-element-type element) 'table)
|
|
|
|
|
(eq (org-element-property :type element) 'table.el)
|
2015-05-02 02:37:37 -04:00
|
|
|
|
(org-src--on-datum-p element))
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
(user-error "Not in a table.el table"))
|
|
|
|
|
(org-src--edit-element
|
|
|
|
|
element
|
|
|
|
|
(org-src--construct-edit-buffer-name (buffer-name) "Table")
|
|
|
|
|
#'text-mode t)
|
2016-06-23 08:18:38 -04:00
|
|
|
|
(when (bound-and-true-p flyspell-mode) (flyspell-mode -1))
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
(table-recognize)
|
|
|
|
|
t))
|
|
|
|
|
|
2017-02-01 15:30:54 -05:00
|
|
|
|
(defun org-edit-latex-environment ()
|
|
|
|
|
"Edit LaTeX environment at point.
|
|
|
|
|
\\<org-src-mode-map>
|
|
|
|
|
The LaTeX environment is copied into a new buffer. Major mode is
|
|
|
|
|
set to the one associated to \"latex\" in `org-src-lang-modes',
|
|
|
|
|
or to `latex-mode' if there is none.
|
|
|
|
|
|
|
|
|
|
When done, exit with `\\[org-edit-src-exit]'. The edited text \
|
|
|
|
|
will then replace
|
|
|
|
|
the LaTeX environment in the Org mode buffer."
|
|
|
|
|
(interactive)
|
|
|
|
|
(let ((element (org-element-at-point)))
|
|
|
|
|
(unless (and (eq (org-element-type element) 'latex-environment)
|
|
|
|
|
(org-src--on-datum-p element))
|
|
|
|
|
(user-error "Not in a LaTeX environment"))
|
|
|
|
|
(org-src--edit-element
|
|
|
|
|
element
|
|
|
|
|
(org-src--construct-edit-buffer-name (buffer-name) "LaTeX environment")
|
|
|
|
|
(org-src--get-lang-mode "latex")
|
|
|
|
|
t)
|
|
|
|
|
t))
|
|
|
|
|
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
(defun org-edit-export-block ()
|
|
|
|
|
"Edit export block at point.
|
2016-10-15 11:36:47 -04:00
|
|
|
|
\\<org-src-mode-map>
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
A new buffer is created and the block is copied into it, and the
|
|
|
|
|
buffer is switched into an appropriate major mode. See also
|
2016-10-15 11:36:47 -04:00
|
|
|
|
`org-src-lang-modes'.
|
|
|
|
|
|
|
|
|
|
When done, exit with `\\[org-edit-src-exit]'. The edited text \
|
|
|
|
|
will then replace
|
|
|
|
|
the area in the Org mode buffer.
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
|
|
|
|
|
Throw an error when not at an export block."
|
|
|
|
|
(interactive)
|
|
|
|
|
(let ((element (org-element-at-point)))
|
|
|
|
|
(unless (and (eq (org-element-type element) 'export-block)
|
2015-05-02 02:37:37 -04:00
|
|
|
|
(org-src--on-datum-p element))
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
(user-error "Not in an export block"))
|
2017-09-07 09:27:55 -04:00
|
|
|
|
(let* ((type (downcase (or (org-element-property :type element)
|
|
|
|
|
;; Missing export-block type. Fallback
|
|
|
|
|
;; to default mode.
|
|
|
|
|
"fundamental")))
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
(mode (org-src--get-lang-mode type)))
|
|
|
|
|
(unless (functionp mode) (error "No such language mode: %s" mode))
|
|
|
|
|
(org-src--edit-element
|
2015-04-26 04:04:55 -04:00
|
|
|
|
element
|
|
|
|
|
(org-src--construct-edit-buffer-name (buffer-name) type)
|
|
|
|
|
mode
|
|
|
|
|
(lambda () (org-escape-code-in-region (point-min) (point-max)))))
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
t))
|
|
|
|
|
|
|
|
|
|
(defun org-edit-src-code (&optional code edit-buffer-name)
|
|
|
|
|
"Edit the source or example block at point.
|
2015-05-01 04:03:17 -04:00
|
|
|
|
\\<org-src-mode-map>
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
The code is copied to a separate buffer and the appropriate mode
|
2016-10-15 11:36:47 -04:00
|
|
|
|
is turned on. When done, exit with `\\[org-edit-src-exit]'. This \
|
2015-05-01 04:03:17 -04:00
|
|
|
|
will remove the
|
|
|
|
|
original code in the Org buffer, and replace it with the edited
|
|
|
|
|
version. See `org-src-window-setup' to configure the display of
|
|
|
|
|
windows containing the Org buffer and the code buffer.
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
|
|
|
|
|
When optional argument CODE is a string, edit it in a dedicated
|
|
|
|
|
buffer instead.
|
|
|
|
|
|
|
|
|
|
When optional argument EDIT-BUFFER-NAME is non-nil, use it as the
|
|
|
|
|
name of the sub-editing buffer."
|
|
|
|
|
(interactive)
|
|
|
|
|
(let* ((element (org-element-at-point))
|
|
|
|
|
(type (org-element-type element)))
|
|
|
|
|
(unless (and (memq type '(example-block src-block))
|
2015-05-02 02:37:37 -04:00
|
|
|
|
(org-src--on-datum-p element))
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
(user-error "Not in a source or example block"))
|
|
|
|
|
(let* ((lang
|
|
|
|
|
(if (eq type 'src-block) (org-element-property :language element)
|
|
|
|
|
"example"))
|
|
|
|
|
(lang-f (and (eq type 'src-block) (org-src--get-lang-mode lang)))
|
|
|
|
|
(babel-info (and (eq type 'src-block)
|
2014-12-09 11:26:02 -05:00
|
|
|
|
(org-babel-get-src-block-info 'light)))
|
|
|
|
|
deactivate-mark)
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
(when (and (eq type 'src-block) (not (functionp lang-f)))
|
|
|
|
|
(error "No such language mode: %s" lang-f))
|
|
|
|
|
(org-src--edit-element
|
|
|
|
|
element
|
|
|
|
|
(or edit-buffer-name
|
|
|
|
|
(org-src--construct-edit-buffer-name (buffer-name) lang))
|
2015-04-26 04:04:55 -04:00
|
|
|
|
lang-f
|
|
|
|
|
(and (null code)
|
2017-04-29 05:45:45 -04:00
|
|
|
|
(lambda () (org-escape-code-in-region (point-min) (point-max))))
|
2015-04-26 04:04:55 -04:00
|
|
|
|
(and code (org-unescape-code-in-string code)))
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
;; Finalize buffer.
|
2015-11-05 11:47:38 -05:00
|
|
|
|
(setq-local org-coderef-label-format
|
|
|
|
|
(or (org-element-property :label-fmt element)
|
|
|
|
|
org-coderef-label-format))
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
(when (eq type 'src-block)
|
2015-11-05 11:47:38 -05:00
|
|
|
|
(setq-local org-src--babel-info babel-info)
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
(let ((edit-prep-func (intern (concat "org-babel-edit-prep:" lang))))
|
|
|
|
|
(when (fboundp edit-prep-func)
|
|
|
|
|
(funcall edit-prep-func babel-info))))
|
|
|
|
|
t)))
|
|
|
|
|
|
2015-11-08 14:55:31 -05:00
|
|
|
|
(defun org-edit-inline-src-code ()
|
|
|
|
|
"Edit inline source code at point."
|
|
|
|
|
(interactive)
|
|
|
|
|
(let ((context (org-element-context)))
|
|
|
|
|
(unless (and (eq (org-element-type context) 'inline-src-block)
|
|
|
|
|
(org-src--on-datum-p context))
|
|
|
|
|
(user-error "Not on inline source code"))
|
|
|
|
|
(let* ((lang (org-element-property :language context))
|
|
|
|
|
(lang-f (org-src--get-lang-mode lang))
|
|
|
|
|
(babel-info (org-babel-get-src-block-info 'light))
|
|
|
|
|
deactivate-mark)
|
|
|
|
|
(unless (functionp lang-f) (error "No such language mode: %s" lang-f))
|
|
|
|
|
(org-src--edit-element
|
|
|
|
|
context
|
|
|
|
|
(org-src--construct-edit-buffer-name (buffer-name) lang)
|
|
|
|
|
lang-f
|
|
|
|
|
(lambda ()
|
|
|
|
|
;; Inline src blocks are limited to one line.
|
|
|
|
|
(while (re-search-forward "\n[ \t]*" nil t) (replace-match " "))
|
|
|
|
|
;; Trim contents.
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(skip-chars-forward " \t")
|
|
|
|
|
(delete-region (point-min) (point))
|
|
|
|
|
(goto-char (point-max))
|
|
|
|
|
(skip-chars-backward " \t")
|
|
|
|
|
(delete-region (point) (point-max))))
|
|
|
|
|
;; Finalize buffer.
|
|
|
|
|
(setq-local org-src--babel-info babel-info)
|
|
|
|
|
(setq-local org-src--preserve-indentation t)
|
|
|
|
|
(let ((edit-prep-func (intern (concat "org-babel-edit-prep:" lang))))
|
|
|
|
|
(when (fboundp edit-prep-func) (funcall edit-prep-func babel-info)))
|
|
|
|
|
;; Return success.
|
|
|
|
|
t)))
|
|
|
|
|
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
(defun org-edit-fixed-width-region ()
|
|
|
|
|
"Edit the fixed-width ASCII drawing at point.
|
2016-10-15 11:36:47 -04:00
|
|
|
|
\\<org-src-mode-map>
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
This must be a region where each line starts with a colon
|
|
|
|
|
followed by a space or a newline character.
|
|
|
|
|
|
|
|
|
|
A new buffer is created and the fixed-width region is copied into
|
|
|
|
|
it, and the buffer is switched into the major mode defined in
|
2016-10-15 11:36:47 -04:00
|
|
|
|
`org-edit-fixed-width-region-mode', which see.
|
|
|
|
|
|
|
|
|
|
When done, exit with `\\[org-edit-src-exit]'. The edited text \
|
|
|
|
|
will then replace
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
the area in the Org mode buffer."
|
|
|
|
|
(interactive)
|
|
|
|
|
(let ((element (org-element-at-point)))
|
|
|
|
|
(unless (and (eq (org-element-type element) 'fixed-width)
|
2015-05-02 02:37:37 -04:00
|
|
|
|
(org-src--on-datum-p element))
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
(user-error "Not in a fixed-width area"))
|
|
|
|
|
(org-src--edit-element
|
|
|
|
|
element
|
|
|
|
|
(org-src--construct-edit-buffer-name (buffer-name) "Fixed Width")
|
|
|
|
|
org-edit-fixed-width-region-mode
|
2015-04-26 04:04:55 -04:00
|
|
|
|
(lambda () (while (not (eobp)) (insert ": ") (forward-line))))
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
;; Return success.
|
|
|
|
|
t))
|
|
|
|
|
|
|
|
|
|
(defun org-edit-src-abort ()
|
|
|
|
|
"Abort editing of the src code and return to the Org buffer."
|
|
|
|
|
(interactive)
|
2015-04-26 04:04:55 -04:00
|
|
|
|
(let (org-src--allow-write-back) (org-edit-src-exit)))
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
|
|
|
|
|
(defun org-edit-src-continue (e)
|
|
|
|
|
"Unconditionally return to buffer editing area under point.
|
|
|
|
|
Throw an error if there is no such buffer."
|
|
|
|
|
(interactive "e")
|
|
|
|
|
(mouse-set-point e)
|
|
|
|
|
(let ((buf (get-char-property (point) 'edit-buffer)))
|
|
|
|
|
(if buf (org-src-switch-to-buffer buf 'continue)
|
|
|
|
|
(user-error "No sub-editing buffer for area at point"))))
|
|
|
|
|
|
|
|
|
|
(defun org-edit-src-save ()
|
|
|
|
|
"Save parent buffer with current state source-code buffer."
|
|
|
|
|
(interactive)
|
|
|
|
|
(unless (org-src-edit-buffer-p) (user-error "Not in a sub-editing buffer"))
|
|
|
|
|
(set-buffer-modified-p nil)
|
|
|
|
|
(let ((edited-code (org-src--contents-for-write-back))
|
|
|
|
|
(beg org-src--beg-marker)
|
|
|
|
|
(end org-src--end-marker)
|
|
|
|
|
(overlay org-src--overlay))
|
|
|
|
|
(with-current-buffer (org-src--source-buffer)
|
|
|
|
|
(undo-boundary)
|
2014-12-11 23:34:35 -05:00
|
|
|
|
(goto-char beg)
|
2015-05-01 15:14:19 -04:00
|
|
|
|
;; Temporarily disable read-only features of OVERLAY in order to
|
|
|
|
|
;; insert new contents.
|
|
|
|
|
(delete-overlay overlay)
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
(delete-region beg end)
|
2015-05-02 02:37:37 -04:00
|
|
|
|
(let ((expecting-bol (bolp)))
|
|
|
|
|
(insert edited-code)
|
|
|
|
|
(when (and expecting-bol (not (bolp))) (insert "\n")))
|
2015-05-01 15:14:19 -04:00
|
|
|
|
(save-buffer)
|
2017-02-17 16:29:06 -05:00
|
|
|
|
(move-overlay overlay beg (point))))
|
2017-02-18 08:56:41 -05:00
|
|
|
|
;; `write-contents-functions' requires the function to return
|
2017-02-17 16:29:06 -05:00
|
|
|
|
;; a non-nil value so that other functions are not called.
|
|
|
|
|
t)
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
|
|
|
|
|
(defun org-edit-src-exit ()
|
|
|
|
|
"Kill current sub-editing buffer and return to source buffer."
|
|
|
|
|
(interactive)
|
|
|
|
|
(unless (org-src-edit-buffer-p) (error "Not in a sub-editing buffer"))
|
2015-04-26 04:32:20 -04:00
|
|
|
|
(let* ((beg org-src--beg-marker)
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
(end org-src--end-marker)
|
2015-04-26 04:32:20 -04:00
|
|
|
|
(write-back org-src--allow-write-back)
|
|
|
|
|
(remote org-src--remote)
|
|
|
|
|
(coordinates (and (not remote)
|
|
|
|
|
(org-src--coordinates (point) 1 (point-max))))
|
|
|
|
|
(code (and write-back (org-src--contents-for-write-back))))
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
(set-buffer-modified-p nil)
|
|
|
|
|
;; Switch to source buffer. Kill sub-editing buffer.
|
2017-06-07 18:56:24 -04:00
|
|
|
|
(let ((edit-buffer (current-buffer))
|
|
|
|
|
(source-buffer (marker-buffer beg)))
|
|
|
|
|
(unless source-buffer (error "Source buffer disappeared. Aborting"))
|
|
|
|
|
(org-src-switch-to-buffer source-buffer 'exit)
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
(kill-buffer edit-buffer))
|
|
|
|
|
;; Insert modified code. Ensure it ends with a newline character.
|
2015-04-26 04:32:20 -04:00
|
|
|
|
(org-with-wide-buffer
|
|
|
|
|
(when (and write-back (not (equal (buffer-substring beg end) code)))
|
|
|
|
|
(undo-boundary)
|
|
|
|
|
(goto-char beg)
|
|
|
|
|
(delete-region beg end)
|
2015-05-02 02:37:37 -04:00
|
|
|
|
(let ((expecting-bol (bolp)))
|
2015-04-26 04:32:20 -04:00
|
|
|
|
(insert code)
|
2015-05-02 02:37:37 -04:00
|
|
|
|
(when (and expecting-bol (not (bolp))) (insert "\n")))))
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
;; If we are to return to source buffer, put point at an
|
|
|
|
|
;; appropriate location. In particular, if block is hidden, move
|
|
|
|
|
;; to the beginning of the block opening line.
|
2015-04-26 04:32:20 -04:00
|
|
|
|
(unless remote
|
|
|
|
|
(goto-char beg)
|
|
|
|
|
(cond
|
|
|
|
|
;; Block is hidden; move at start of block.
|
2015-11-06 07:04:20 -05:00
|
|
|
|
((cl-some (lambda (o) (eq (overlay-get o 'invisible) 'org-hide-block))
|
2017-06-07 18:56:24 -04:00
|
|
|
|
(overlays-at (point)))
|
2015-04-26 04:32:20 -04:00
|
|
|
|
(beginning-of-line 0))
|
|
|
|
|
(write-back (org-src--goto-coordinates coordinates beg end))))
|
org-src: Unify source editing tools
* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
org-edit-src-force-single-line, org-edit-src-picture,
org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
org-edit-src-beg-marker, org-edit-src-end-marker,
org-edit-src-overlay, org-edit-src-block-indentation,
org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.
(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.
(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables. Change
signature.
* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
Use new functions and variables.
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.
This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...). It introduces export block editing. It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.
2014-11-22 18:31:23 -05:00
|
|
|
|
;; Clean up left-over markers and restore window configuration.
|
|
|
|
|
(set-marker beg nil)
|
|
|
|
|
(set-marker end nil)
|
|
|
|
|
(when org-src--saved-temp-window-config
|
|
|
|
|
(set-window-configuration org-src--saved-temp-window-config)
|
|
|
|
|
(setq org-src--saved-temp-window-config nil))))
|
2010-08-17 22:37:19 -04:00
|
|
|
|
|
2010-08-16 20:55:24 -04:00
|
|
|
|
|
2009-06-07 10:27:07 -04:00
|
|
|
|
(provide 'org-src)
|
|
|
|
|
|
|
|
|
|
;;; org-src.el ends here
|