1
0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-11-26 07:33:39 +00:00
org-mode/lisp/org-src.el

1378 lines
52 KiB
EmacsLisp
Raw Normal View History

Activate lexical binding in some libraries * lisp/ob-C.el (org-babel-prep-session:C): (org-babel-load-session:C): * lisp/ob-J.el: (org-babel-expand-body:J): (org-babel-execute:J): * lisp/ob-R.el: (org-babel-expand-body:R): * lisp/ob-abc.el: (org-babel-execute:abc): (org-babel-prep-session:abc): * lisp/ob-asymptote.el: (org-babel-execute:asymptote): (org-babel-prep-session:asymptote): * lisp/ob-awk.el: (org-babel-expand-body:awk): * lisp/ob-calc.el: (org-babel-expand-body:calc): * lisp/ob-clojure.el: * lisp/ob-comint.el: (org-babel-comint-in-buffer): (org-babel-comint-with-output): (org-babel-comint-eval-invisibly-and-wait-for-file): * lisp/ob-coq.el: * lisp/ob-css.el: (org-babel-execute:css): (org-babel-prep-session:css): * lisp/ob-ditaa.el: (org-babel-execute:ditaa): (org-babel-prep-session:ditaa): * lisp/ob-dot.el: (org-babel-execute:dot): (org-babel-prep-session:dot): * lisp/ob-ebnf.el: * lisp/ob-emacs-lisp.el: * lisp/ob-eval.el: * lisp/ob-forth.el: * lisp/ob-fortran.el: (org-babel-execute:fortran): (org-babel-prep-session:fortran): (org-babel-load-session:fortran): * lisp/ob-gnuplot.el: (org-babel-expand-body:gnuplot): (org-babel-prep-session:gnuplot): (org-babel-gnuplot-initiate-session): * lisp/ob-groovy.el: (org-babel-prep-session:groovy): (org-babel-groovy-initiate-session): * lisp/ob-haskell.el: (org-babel-haskell-initiate-session): * lisp/ob-io.el: (org-babel-prep-session:io): (org-babel-io-initiate-session): * lisp/ob-java.el: (org-babel-execute:java): * lisp/ob-js.el: * lisp/ob-keys.el: * lisp/ob-latex.el: (org-babel-prep-session:latex): * lisp/ob-ledger.el: (org-babel-execute:ledger): (org-babel-prep-session:ledger): * lisp/ob-lilypond.el: (org-babel-lilypond-commands): (org-babel-lilypond-process-basic): (org-babel-prep-session:lilypond): (org-babel-lilypond-parse-line-num): * lisp/ob-lisp.el: * lisp/ob-makefile.el: (org-babel-execute:makefile): (org-babel-prep-session:makefile): * lisp/ob-matlab.el: * lisp/ob-maxima.el: (org-babel-prep-session:maxima): * lisp/ob-mscgen.el: (org-babel-prep-session:mscgen): * lisp/ob-ocaml.el: (org-babel-execute:ocaml): (org-babel-prep-session:ocaml): * lisp/ob-octave.el: (org-babel-execute:octave): (org-babel-octave-initiate-session): * lisp/ob-org.el: (org-babel-prep-session:org): * lisp/ob-perl.el: (org-babel-prep-session:perl): (org-babel-perl--var-to-perl): (org-babel-perl-initiate-session): * lisp/ob-picolisp.el: (org-babel-expand-body:picolisp): (org-babel-execute:picolisp): * lisp/ob-plantuml.el: (org-babel-execute:plantuml): (org-babel-prep-session:plantuml): * lisp/ob-processing.el: (org-babel-prep-session:processing): * lisp/ob-python.el: (org-babel-python-initiate-session): * lisp/ob-ref.el: (org-babel-ref-resolve): * lisp/ob-ruby.el: (org-babel-ruby-initiate-session): * lisp/ob-sass.el: (org-babel-execute:sass): (org-babel-prep-session:sass): * lisp/ob-scala.el: (org-babel-execute:scala): (org-babel-prep-session:scala): (org-babel-scala-initiate-session): * lisp/ob-scheme.el: * lisp/ob-screen.el: (org-babel-prep-session:screen): (org-babel-screen-session-write-temp-file): (org-babel-screen-test): * lisp/ob.el: * lisp/org-colview.el: (org-columns-todo): (org-columns-set-tags-or-toggle): (org-columns-new): (org-columns-uncompile-format): (org-agenda-colview-summarize): * lisp/org-footnote.el: (electric-indent-mode): * lisp/org-indent.el: (org-indent-refresh-maybe): * lisp/org-list.el: * lisp/org-macro.el: (org-macro--collect-macros): * lisp/org-src.el: * lisp/org-table.el: (sort-fold-case): (org-table-create): (org-table-field-info): (org-table-transpose-table-at-point): (org-table-remove-rectangle-highlight): (orgtbl-create-or-convert-from-region): (org-define-lookup-function): * lisp/ox-ascii.el: (org-ascii-format-drawer-function): (org-ascii--has-caption-p): (org-ascii-bold): (org-ascii-center-block): (org-ascii-clock): (org-ascii-code): (org-ascii-dynamic-block): (org-ascii-entity): (org-ascii-example-block): (org-ascii-export-snippet): (org-ascii-export-block): (org-ascii-fixed-width): (org-ascii-footnote-reference): (org-ascii-horizontal-rule): (org-ascii-inline-src-block): (org-ascii-format-inlinetask-default): (org-ascii-italic): (org-ascii-keyword): (org-ascii-latex-environment): (org-ascii-latex-fragment): (org-ascii-line-break): (org-ascii-node-property): (org-ascii-planning): (org-ascii-quote-block): (org-ascii-radio-target): (org-ascii-special-block): (org-ascii-src-block): (org-ascii-statistics-cookie): (org-ascii-subscript): (org-ascii-superscript): (org-ascii-strike-through): (org-ascii-timestamp): (org-ascii-underline): (org-ascii-verbatim): (org-ascii-verse-block): (org-ascii-filter-headline-blank-lines): (org-ascii-filter-paragraph-spacing): (org-ascii-filter-comment-spacing): Use lexical binding.
2015-10-26 00:56:00 +00:00
;;; org-src.el --- Source code examples in Org -*- lexical-binding: t; -*-
;;
2022-01-01 20:10:55 +00:00
;; Copyright (C) 2004-2022 Free Software Foundation, Inc.
;;
;; Author: Carsten Dominik <carsten.dominik@gmail.com>
;; Bastien Guerry <bzg@gnu.org>
;; Dan Davison <davison at stats dot ox dot ac dot uk>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: https://orgmode.org
;;
;; 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
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;;; Commentary:
;; This file contains the code dealing with source code examples in
;; Org mode.
;;; Code:
(require 'cl-lib)
(require 'ob-comint)
(require 'org-macs)
(require 'org-compat)
(require 'org-keys)
(declare-function org--get-expected-indentation "org" (element contentsp))
(declare-function org-mode "org" ())
(declare-function org--get-expected-indentation "org" (element contentsp))
2022-01-06 17:39:05 +00:00
(declare-function org-element-at-point "org-element" (&optional pom cached-only))
2016-10-25 11:23:31 +00:00
(declare-function org-element-class "org-element" (datum &optional parent))
(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--parse-paired-brackets "org-element" (char))
(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))
2015-10-26 08:29:13 +00:00
(defvar org-inhibit-startup)
2009-06-07 15:07:07 +00: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.
If you want to regularly save the base buffer instead of the source
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)
(defcustom org-edit-src-auto-save-idle-delay 0
"Delay before saving a source code buffer back into its base buffer.
When a positive integer N, save after N seconds of idle time.
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."
:group 'org-edit-structure
:version "24.4"
:package-version '(Org . "8.0")
:type 'integer)
(defcustom org-coderef-label-format "(ref:%s)"
"The default coderef format.
This format string will be used to search for coderef labels in literal
examples (EXAMPLE and SRC blocks). The format can be overwritten in
2010-05-01 02:53:53 +00:00
an individual literal example with the -l option, like
#+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)")))
(defcustom org-src-preserve-indentation nil
"If non-nil preserve leading whitespace characters on export.
Improve docstrings * lisp/ob-core.el (org-confirm-babel-evaluate): (org-babel-no-eval-on-ctrl-c-ctrl-c): (org-babel-hash-at-point): * lisp/org-agenda.el (org-agenda-custom-commands): (org-stuck-projects): (org-agenda): (org-timeline): (org-todo-list): (org-agenda-filter-by-tag): (org-agenda-log-mode): (org-agenda-refile): (org-agenda-show-and-scroll-up): (org-agenda-tree-to-indirect-buffer): (org-agenda-show-the-flagging-note): (org-agenda-to-appt): * lisp/org-capture.el (org-capture-mode): (org-capture-use-agenda-date): (org-capture): * lisp/org-clock.el (org-clock-in): (org-clock-display): * lisp/org-colview.el (org-columns--display-here): (org-columns): * lisp/org-footnote.el (org-footnote-section): * lisp/org-gnus.el (org-gnus-prefer-web-links): * lisp/org-lint.el (org-lint): * lisp/org-list.el (org-plain-list-ordered-item-terminator): (org-list-allow-alphabetical): (org-list-automatic-rules): (org-list-use-circular-motion): * lisp/org-protocol.el (org-protocol-store-link): (org-protocol-create-for-org): * lisp/org-src.el (org-src-preserve-indentation): (org-edit-src-content-indentation): (org-src-mode-hook): (org-src-mode): (org-edit-table.el): (org-edit-export-block): (org-edit-src-code): (org-edit-fixed-width-region): * lisp/org-table.el (org-table-automatic-realign): (org-table-copy-increment): (org-table-formula-evaluate-inline): (org-table-allow-automatic-line-recalculation): (org-table-edit-field): (orgtbl-ascii-plot): * lisp/org-timer.el (org-timer): * lisp/org.el (org-deadline-string): (org-comment-string): (org-ellipsis): (org-show-context-detail): (org-indirect-buffer-display): (org-cycle-global-at-bob): (org-insert-heading-respect-content): (org-enable-table-editor): (org-context-in-file-links): (org-display-internal-link-with-indirect-buffer): (org-file-apps): (org-refile-targets): (org-todo-keywords): (org-use-fast-todo-selection): (org-treat-insert-todo-heading-as-state-change): (org-time-clocksum-use-fractional): (org-time-clocksum-use-effort-durations): (org-agenda-files): (org-cycle-hide-archived-subtrees): (org-cycle): (org-global-cycle): (org-tree-to-indirect-buffer): (org-insert-heading): (org-store-link): (org-insert-link): (org-mark-ring-push): (org-refile): (org-todo): (org-show-todo-tree): (org-reveal): (org-check-deadlines): (org-switchb): (org-cdlatex-mode): (org-toggle-latex-fragment): (org-ctrl-c-ctrl-c): (org-toggle-heading): (org-indent-line): (org-yank): (org-speedbar-set-agenda-restriction): * lisp/ox-html.el (org-html-htmlize-output-type): * lisp/ox-icalendar.el (org-icalendar-combined-agenda-file): * lisp/ox-publish.el (org-publish-project-alist): * lisp/ox.el (org-export-in-background): (org-export-stack-mode): (org-export--stack-source-at-point): (org-export-dispatch): Improve quotes and formatting in docstrings.
2016-10-15 15:36:47 +00:00
\\<org-mode-map>
If non-nil leading whitespace characters in source code blocks
are preserved on export, and when switching between the org
buffer and the language mode edit buffer.
Improve docstrings * lisp/ob-core.el (org-confirm-babel-evaluate): (org-babel-no-eval-on-ctrl-c-ctrl-c): (org-babel-hash-at-point): * lisp/org-agenda.el (org-agenda-custom-commands): (org-stuck-projects): (org-agenda): (org-timeline): (org-todo-list): (org-agenda-filter-by-tag): (org-agenda-log-mode): (org-agenda-refile): (org-agenda-show-and-scroll-up): (org-agenda-tree-to-indirect-buffer): (org-agenda-show-the-flagging-note): (org-agenda-to-appt): * lisp/org-capture.el (org-capture-mode): (org-capture-use-agenda-date): (org-capture): * lisp/org-clock.el (org-clock-in): (org-clock-display): * lisp/org-colview.el (org-columns--display-here): (org-columns): * lisp/org-footnote.el (org-footnote-section): * lisp/org-gnus.el (org-gnus-prefer-web-links): * lisp/org-lint.el (org-lint): * lisp/org-list.el (org-plain-list-ordered-item-terminator): (org-list-allow-alphabetical): (org-list-automatic-rules): (org-list-use-circular-motion): * lisp/org-protocol.el (org-protocol-store-link): (org-protocol-create-for-org): * lisp/org-src.el (org-src-preserve-indentation): (org-edit-src-content-indentation): (org-src-mode-hook): (org-src-mode): (org-edit-table.el): (org-edit-export-block): (org-edit-src-code): (org-edit-fixed-width-region): * lisp/org-table.el (org-table-automatic-realign): (org-table-copy-increment): (org-table-formula-evaluate-inline): (org-table-allow-automatic-line-recalculation): (org-table-edit-field): (orgtbl-ascii-plot): * lisp/org-timer.el (org-timer): * lisp/org.el (org-deadline-string): (org-comment-string): (org-ellipsis): (org-show-context-detail): (org-indirect-buffer-display): (org-cycle-global-at-bob): (org-insert-heading-respect-content): (org-enable-table-editor): (org-context-in-file-links): (org-display-internal-link-with-indirect-buffer): (org-file-apps): (org-refile-targets): (org-todo-keywords): (org-use-fast-todo-selection): (org-treat-insert-todo-heading-as-state-change): (org-time-clocksum-use-fractional): (org-time-clocksum-use-effort-durations): (org-agenda-files): (org-cycle-hide-archived-subtrees): (org-cycle): (org-global-cycle): (org-tree-to-indirect-buffer): (org-insert-heading): (org-store-link): (org-insert-link): (org-mark-ring-push): (org-refile): (org-todo): (org-show-todo-tree): (org-reveal): (org-check-deadlines): (org-switchb): (org-cdlatex-mode): (org-toggle-latex-fragment): (org-ctrl-c-ctrl-c): (org-toggle-heading): (org-indent-line): (org-yank): (org-speedbar-set-agenda-restriction): * lisp/ox-html.el (org-html-htmlize-output-type): * lisp/ox-icalendar.el (org-icalendar-combined-agenda-file): * lisp/ox-publish.el (org-publish-project-alist): * lisp/ox.el (org-export-in-background): (org-export-stack-mode): (org-export--stack-source-at-point): (org-export-dispatch): Improve quotes and formatting in docstrings.
2016-10-15 15:36:47 +00:00
When this variable is nil, after editing with `\\[org-edit-src-code]',
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'."
:group 'org-edit-structure
:type 'boolean)
(defcustom org-edit-src-content-indentation 2
"Indentation for the content of a source code block.
Improve docstrings * lisp/ob-core.el (org-confirm-babel-evaluate): (org-babel-no-eval-on-ctrl-c-ctrl-c): (org-babel-hash-at-point): * lisp/org-agenda.el (org-agenda-custom-commands): (org-stuck-projects): (org-agenda): (org-timeline): (org-todo-list): (org-agenda-filter-by-tag): (org-agenda-log-mode): (org-agenda-refile): (org-agenda-show-and-scroll-up): (org-agenda-tree-to-indirect-buffer): (org-agenda-show-the-flagging-note): (org-agenda-to-appt): * lisp/org-capture.el (org-capture-mode): (org-capture-use-agenda-date): (org-capture): * lisp/org-clock.el (org-clock-in): (org-clock-display): * lisp/org-colview.el (org-columns--display-here): (org-columns): * lisp/org-footnote.el (org-footnote-section): * lisp/org-gnus.el (org-gnus-prefer-web-links): * lisp/org-lint.el (org-lint): * lisp/org-list.el (org-plain-list-ordered-item-terminator): (org-list-allow-alphabetical): (org-list-automatic-rules): (org-list-use-circular-motion): * lisp/org-protocol.el (org-protocol-store-link): (org-protocol-create-for-org): * lisp/org-src.el (org-src-preserve-indentation): (org-edit-src-content-indentation): (org-src-mode-hook): (org-src-mode): (org-edit-table.el): (org-edit-export-block): (org-edit-src-code): (org-edit-fixed-width-region): * lisp/org-table.el (org-table-automatic-realign): (org-table-copy-increment): (org-table-formula-evaluate-inline): (org-table-allow-automatic-line-recalculation): (org-table-edit-field): (orgtbl-ascii-plot): * lisp/org-timer.el (org-timer): * lisp/org.el (org-deadline-string): (org-comment-string): (org-ellipsis): (org-show-context-detail): (org-indirect-buffer-display): (org-cycle-global-at-bob): (org-insert-heading-respect-content): (org-enable-table-editor): (org-context-in-file-links): (org-display-internal-link-with-indirect-buffer): (org-file-apps): (org-refile-targets): (org-todo-keywords): (org-use-fast-todo-selection): (org-treat-insert-todo-heading-as-state-change): (org-time-clocksum-use-fractional): (org-time-clocksum-use-effort-durations): (org-agenda-files): (org-cycle-hide-archived-subtrees): (org-cycle): (org-global-cycle): (org-tree-to-indirect-buffer): (org-insert-heading): (org-store-link): (org-insert-link): (org-mark-ring-push): (org-refile): (org-todo): (org-show-todo-tree): (org-reveal): (org-check-deadlines): (org-switchb): (org-cdlatex-mode): (org-toggle-latex-fragment): (org-ctrl-c-ctrl-c): (org-toggle-heading): (org-indent-line): (org-yank): (org-speedbar-set-agenda-restriction): * lisp/ox-html.el (org-html-htmlize-output-type): * lisp/ox-icalendar.el (org-icalendar-combined-agenda-file): * lisp/ox-publish.el (org-publish-project-alist): * lisp/ox.el (org-export-in-background): (org-export-stack-mode): (org-export--stack-source-at-point): (org-export-dispatch): Improve quotes and formatting in docstrings.
2016-10-15 15:36:47 +00: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
Improve docstrings * lisp/ob-core.el (org-confirm-babel-evaluate): (org-babel-no-eval-on-ctrl-c-ctrl-c): (org-babel-hash-at-point): * lisp/org-agenda.el (org-agenda-custom-commands): (org-stuck-projects): (org-agenda): (org-timeline): (org-todo-list): (org-agenda-filter-by-tag): (org-agenda-log-mode): (org-agenda-refile): (org-agenda-show-and-scroll-up): (org-agenda-tree-to-indirect-buffer): (org-agenda-show-the-flagging-note): (org-agenda-to-appt): * lisp/org-capture.el (org-capture-mode): (org-capture-use-agenda-date): (org-capture): * lisp/org-clock.el (org-clock-in): (org-clock-display): * lisp/org-colview.el (org-columns--display-here): (org-columns): * lisp/org-footnote.el (org-footnote-section): * lisp/org-gnus.el (org-gnus-prefer-web-links): * lisp/org-lint.el (org-lint): * lisp/org-list.el (org-plain-list-ordered-item-terminator): (org-list-allow-alphabetical): (org-list-automatic-rules): (org-list-use-circular-motion): * lisp/org-protocol.el (org-protocol-store-link): (org-protocol-create-for-org): * lisp/org-src.el (org-src-preserve-indentation): (org-edit-src-content-indentation): (org-src-mode-hook): (org-src-mode): (org-edit-table.el): (org-edit-export-block): (org-edit-src-code): (org-edit-fixed-width-region): * lisp/org-table.el (org-table-automatic-realign): (org-table-copy-increment): (org-table-formula-evaluate-inline): (org-table-allow-automatic-line-recalculation): (org-table-edit-field): (orgtbl-ascii-plot): * lisp/org-timer.el (org-timer): * lisp/org.el (org-deadline-string): (org-comment-string): (org-ellipsis): (org-show-context-detail): (org-indirect-buffer-display): (org-cycle-global-at-bob): (org-insert-heading-respect-content): (org-enable-table-editor): (org-context-in-file-links): (org-display-internal-link-with-indirect-buffer): (org-file-apps): (org-refile-targets): (org-todo-keywords): (org-use-fast-todo-selection): (org-treat-insert-todo-heading-as-state-change): (org-time-clocksum-use-fractional): (org-time-clocksum-use-effort-durations): (org-agenda-files): (org-cycle-hide-archived-subtrees): (org-cycle): (org-global-cycle): (org-tree-to-indirect-buffer): (org-insert-heading): (org-store-link): (org-insert-link): (org-mark-ring-push): (org-refile): (org-todo): (org-show-todo-tree): (org-reveal): (org-check-deadlines): (org-switchb): (org-cdlatex-mode): (org-toggle-latex-fragment): (org-ctrl-c-ctrl-c): (org-toggle-heading): (org-indent-line): (org-yank): (org-speedbar-set-agenda-restriction): * lisp/ox-html.el (org-html-htmlize-output-type): * lisp/ox-icalendar.el (org-icalendar-combined-agenda-file): * lisp/ox-publish.el (org-publish-project-alist): * lisp/ox.el (org-export-in-background): (org-export-stack-mode): (org-export--stack-source-at-point): (org-export-dispatch): Improve quotes and formatting in docstrings.
2016-10-15 15:36:47 +00:00
editing it with `\\[org-edit-src-code]'.
It has no effect if `org-src-preserve-indentation' is non-nil."
:group 'org-edit-structure
:type 'integer
:safe #'wholenump)
(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
first line of the window showing the editing buffer."
:group 'org-edit-structure
:type 'boolean)
(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)
(defcustom org-src-window-setup 'reorganize-frame
"How the source code edit buffer should be displayed.
Possible values for this option are:
plain Show edit buffer using `display-buffer'. Users can
further control the display behavior by modifying
`display-buffer-alist' and its relatives.
current-window Show edit buffer in the current window, keeping all other
windows.
split-window-below Show edit buffer below the current window, keeping all
other windows.
split-window-right Show edit buffer to the right of the current window,
keeping all other windows.
other-window Use `switch-to-buffer-other-window' to display edit buffer.
reorganize-frame Show only two windows on the current frame, the current
window and the edit buffer.
other-frame Use `switch-to-buffer-other-frame' to display edit buffer.
Also, when exiting the edit buffer, kill that frame.
Values that modify the window layout (reorganize-frame, split-window-below,
split-window-right) will restore the layout after exiting the edit buffer."
:group 'org-edit-structure
:type '(choice
(const current-window)
(const split-window-below)
(const split-window-right)
(const other-frame)
(const other-window)
(const reorganize-frame)))
(defvar org-src-mode-hook nil
"Hook run after Org switched a source code snippet to its Emacs mode.
\\<org-mode-map>
This hook will run:
Improve docstrings * lisp/ob-core.el (org-confirm-babel-evaluate): (org-babel-no-eval-on-ctrl-c-ctrl-c): (org-babel-hash-at-point): * lisp/org-agenda.el (org-agenda-custom-commands): (org-stuck-projects): (org-agenda): (org-timeline): (org-todo-list): (org-agenda-filter-by-tag): (org-agenda-log-mode): (org-agenda-refile): (org-agenda-show-and-scroll-up): (org-agenda-tree-to-indirect-buffer): (org-agenda-show-the-flagging-note): (org-agenda-to-appt): * lisp/org-capture.el (org-capture-mode): (org-capture-use-agenda-date): (org-capture): * lisp/org-clock.el (org-clock-in): (org-clock-display): * lisp/org-colview.el (org-columns--display-here): (org-columns): * lisp/org-footnote.el (org-footnote-section): * lisp/org-gnus.el (org-gnus-prefer-web-links): * lisp/org-lint.el (org-lint): * lisp/org-list.el (org-plain-list-ordered-item-terminator): (org-list-allow-alphabetical): (org-list-automatic-rules): (org-list-use-circular-motion): * lisp/org-protocol.el (org-protocol-store-link): (org-protocol-create-for-org): * lisp/org-src.el (org-src-preserve-indentation): (org-edit-src-content-indentation): (org-src-mode-hook): (org-src-mode): (org-edit-table.el): (org-edit-export-block): (org-edit-src-code): (org-edit-fixed-width-region): * lisp/org-table.el (org-table-automatic-realign): (org-table-copy-increment): (org-table-formula-evaluate-inline): (org-table-allow-automatic-line-recalculation): (org-table-edit-field): (orgtbl-ascii-plot): * lisp/org-timer.el (org-timer): * lisp/org.el (org-deadline-string): (org-comment-string): (org-ellipsis): (org-show-context-detail): (org-indirect-buffer-display): (org-cycle-global-at-bob): (org-insert-heading-respect-content): (org-enable-table-editor): (org-context-in-file-links): (org-display-internal-link-with-indirect-buffer): (org-file-apps): (org-refile-targets): (org-todo-keywords): (org-use-fast-todo-selection): (org-treat-insert-todo-heading-as-state-change): (org-time-clocksum-use-fractional): (org-time-clocksum-use-effort-durations): (org-agenda-files): (org-cycle-hide-archived-subtrees): (org-cycle): (org-global-cycle): (org-tree-to-indirect-buffer): (org-insert-heading): (org-store-link): (org-insert-link): (org-mark-ring-push): (org-refile): (org-todo): (org-show-todo-tree): (org-reveal): (org-check-deadlines): (org-switchb): (org-cdlatex-mode): (org-toggle-latex-fragment): (org-ctrl-c-ctrl-c): (org-toggle-heading): (org-indent-line): (org-yank): (org-speedbar-set-agenda-restriction): * lisp/ox-html.el (org-html-htmlize-output-type): * lisp/ox-icalendar.el (org-icalendar-combined-agenda-file): * lisp/ox-publish.el (org-publish-project-alist): * lisp/ox.el (org-export-in-background): (org-export-stack-mode): (org-export--stack-source-at-point): (org-export-dispatch): Improve quotes and formatting in docstrings.
2016-10-15 15:36:47 +00:00
- when editing a source code snippet with `\\[org-edit-special]'
- when formatting a source code snippet for export with htmlize.
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.")
(defcustom org-src-lang-modes
'(("C" . c)
("C++" . c++)
("asymptote" . asy)
("bash" . sh)
("beamer" . latex)
("calc" . fundamental)
("cpp" . c++)
("ditaa" . artist)
("desktop" . conf-desktop)
("dot" . fundamental)
("elisp" . emacs-lisp)
("ocaml" . tuareg)
("screen" . shell-script)
("shell" . sh)
("sqlite" . sql)
("toml" . conf-toml))
"Alist mapping languages to their major mode.
The key is the language name. The value is the mode name, as
a string or a symbol, without the \"-mode\" suffix.
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"))))
(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"))))
Change :version in defcustoms from "25.2" to "26.1" * lisp/ob-J.el (org-babel-J-command): * lisp/ob-core.el (org-babel-hash-show-time): * lisp/ob-exp.el (org-babel-exp-inline-code-template): * lisp/ob-lisp.el (org-babel-lisp-eval-fn): * lisp/org-agenda.el (org-agenda-view-columns-initially): * lisp/org-attach.el (org-attach-commit): (org-attach-archive-delete): (org-attach-annex-auto-get): * lisp/org-bibtex.el (org-bibtex-inherit-tags): * lisp/org-clock.el (org-clock-into-drawer): * lisp/org-colview.el (org-columns-summary-types): * lisp/org-faces.el (org-block): * lisp/org-src.el (org-src-block-faces): * lisp/org-table.el (org-table-copy-increment): (org-table-formula-create-columns): (org-table-convert-region-max-lines): * lisp/org-timer.el (org-timer-default-timer): * lisp/org.el (org-export-backends): (org-show-context-detail): (org-cycle-hook): (org-occur-case-fold-search): (org-preview-latex-default-process): (org-preview-latex-process-alist): (org-preview-latex-image-directory): (org-latex-default-packages-alist): (org-sparse-tree-default-date-type): (org-structure-template-alist): (org-effort-durations): (org-agenda-ignore-properties): Change :version from "25.2" to "26.1". (customize-package-emacs-version-alist): Fix associations between Org and Emacs releases. * lisp/ox-ascii.el (org-ascii-list-margin): * lisp/ox-beamer.el (org-beamer-subtitle-format): * lisp/ox-html.el (org-html-format-headline-function): (org-html-format-inlinetask-function): (org-html-viewport): * lisp/ox-latex.el (org-latex-caption-above): (org-latex-prefer-user-labels): (org-latex-subtitle-format): (org-latex-hyperref-template): (org-latex-footnote-defined-format): (org-latex-images-centered): (org-latex-default-figure-position): (org-latex-text-markup-alist): (org-latex-format-inlinetask-function): (org-latex-custom-lang-environments): (org-latex-compiler-file-string): (org-latex-compiler): (org-latex-bib-compiler): (org-latex-logfiles-extensions): (org-latex-known-warnings): * lisp/ox-md.el (org-md-footnotes-section): (org-md-footnote-format): * lisp/ox-odt.el (org-odt-format-headline-function): (org-odt-format-inlinetask-function): (org-odt-inline-image-rules): * lisp/ox-texinfo.el (org-texinfo-format-headline-function): * lisp/ox.el (org-export-with-creator): (org-export-with-title): (org-export-with-broken-links): (org-export-copy-to-kill-ring): Change :version from "25.2" to "26.1". It looks like the goal is to sync Org 9.0.* (maint) with the Emacs master branch (what will be version 26.1): https://lists.gnu.org/archive/html/emacs-orgmode/2017-01/msg00558.html
2017-01-26 04:39:18 +00:00
:version "26.1"
:package-version '(Org . "9.0"))
(defcustom org-src-tab-acts-natively t
"If non-nil, TAB uses the language's major-mode binding in code blocks."
:type 'boolean
:package-version '(Org . "9.4")
:group 'org-babel)
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 23:31:23 +00:00
;;; Internal functions and variables
(defvar org-src--auto-save-timer nil
"Idle Timer auto-saving remote editing buffers.")
(defvar-local org-src--allow-write-back t)
(put 'org-src--allow-write-back 'permanent-local t)
(defvar-local org-src--babel-info nil)
(put 'org-src--babel-info 'permanent-local t)
(defvar-local org-src--beg-marker nil)
(put 'org-src--beg-marker 'permanent-local t)
(defvar-local org-src--block-indentation nil)
(put 'org-src--block-indentation 'permanent-local t)
(defvar-local org-src--content-indentation nil)
(put 'org-src--content-indentation 'permanent-local t)
(defvar-local org-src--end-marker nil)
(put 'org-src--end-marker 'permanent-local t)
(defvar-local org-src--from-org-mode nil)
(put 'org-src--from-org-mode 'permanent-local t)
(defvar-local org-src--overlay nil)
(put 'org-src--overlay 'permanent-local t)
(defvar-local org-src--preserve-indentation nil)
(put 'org-src--preserve-indentation 'permanent-local t)
(defvar-local org-src--remote nil)
(put 'org-src--remote 'permanent-local t)
(defvar-local org-src--saved-temp-window-config nil)
(put 'org-src--saved-temp-window-config 'permanent-local t)
(defvar-local org-src--source-type nil
"Type of element being edited, as a symbol.")
(put 'org-src--source-type 'permanent-local t)
(defvar-local 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.")
(put 'org-src--tab-width 'permanent-local t)
(defvar-local org-src-source-file-name nil
"File name associated to Org source buffer, or nil.")
(put 'org-src-source-file-name 'permanent-local t)
(defvar-local org-src--preserve-blank-line nil)
(put 'org-src--preserve-blank-line 'permanent-local 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 23:31:23 +00:00
(defun org-src--construct-edit-buffer-name (org-buffer-name lang)
"Construct the buffer name for a source editing buffer.
Format is \"*Org Src ORG-BUFFER-NAME [ LANG ]*\"."
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 23:31:23 +00:00
(concat "*Org Src " org-buffer-name "[ " lang " ]*"))
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 23:31:23 +00: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)
(= 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 23:31:23 +00:00
(throw 'exit b))))))
(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 (save-excursion (goto-char beg) (line-beginning-position))
(line-beginning-position))
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 23:31:23 +00:00
;; Column is relative to the end of line to avoid problems of
;; comma escaping or colons appended in front of the line.
(- (point) (min end (line-end-position)))))))
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 23:31:23 +00:00
(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))
(max (point)
(+ (min end (line-end-position))
(cdr coord)))))))
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 23:31:23 +00:00
(defun org-src--contents-area (datum)
"Return contents boundaries of DATUM.
DATUM is an element or object. Return a list (BEG END CONTENTS)
where BEG and END are buffer positions and CONTENTS is a string."
(let ((type (org-element-type datum)))
(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))))
((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))))
((eq type 'latex-fragment)
(let ((beg (org-element-property :begin datum))
(end (org-with-point-at (org-element-property :end datum)
(skip-chars-backward " \t")
(point))))
(list beg end (buffer-substring-no-properties beg end))))
((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)))
((memq type '(fixed-width latex-environment table))
(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 23:31:23 +00: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))
(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 23:31:23 +00:00
overlay))
(defun org-src--remove-overlay ()
"Remove overlay from current source buffer."
(when (overlayp org-src--overlay) (delete-overlay org-src--overlay)))
(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 23:31:23 +00:00
(<= (point)
(org-with-wide-buffer
(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 23:31:23 +00:00
(skip-chars-backward " \r\t\n")
(if (eq (org-element-class datum) 'element)
(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 23:31:23 +00:00
(defun org-src--contents-for-write-back (write-back-buf)
"Populate WRITE-BACK-BUF with contents in the appropriate 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 23:31:23 +00:00
Assume point is in the corresponding edit buffer."
(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-src--content-indentation
0))))
(use-tabs? (and (> org-src--tab-width 0) t))
(preserve-fl (eq org-src--source-type 'latex-fragment))
(source-tab-width org-src--tab-width)
(contents (org-with-wide-buffer
(let ((eol (line-end-position)))
(list (buffer-substring (point-min) eol)
(buffer-substring eol (point-max))))))
(write-back org-src--allow-write-back)
(preserve-blank-line org-src--preserve-blank-line)
marker)
(with-current-buffer write-back-buf
;; Reproduce indentation parameters from source buffer.
(setq indent-tabs-mode use-tabs?)
(when (> source-tab-width 0) (setq tab-width source-tab-width))
;; Apply WRITE-BACK function on edit buffer contents.
(insert (org-no-properties (car contents)))
(setq marker (point-marker))
(insert (org-no-properties (car (cdr 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 23:31:23 +00:00
(goto-char (point-min))
(when (functionp write-back) (save-excursion (funcall write-back)))
;; Add INDENTATION-OFFSET to every line in buffer,
;; unless indentation is meant to be preserved.
(when (> indentation-offset 0)
(when preserve-fl (forward-line))
(while (not (eobp))
(skip-chars-forward " \t")
(when (or (not (eolp)) ; not a blank line
(and (eq (point) (marker-position marker)) ; current line
preserve-blank-line))
(let ((i (current-column)))
(delete-region (line-beginning-position) (point))
(indent-to (+ i indentation-offset))))
(forward-line)))
(set-marker marker 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 23:31:23 +00:00
(defun org-src--edit-element
(datum name &optional initialize write-back contents remote)
"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 23:31:23 +00:00
INITIALIZE is a function to call upon creating the buffer.
When WRITE-BACK is non-nil, assume contents will replace original
region. Moreover, if it is a function, apply it in the edit
buffer, from point min, before returning the contents.
When CONTENTS is non-nil, display them in the edit buffer.
Otherwise, show DATUM contents as specified by
`org-src--contents-area'.
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 23:31:23 +00:00
Leave point in edit buffer."
(when (memq org-src-window-setup '(reorganize-frame
split-window-below
split-window-right))
(setq org-src--saved-temp-window-config (current-window-configuration)))
(let* ((area (org-src--contents-area datum))
(beg (copy-marker (nth 0 area)))
(end (copy-marker (nth 1 area) t))
(old-edit-buffer (org-src--edit-buffer beg end))
(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 23:31:23 +00: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
(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 23:31:23 +00:00
(kill-buffer old-edit-buffer))
(let* ((org-mode-p (derived-mode-p 'org-mode))
(source-file-name (buffer-file-name (buffer-base-buffer)))
(source-tab-width (if indent-tabs-mode tab-width 0))
(type (org-element-type datum))
(block-ind (org-with-point-at (org-element-property :begin datum)
(cond
((save-excursion (skip-chars-backward " \t") (bolp))
(current-indentation))
((org-element-property :parent datum)
(org--get-expected-indentation
(org-element-property :parent datum) nil))
(t (current-indentation)))))
(content-ind org-edit-src-content-indentation)
(blank-line (save-excursion (beginning-of-line)
(looking-at-p "^[[:space:]]*$")))
(empty-line (and blank-line (looking-at-p "^$")))
(preserve-blank-line (or (and blank-line (not empty-line))
(and empty-line (= (+ block-ind content-ind) 0))))
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 23:31:23 +00:00
(preserve-ind
(and (memq type '(example-block src-block))
(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 23:31:23 +00:00
org-src-preserve-indentation)))
;; Store relative positions of mark (if any) and point
;; within the edited area.
(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 23:31:23 +00: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.
(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 23:31:23 +00:00
;; Insert contents.
(insert contents)
(remove-text-properties (point-min) (point-max)
'(display nil invisible nil intangible nil))
(let ((lf (eq type 'latex-fragment)))
(unless preserve-ind (org-do-remove-indentation (and lf block-ind) lf)))
(set-buffer-modified-p nil)
(setq buffer-file-name nil)
;; 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 23:31:23 +00:00
(let ((org-inhibit-startup t))
(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 23:31:23 +00:00
;; Transmit buffer-local variables for exit function. It must
;; be done after initializing major mode, as this operation
;; may reset them otherwise.
(setq org-src--tab-width source-tab-width)
(setq org-src--from-org-mode org-mode-p)
(setq org-src--beg-marker beg)
(setq org-src--end-marker end)
(setq org-src--remote remote)
(setq org-src--source-type type)
(setq org-src--block-indentation block-ind)
(setq org-src--content-indentation content-ind)
(setq org-src--preserve-indentation preserve-ind)
(setq org-src--overlay overlay)
(setq org-src--allow-write-back write-back)
(setq org-src-source-file-name source-file-name)
(setq org-src--preserve-blank-line preserve-blank-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 23:31:23 +00:00
;; Start minor mode.
(org-src-mode)
;; Clear undo information so we cannot undo back to the
;; initial empty buffer.
(buffer-disable-undo (current-buffer))
(buffer-enable-undo)
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 23:31:23 +00:00
;; Move mark and point in edit buffer to the corresponding
;; location.
(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 23:31:23 +00:00
;;; Fontification of source blocks
(defvar org-src-fontify-natively) ; Defined in org.el
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 23:31:23 +00:00
(defun org-src-font-lock-fontify-block (lang start end)
"Fontify code block between START and END using LANG's syntax.
This function is called by Emacs' automatic fontification, as long
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 23:31:23 +00:00
as `org-src-fontify-natively' is non-nil."
(let ((lang-mode (org-src-get-lang-mode lang)))
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 23:31:23 +00:00
(when (fboundp lang-mode)
(let ((string (buffer-substring-no-properties start end))
(modified (buffer-modified-p))
(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 23:31:23 +00:00
(remove-text-properties start end '(face nil))
(with-current-buffer
(get-buffer-create
(format " *org-src-fontification:%s*" lang-mode))
(let ((inhibit-modification-hooks nil))
(erase-buffer)
;; Add string and a final space to ensure property change.
(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)))
(set-buffer-modified-p nil))
;; Add Org faces.
(let ((src-face (nth 1 (assoc-string lang org-src-block-faces t))))
(when (or (facep src-face) (listp src-face))
(font-lock-append-text-property start end 'face src-face))
(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 23:31:23 +00:00
(add-text-properties
start end
'(font-lock-fontified t fontified t font-lock-multiline t))
(set-buffer-modified-p modified)))))
(defun org-fontify-inline-src-blocks (limit)
"Try to apply `org-fontify-inline-src-blocks-1'."
(condition-case nil
(org-fontify-inline-src-blocks-1 limit)
(error (message "Org mode fontification error in %S at %d"
(current-buffer)
(line-number-at-pos)))))
(defun org-fontify-inline-src-blocks-1 (limit)
"Fontify inline src_LANG blocks, from `point' up to LIMIT."
(let ((case-fold-search t))
;; The regexp below is copied from `org-element-inline-src-block-parser'.
(while (re-search-forward "\\_<src_\\([^ \t\n[{]+\\)[{[]?" limit t)
(let ((beg (match-beginning 0))
(lang-beg (match-beginning 1))
(lang-end (match-end 1))
pt)
(font-lock-append-text-property
lang-beg lang-end 'face 'org-meta-line)
(font-lock-append-text-property
beg lang-beg 'face 'shadow)
(font-lock-append-text-property
beg lang-end 'face 'org-inline-src-block)
(setq pt (goto-char lang-end))
;; `org-element--parse-paired-brackets' doesn't take a limit, so to
;; prevent it searching the entire rest of the buffer we temporarily
;; narrow the active region.
(save-restriction
(narrow-to-region beg
(min limit (or (save-excursion
(and (search-forward"\n" limit t 2)
(point)))
(point-max))))
(when (ignore-errors (org-element--parse-paired-brackets ?\[))
(font-lock-append-text-property
pt (point) 'face 'org-inline-src-block)
(setq pt (point)))
(when (ignore-errors (org-element--parse-paired-brackets ?\{))
(remove-text-properties pt (point) '(face nil))
(font-lock-append-text-property
pt (1+ pt) 'face '(org-inline-src-block shadow))
(unless (= (1+ pt) (1- (point)))
(if org-src-fontify-natively
(org-src-font-lock-fontify-block
(buffer-substring-no-properties lang-beg lang-end)
(1+ pt) (1- (point)))
(font-lock-append-text-property
(1+ pt) (1- (point)) 'face 'org-inline-src-block)))
(font-lock-append-text-property
(1- (point)) (point) 'face '(org-inline-src-block shadow))
(setq pt (point)))))
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 23:31:23 +00:00
;;; Escape contents
(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."
(interactive "r")
(save-excursion
(goto-char end)
(while (re-search-backward "^[ \t]*\\(,*\\(?:\\*\\|#\\+\\)\\)" beg t)
(save-excursion (replace-match ",\\1" nil nil nil 1)))))
(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."
(replace-regexp-in-string "^[ \t]*\\(,*\\(?:\\*\\|#\\+\\)\\)" ",\\1"
s nil nil 1))
(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
(goto-char end)
(while (re-search-backward "^[ \t]*,*\\(,\\)\\(?:\\*\\|#\\+\\)" beg t)
(save-excursion (replace-match "" nil nil nil 1)))))
(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
"^[ \t]*,*\\(,\\)\\(?:\\*\\|#\\+\\)" "" s nil nil 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 23:31:23 +00:00
;;; Org src minor mode
(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))
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 23:31:23 +00:00
(define-minor-mode org-src-mode
"Minor mode for language major mode buffers generated by Org.
\\<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 23:31:23 +00:00
This minor mode is turned on in two situations:
Improve docstrings * lisp/ob-core.el (org-confirm-babel-evaluate): (org-babel-no-eval-on-ctrl-c-ctrl-c): (org-babel-hash-at-point): * lisp/org-agenda.el (org-agenda-custom-commands): (org-stuck-projects): (org-agenda): (org-timeline): (org-todo-list): (org-agenda-filter-by-tag): (org-agenda-log-mode): (org-agenda-refile): (org-agenda-show-and-scroll-up): (org-agenda-tree-to-indirect-buffer): (org-agenda-show-the-flagging-note): (org-agenda-to-appt): * lisp/org-capture.el (org-capture-mode): (org-capture-use-agenda-date): (org-capture): * lisp/org-clock.el (org-clock-in): (org-clock-display): * lisp/org-colview.el (org-columns--display-here): (org-columns): * lisp/org-footnote.el (org-footnote-section): * lisp/org-gnus.el (org-gnus-prefer-web-links): * lisp/org-lint.el (org-lint): * lisp/org-list.el (org-plain-list-ordered-item-terminator): (org-list-allow-alphabetical): (org-list-automatic-rules): (org-list-use-circular-motion): * lisp/org-protocol.el (org-protocol-store-link): (org-protocol-create-for-org): * lisp/org-src.el (org-src-preserve-indentation): (org-edit-src-content-indentation): (org-src-mode-hook): (org-src-mode): (org-edit-table.el): (org-edit-export-block): (org-edit-src-code): (org-edit-fixed-width-region): * lisp/org-table.el (org-table-automatic-realign): (org-table-copy-increment): (org-table-formula-evaluate-inline): (org-table-allow-automatic-line-recalculation): (org-table-edit-field): (orgtbl-ascii-plot): * lisp/org-timer.el (org-timer): * lisp/org.el (org-deadline-string): (org-comment-string): (org-ellipsis): (org-show-context-detail): (org-indirect-buffer-display): (org-cycle-global-at-bob): (org-insert-heading-respect-content): (org-enable-table-editor): (org-context-in-file-links): (org-display-internal-link-with-indirect-buffer): (org-file-apps): (org-refile-targets): (org-todo-keywords): (org-use-fast-todo-selection): (org-treat-insert-todo-heading-as-state-change): (org-time-clocksum-use-fractional): (org-time-clocksum-use-effort-durations): (org-agenda-files): (org-cycle-hide-archived-subtrees): (org-cycle): (org-global-cycle): (org-tree-to-indirect-buffer): (org-insert-heading): (org-store-link): (org-insert-link): (org-mark-ring-push): (org-refile): (org-todo): (org-show-todo-tree): (org-reveal): (org-check-deadlines): (org-switchb): (org-cdlatex-mode): (org-toggle-latex-fragment): (org-ctrl-c-ctrl-c): (org-toggle-heading): (org-indent-line): (org-yank): (org-speedbar-set-agenda-restriction): * lisp/ox-html.el (org-html-htmlize-output-type): * lisp/ox-icalendar.el (org-icalendar-combined-agenda-file): * lisp/ox-publish.el (org-publish-project-alist): * lisp/ox.el (org-export-in-background): (org-export-stack-mode): (org-export--stack-source-at-point): (org-export-dispatch): Improve quotes and formatting in docstrings.
2016-10-15 15:36:47 +00:00
- when editing a source code snippet with `\\[org-edit-special]'
- when formatting a source code snippet for export with htmlize.
\\{org-src-mode-map}
See also `org-src-mode-hook'."
:lighter " OrgSrc"
(when org-edit-src-persistent-message
(setq header-line-format
(substitute-command-keys
(if org-src--allow-write-back
"Edit, then exit with `\\[org-edit-src-exit]' or abort with \
Improve docstrings * lisp/ob-core.el (org-confirm-babel-evaluate): (org-babel-no-eval-on-ctrl-c-ctrl-c): (org-babel-hash-at-point): * lisp/org-agenda.el (org-agenda-custom-commands): (org-stuck-projects): (org-agenda): (org-timeline): (org-todo-list): (org-agenda-filter-by-tag): (org-agenda-log-mode): (org-agenda-refile): (org-agenda-show-and-scroll-up): (org-agenda-tree-to-indirect-buffer): (org-agenda-show-the-flagging-note): (org-agenda-to-appt): * lisp/org-capture.el (org-capture-mode): (org-capture-use-agenda-date): (org-capture): * lisp/org-clock.el (org-clock-in): (org-clock-display): * lisp/org-colview.el (org-columns--display-here): (org-columns): * lisp/org-footnote.el (org-footnote-section): * lisp/org-gnus.el (org-gnus-prefer-web-links): * lisp/org-lint.el (org-lint): * lisp/org-list.el (org-plain-list-ordered-item-terminator): (org-list-allow-alphabetical): (org-list-automatic-rules): (org-list-use-circular-motion): * lisp/org-protocol.el (org-protocol-store-link): (org-protocol-create-for-org): * lisp/org-src.el (org-src-preserve-indentation): (org-edit-src-content-indentation): (org-src-mode-hook): (org-src-mode): (org-edit-table.el): (org-edit-export-block): (org-edit-src-code): (org-edit-fixed-width-region): * lisp/org-table.el (org-table-automatic-realign): (org-table-copy-increment): (org-table-formula-evaluate-inline): (org-table-allow-automatic-line-recalculation): (org-table-edit-field): (orgtbl-ascii-plot): * lisp/org-timer.el (org-timer): * lisp/org.el (org-deadline-string): (org-comment-string): (org-ellipsis): (org-show-context-detail): (org-indirect-buffer-display): (org-cycle-global-at-bob): (org-insert-heading-respect-content): (org-enable-table-editor): (org-context-in-file-links): (org-display-internal-link-with-indirect-buffer): (org-file-apps): (org-refile-targets): (org-todo-keywords): (org-use-fast-todo-selection): (org-treat-insert-todo-heading-as-state-change): (org-time-clocksum-use-fractional): (org-time-clocksum-use-effort-durations): (org-agenda-files): (org-cycle-hide-archived-subtrees): (org-cycle): (org-global-cycle): (org-tree-to-indirect-buffer): (org-insert-heading): (org-store-link): (org-insert-link): (org-mark-ring-push): (org-refile): (org-todo): (org-show-todo-tree): (org-reveal): (org-check-deadlines): (org-switchb): (org-cdlatex-mode): (org-toggle-latex-fragment): (org-ctrl-c-ctrl-c): (org-toggle-heading): (org-indent-line): (org-yank): (org-speedbar-set-agenda-restriction): * lisp/ox-html.el (org-html-htmlize-output-type): * lisp/ox-icalendar.el (org-icalendar-combined-agenda-file): * lisp/ox-publish.el (org-publish-project-alist): * lisp/ox.el (org-export-in-background): (org-export-stack-mode): (org-export--stack-source-at-point): (org-export-dispatch): Improve quotes and formatting in docstrings.
2016-10-15 15:36:47 +00:00
`\\[org-edit-src-abort]'"
"Exit with `\\[org-edit-src-exit]' or abort with \
Improve docstrings * lisp/ob-core.el (org-confirm-babel-evaluate): (org-babel-no-eval-on-ctrl-c-ctrl-c): (org-babel-hash-at-point): * lisp/org-agenda.el (org-agenda-custom-commands): (org-stuck-projects): (org-agenda): (org-timeline): (org-todo-list): (org-agenda-filter-by-tag): (org-agenda-log-mode): (org-agenda-refile): (org-agenda-show-and-scroll-up): (org-agenda-tree-to-indirect-buffer): (org-agenda-show-the-flagging-note): (org-agenda-to-appt): * lisp/org-capture.el (org-capture-mode): (org-capture-use-agenda-date): (org-capture): * lisp/org-clock.el (org-clock-in): (org-clock-display): * lisp/org-colview.el (org-columns--display-here): (org-columns): * lisp/org-footnote.el (org-footnote-section): * lisp/org-gnus.el (org-gnus-prefer-web-links): * lisp/org-lint.el (org-lint): * lisp/org-list.el (org-plain-list-ordered-item-terminator): (org-list-allow-alphabetical): (org-list-automatic-rules): (org-list-use-circular-motion): * lisp/org-protocol.el (org-protocol-store-link): (org-protocol-create-for-org): * lisp/org-src.el (org-src-preserve-indentation): (org-edit-src-content-indentation): (org-src-mode-hook): (org-src-mode): (org-edit-table.el): (org-edit-export-block): (org-edit-src-code): (org-edit-fixed-width-region): * lisp/org-table.el (org-table-automatic-realign): (org-table-copy-increment): (org-table-formula-evaluate-inline): (org-table-allow-automatic-line-recalculation): (org-table-edit-field): (orgtbl-ascii-plot): * lisp/org-timer.el (org-timer): * lisp/org.el (org-deadline-string): (org-comment-string): (org-ellipsis): (org-show-context-detail): (org-indirect-buffer-display): (org-cycle-global-at-bob): (org-insert-heading-respect-content): (org-enable-table-editor): (org-context-in-file-links): (org-display-internal-link-with-indirect-buffer): (org-file-apps): (org-refile-targets): (org-todo-keywords): (org-use-fast-todo-selection): (org-treat-insert-todo-heading-as-state-change): (org-time-clocksum-use-fractional): (org-time-clocksum-use-effort-durations): (org-agenda-files): (org-cycle-hide-archived-subtrees): (org-cycle): (org-global-cycle): (org-tree-to-indirect-buffer): (org-insert-heading): (org-store-link): (org-insert-link): (org-mark-ring-push): (org-refile): (org-todo): (org-show-todo-tree): (org-reveal): (org-check-deadlines): (org-switchb): (org-cdlatex-mode): (org-toggle-latex-fragment): (org-ctrl-c-ctrl-c): (org-toggle-heading): (org-indent-line): (org-yank): (org-speedbar-set-agenda-restriction): * lisp/ox-html.el (org-html-htmlize-output-type): * lisp/ox-icalendar.el (org-icalendar-combined-agenda-file): * lisp/ox-publish.el (org-publish-project-alist): * lisp/ox.el (org-export-in-background): (org-export-stack-mode): (org-export--stack-source-at-point): (org-export-dispatch): Improve quotes and formatting in docstrings.
2016-10-15 15:36:47 +00:00
`\\[org-edit-src-abort]'"))))
;; Possibly activate various auto-save features (for the edit buffer
;; 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")))
(unless (or org-src--auto-save-timer
(= 0 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 ()
(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)))))))))
(defun org-src-mode-configure-edit-buffer ()
"Configure the src edit buffer."
(when (bound-and-true-p org-src--from-org-mode)
(add-hook 'kill-buffer-hook #'org-src--remove-overlay nil 'local)
(if (bound-and-true-p org-src--allow-write-back)
(progn
(setq buffer-offer-save t)
(setq write-contents-functions '(org-edit-src-save)))
(setq buffer-read-only t))))
(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 23:31:23 +00: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 23:31:23 +00:00
;;; Babel related functions
(defun org-src-associate-babel-session (info)
"Associate edit buffer with comint session.
INFO should be a list simlar in format to the return value of
`org-babel-get-src-block-info'."
(interactive)
Use assq instead of assoc for :keywords * lisp/ob-C.el (org-babel-C-execute): * lisp/ob-J.el (org-babel-execute:J): * lisp/ob-R.el (org-babel-edit-prep:R): (org-babel-expand-body:R): (org-babel-execute:R): (org-babel-variable-assignments:R): (org-babel-R-initiate-session): * lisp/ob-abc.el (org-babel-execute:abc): * lisp/ob-asymptote.el (org-babel-execute:asymptote): * lisp/ob-awk.el (org-babel-execute:awk): * lisp/ob-clojure.el (org-babel-expand-body:clojure): (org-babel-execute:clojure): * lisp/ob-core.el (org-babel-expand-body:generic): (org-babel-load-in-session): (org-babel-initiate-session): (org-babel-open-src-block-result): (org-babel-process-params): (org-babel-insert-result): (org-babel-expand-noweb-references): * lisp/ob-ditaa.el (org-babel-execute:ditaa): * lisp/ob-dot.el (org-babel-execute:dot): * lisp/ob-ebnf.el (org-babel-execute:ebnf): * lisp/ob-emacs-lisp.el (org-babel-expand-body:emacs-lisp): (org-babel-execute:emacs-lisp): * lisp/ob-exp.el (org-babel-exp-process-buffer): (org-babel-exp-do-export): (org-babel-exp-code): * lisp/ob-forth.el (org-babel-execute:forth): * lisp/ob-fortran.el (org-babel-execute:fortran): * lisp/ob-gnuplot.el (org-babel-gnuplot-process-vars): (org-babel-expand-body:gnuplot): (org-babel-execute:gnuplot): * lisp/ob-groovy.el (org-babel-execute:groovy): * lisp/ob-haskell.el (org-babel-execute:haskell): * lisp/ob-io.el (org-babel-execute:io): * lisp/ob-java.el (org-babel-execute:java): * lisp/ob-js.el (org-babel-execute:js): * lisp/ob-latex.el (org-babel-execute:latex): * lisp/ob-ledger.el (org-babel-execute:ledger): * lisp/ob-lilypond.el (org-babel-lilypond-process-basic): * lisp/ob-lisp.el (org-babel-expand-body:lisp): (org-babel-execute:lisp): * lisp/ob-lua.el (org-babel-execute:lua): * lisp/ob-maxima.el (org-babel-execute:maxima): * lisp/ob-mscgen.el (org-babel-execute:mscgen): * lisp/ob-ocaml.el (org-babel-execute:ocaml): * lisp/ob-octave.el (org-babel-execute:octave): * lisp/ob-org.el (org-babel-execute:org): * lisp/ob-perl.el (org-babel-execute:perl): * lisp/ob-picolisp.el (org-babel-execute:picolisp): * lisp/ob-plantuml.el (org-babel-execute:plantuml): * lisp/ob-python.el (org-babel-execute:python): * lisp/ob-ruby.el (org-babel-execute:ruby): * lisp/ob-sass.el (org-babel-execute:sass): * lisp/ob-scala.el (org-babel-execute:scala): * lisp/ob-scheme.el (org-babel-execute:scheme): * lisp/ob-screen.el (org-babel-execute:screen): (org-babel-prep-session:screen): * lisp/ob-shell.el (org-babel-execute:shell): (org-babel-variable-assignments:shell): (org-babel-sh-evaluate): * lisp/ob-shen.el (org-babel-execute:shen): * lisp/ob-sql.el (org-babel-execute:sql): * lisp/ob-sqlite.el (org-babel-execute:sqlite): * lisp/ob-tangle.el (org-babel-tangle): (org-babel-tangle-single-block): * lisp/org-src.el (org-src-associate-babel-session): * lisp/org.el (org-next-link): Use `assq' instead of `assoc' with :keyword keys.
2016-09-22 17:45:15 +00:00
(let ((session (cdr (assq :session (nth 2 info)))))
(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 19:57:31 +00:00
(let ((f (intern (format "org-babel-%s-associate-session"
(nth 0 info)))))
(and (fboundp f) (funcall f session))))))
(defun org-src-babel-configure-edit-buffer ()
"Configure src editing 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 23:31:23 +00:00
(when org-src--babel-info
(org-src-associate-babel-session org-src--babel-info)))
(add-hook 'org-src-mode-hook #'org-src-babel-configure-edit-buffer)
2016-08-19 14:19:36 +00: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))))
(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
with language major mode bindings. To bind it to C-c @ in all
language major modes, you could use
(add-hook \\='org-src-mode-hook
(lambda () (define-key org-src-mode-map \"\\C-c@\"
\\='org-src-do-key-sequence-at-code-block)))
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 23:31:23 +00:00
(call-interactively (lookup-key org-babel-map key)))))
(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")))
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 23:31:23 +00:00
(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-source-buffer ()
"Return source buffer edited in current buffer.
Raise an error when current buffer is not a source editing 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-source-type ()
"Return type of element edited in current buffer.
Raise an error when current buffer is not a source editing buffer."
(unless (org-src-edit-buffer-p) (error "Not in a source buffer"))
org-src--source-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 23:31:23 +00:00
(defun org-src-switch-to-buffer (buffer context)
"Switch to BUFFER considering CONTEXT and `org-src-window-setup'."
(pcase org-src-window-setup
(`plain
(when (eq context 'exit) (quit-restore-window))
(pop-to-buffer buffer))
(`current-window (pop-to-buffer-same-window buffer))
(`other-window
(let ((cur-win (selected-window)))
(org-switch-to-buffer-other-window buffer)
(when (eq context 'exit) (quit-restore-window cur-win))))
(`split-window-below
(if (eq context 'exit)
(delete-window)
(select-window (split-window-vertically)))
(pop-to-buffer-same-window buffer))
(`split-window-right
(if (eq context 'exit)
(delete-window)
(select-window (split-window-horizontally)))
(pop-to-buffer-same-window buffer))
(`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 23:31:23 +00:00
(let ((frame (selected-frame)))
(switch-to-buffer-other-frame buffer)
(delete-frame frame)))
(`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 23:31:23 +00:00
(kill-buffer (current-buffer))
(pop-to-buffer-same-window buffer))
(_ (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 23:31:23 +00:00
(when (eq context 'edit) (delete-other-windows))
(org-switch-to-buffer-other-window buffer)
(when (eq context 'exit) (delete-other-windows)))
(`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 23:31:23 +00:00
(message "Invalid value %s for `org-src-window-setup'"
org-src-window-setup)
(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 23:31:23 +00:00
(defun org-src-coderef-format (&optional element)
"Return format string for block at point.
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.
Match group 1 contains the full coderef string with surrounding
white spaces. Match group 2 contains the same string without any
surrounding space. Match group 3 contains the label.
A coderef format regexp can only match at the end of a line."
(format "\\([ \t]*\\(%s\\)[ \t]*\\)$"
(replace-regexp-in-string
"%s"
(if label (regexp-quote label) "\\([-a-zA-Z0-9_][-a-zA-Z0-9_ ]*\\)")
(regexp-quote fmt)
nil t)))
(defun org-edit-footnote-reference ()
"Edit definition of footnote reference at point."
(interactive)
(let* ((context (org-element-context))
(label (org-element-property :label context)))
(unless (and (eq (org-element-type context) 'footnote-reference)
(org-src--on-datum-p context))
(user-error "Not on a footnote reference"))
(unless label (user-error "Cannot edit remotely anonymous footnotes"))
(let* ((definition (org-with-wide-buffer
(org-footnote-goto-definition label)
(backward-char)
(org-element-context)))
(inline? (eq 'footnote-reference (org-element-type definition)))
(contents
(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)))
(org-src--edit-element
definition
(format "*Edit footnote [%s]*" label)
(let ((source (current-buffer)))
(lambda ()
(org-mode)
(org-clone-local-variables source)))
(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
'remote))
;; Report 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 23:31:23 +00:00
(defun org-edit-table.el ()
"Edit \"table.el\" table at point.
Improve docstrings * lisp/ob-core.el (org-confirm-babel-evaluate): (org-babel-no-eval-on-ctrl-c-ctrl-c): (org-babel-hash-at-point): * lisp/org-agenda.el (org-agenda-custom-commands): (org-stuck-projects): (org-agenda): (org-timeline): (org-todo-list): (org-agenda-filter-by-tag): (org-agenda-log-mode): (org-agenda-refile): (org-agenda-show-and-scroll-up): (org-agenda-tree-to-indirect-buffer): (org-agenda-show-the-flagging-note): (org-agenda-to-appt): * lisp/org-capture.el (org-capture-mode): (org-capture-use-agenda-date): (org-capture): * lisp/org-clock.el (org-clock-in): (org-clock-display): * lisp/org-colview.el (org-columns--display-here): (org-columns): * lisp/org-footnote.el (org-footnote-section): * lisp/org-gnus.el (org-gnus-prefer-web-links): * lisp/org-lint.el (org-lint): * lisp/org-list.el (org-plain-list-ordered-item-terminator): (org-list-allow-alphabetical): (org-list-automatic-rules): (org-list-use-circular-motion): * lisp/org-protocol.el (org-protocol-store-link): (org-protocol-create-for-org): * lisp/org-src.el (org-src-preserve-indentation): (org-edit-src-content-indentation): (org-src-mode-hook): (org-src-mode): (org-edit-table.el): (org-edit-export-block): (org-edit-src-code): (org-edit-fixed-width-region): * lisp/org-table.el (org-table-automatic-realign): (org-table-copy-increment): (org-table-formula-evaluate-inline): (org-table-allow-automatic-line-recalculation): (org-table-edit-field): (orgtbl-ascii-plot): * lisp/org-timer.el (org-timer): * lisp/org.el (org-deadline-string): (org-comment-string): (org-ellipsis): (org-show-context-detail): (org-indirect-buffer-display): (org-cycle-global-at-bob): (org-insert-heading-respect-content): (org-enable-table-editor): (org-context-in-file-links): (org-display-internal-link-with-indirect-buffer): (org-file-apps): (org-refile-targets): (org-todo-keywords): (org-use-fast-todo-selection): (org-treat-insert-todo-heading-as-state-change): (org-time-clocksum-use-fractional): (org-time-clocksum-use-effort-durations): (org-agenda-files): (org-cycle-hide-archived-subtrees): (org-cycle): (org-global-cycle): (org-tree-to-indirect-buffer): (org-insert-heading): (org-store-link): (org-insert-link): (org-mark-ring-push): (org-refile): (org-todo): (org-show-todo-tree): (org-reveal): (org-check-deadlines): (org-switchb): (org-cdlatex-mode): (org-toggle-latex-fragment): (org-ctrl-c-ctrl-c): (org-toggle-heading): (org-indent-line): (org-yank): (org-speedbar-set-agenda-restriction): * lisp/ox-html.el (org-html-htmlize-output-type): * lisp/ox-icalendar.el (org-icalendar-combined-agenda-file): * lisp/ox-publish.el (org-publish-project-alist): * lisp/ox.el (org-export-in-background): (org-export-stack-mode): (org-export--stack-source-at-point): (org-export-dispatch): Improve quotes and formatting in docstrings.
2016-10-15 15:36:47 +00: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 23:31:23 +00:00
A new buffer is created and the table is copied into it. Then
the table is recognized with `table-recognize'. When done
Improve docstrings * lisp/ob-core.el (org-confirm-babel-evaluate): (org-babel-no-eval-on-ctrl-c-ctrl-c): (org-babel-hash-at-point): * lisp/org-agenda.el (org-agenda-custom-commands): (org-stuck-projects): (org-agenda): (org-timeline): (org-todo-list): (org-agenda-filter-by-tag): (org-agenda-log-mode): (org-agenda-refile): (org-agenda-show-and-scroll-up): (org-agenda-tree-to-indirect-buffer): (org-agenda-show-the-flagging-note): (org-agenda-to-appt): * lisp/org-capture.el (org-capture-mode): (org-capture-use-agenda-date): (org-capture): * lisp/org-clock.el (org-clock-in): (org-clock-display): * lisp/org-colview.el (org-columns--display-here): (org-columns): * lisp/org-footnote.el (org-footnote-section): * lisp/org-gnus.el (org-gnus-prefer-web-links): * lisp/org-lint.el (org-lint): * lisp/org-list.el (org-plain-list-ordered-item-terminator): (org-list-allow-alphabetical): (org-list-automatic-rules): (org-list-use-circular-motion): * lisp/org-protocol.el (org-protocol-store-link): (org-protocol-create-for-org): * lisp/org-src.el (org-src-preserve-indentation): (org-edit-src-content-indentation): (org-src-mode-hook): (org-src-mode): (org-edit-table.el): (org-edit-export-block): (org-edit-src-code): (org-edit-fixed-width-region): * lisp/org-table.el (org-table-automatic-realign): (org-table-copy-increment): (org-table-formula-evaluate-inline): (org-table-allow-automatic-line-recalculation): (org-table-edit-field): (orgtbl-ascii-plot): * lisp/org-timer.el (org-timer): * lisp/org.el (org-deadline-string): (org-comment-string): (org-ellipsis): (org-show-context-detail): (org-indirect-buffer-display): (org-cycle-global-at-bob): (org-insert-heading-respect-content): (org-enable-table-editor): (org-context-in-file-links): (org-display-internal-link-with-indirect-buffer): (org-file-apps): (org-refile-targets): (org-todo-keywords): (org-use-fast-todo-selection): (org-treat-insert-todo-heading-as-state-change): (org-time-clocksum-use-fractional): (org-time-clocksum-use-effort-durations): (org-agenda-files): (org-cycle-hide-archived-subtrees): (org-cycle): (org-global-cycle): (org-tree-to-indirect-buffer): (org-insert-heading): (org-store-link): (org-insert-link): (org-mark-ring-push): (org-refile): (org-todo): (org-show-todo-tree): (org-reveal): (org-check-deadlines): (org-switchb): (org-cdlatex-mode): (org-toggle-latex-fragment): (org-ctrl-c-ctrl-c): (org-toggle-heading): (org-indent-line): (org-yank): (org-speedbar-set-agenda-restriction): * lisp/ox-html.el (org-html-htmlize-output-type): * lisp/ox-icalendar.el (org-icalendar-combined-agenda-file): * lisp/ox-publish.el (org-publish-project-alist): * lisp/ox.el (org-export-in-background): (org-export-stack-mode): (org-export--stack-source-at-point): (org-export-dispatch): Improve quotes and formatting in docstrings.
2016-10-15 15:36:47 +00: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 23:31:23 +00: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)
(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 23:31:23 +00: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)
(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 23:31:23 +00:00
(table-recognize)
t))
(defun org-edit-latex-fragment ()
"Edit LaTeX fragment at point."
(interactive)
(let ((context (org-element-context)))
(unless (and (eq 'latex-fragment (org-element-type context))
(org-src--on-datum-p context))
(user-error "Not on a LaTeX fragment"))
(let* ((contents
(buffer-substring-no-properties
(org-element-property :begin context)
(- (org-element-property :end context)
(org-element-property :post-blank context))))
(delim-length (if (string-match "\\`\\$[^$]" contents) 1 2)))
;; Make the LaTeX deliminators read-only.
(add-text-properties 0 delim-length
(list 'read-only "Cannot edit LaTeX deliminator"
'front-sticky t
'rear-nonsticky t)
contents)
(let ((l (length contents)))
(add-text-properties (- l delim-length) l
(list 'read-only "Cannot edit LaTeX deliminator"
'front-sticky nil
'rear-nonsticky nil)
contents))
(org-src--edit-element
context
(org-src--construct-edit-buffer-name (buffer-name) "LaTeX fragment")
(org-src-get-lang-mode "latex")
(lambda ()
;; Blank lines break things, replace with a single newline.
(while (re-search-forward "\n[ \t]*\n" nil t) (replace-match "\n"))
;; If within a table a newline would disrupt the structure,
;; so remove newlines.
(goto-char (point-min))
(when (org-element-lineage context '(table-cell))
(while (search-forward "\n" nil t) (replace-match " "))))
contents))
t))
(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 23:31:23 +00:00
(defun org-edit-export-block ()
"Edit export block at point.
Improve docstrings * lisp/ob-core.el (org-confirm-babel-evaluate): (org-babel-no-eval-on-ctrl-c-ctrl-c): (org-babel-hash-at-point): * lisp/org-agenda.el (org-agenda-custom-commands): (org-stuck-projects): (org-agenda): (org-timeline): (org-todo-list): (org-agenda-filter-by-tag): (org-agenda-log-mode): (org-agenda-refile): (org-agenda-show-and-scroll-up): (org-agenda-tree-to-indirect-buffer): (org-agenda-show-the-flagging-note): (org-agenda-to-appt): * lisp/org-capture.el (org-capture-mode): (org-capture-use-agenda-date): (org-capture): * lisp/org-clock.el (org-clock-in): (org-clock-display): * lisp/org-colview.el (org-columns--display-here): (org-columns): * lisp/org-footnote.el (org-footnote-section): * lisp/org-gnus.el (org-gnus-prefer-web-links): * lisp/org-lint.el (org-lint): * lisp/org-list.el (org-plain-list-ordered-item-terminator): (org-list-allow-alphabetical): (org-list-automatic-rules): (org-list-use-circular-motion): * lisp/org-protocol.el (org-protocol-store-link): (org-protocol-create-for-org): * lisp/org-src.el (org-src-preserve-indentation): (org-edit-src-content-indentation): (org-src-mode-hook): (org-src-mode): (org-edit-table.el): (org-edit-export-block): (org-edit-src-code): (org-edit-fixed-width-region): * lisp/org-table.el (org-table-automatic-realign): (org-table-copy-increment): (org-table-formula-evaluate-inline): (org-table-allow-automatic-line-recalculation): (org-table-edit-field): (orgtbl-ascii-plot): * lisp/org-timer.el (org-timer): * lisp/org.el (org-deadline-string): (org-comment-string): (org-ellipsis): (org-show-context-detail): (org-indirect-buffer-display): (org-cycle-global-at-bob): (org-insert-heading-respect-content): (org-enable-table-editor): (org-context-in-file-links): (org-display-internal-link-with-indirect-buffer): (org-file-apps): (org-refile-targets): (org-todo-keywords): (org-use-fast-todo-selection): (org-treat-insert-todo-heading-as-state-change): (org-time-clocksum-use-fractional): (org-time-clocksum-use-effort-durations): (org-agenda-files): (org-cycle-hide-archived-subtrees): (org-cycle): (org-global-cycle): (org-tree-to-indirect-buffer): (org-insert-heading): (org-store-link): (org-insert-link): (org-mark-ring-push): (org-refile): (org-todo): (org-show-todo-tree): (org-reveal): (org-check-deadlines): (org-switchb): (org-cdlatex-mode): (org-toggle-latex-fragment): (org-ctrl-c-ctrl-c): (org-toggle-heading): (org-indent-line): (org-yank): (org-speedbar-set-agenda-restriction): * lisp/ox-html.el (org-html-htmlize-output-type): * lisp/ox-icalendar.el (org-icalendar-combined-agenda-file): * lisp/ox-publish.el (org-publish-project-alist): * lisp/ox.el (org-export-in-background): (org-export-stack-mode): (org-export--stack-source-at-point): (org-export-dispatch): Improve quotes and formatting in docstrings.
2016-10-15 15:36:47 +00: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 23:31:23 +00: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
Improve docstrings * lisp/ob-core.el (org-confirm-babel-evaluate): (org-babel-no-eval-on-ctrl-c-ctrl-c): (org-babel-hash-at-point): * lisp/org-agenda.el (org-agenda-custom-commands): (org-stuck-projects): (org-agenda): (org-timeline): (org-todo-list): (org-agenda-filter-by-tag): (org-agenda-log-mode): (org-agenda-refile): (org-agenda-show-and-scroll-up): (org-agenda-tree-to-indirect-buffer): (org-agenda-show-the-flagging-note): (org-agenda-to-appt): * lisp/org-capture.el (org-capture-mode): (org-capture-use-agenda-date): (org-capture): * lisp/org-clock.el (org-clock-in): (org-clock-display): * lisp/org-colview.el (org-columns--display-here): (org-columns): * lisp/org-footnote.el (org-footnote-section): * lisp/org-gnus.el (org-gnus-prefer-web-links): * lisp/org-lint.el (org-lint): * lisp/org-list.el (org-plain-list-ordered-item-terminator): (org-list-allow-alphabetical): (org-list-automatic-rules): (org-list-use-circular-motion): * lisp/org-protocol.el (org-protocol-store-link): (org-protocol-create-for-org): * lisp/org-src.el (org-src-preserve-indentation): (org-edit-src-content-indentation): (org-src-mode-hook): (org-src-mode): (org-edit-table.el): (org-edit-export-block): (org-edit-src-code): (org-edit-fixed-width-region): * lisp/org-table.el (org-table-automatic-realign): (org-table-copy-increment): (org-table-formula-evaluate-inline): (org-table-allow-automatic-line-recalculation): (org-table-edit-field): (orgtbl-ascii-plot): * lisp/org-timer.el (org-timer): * lisp/org.el (org-deadline-string): (org-comment-string): (org-ellipsis): (org-show-context-detail): (org-indirect-buffer-display): (org-cycle-global-at-bob): (org-insert-heading-respect-content): (org-enable-table-editor): (org-context-in-file-links): (org-display-internal-link-with-indirect-buffer): (org-file-apps): (org-refile-targets): (org-todo-keywords): (org-use-fast-todo-selection): (org-treat-insert-todo-heading-as-state-change): (org-time-clocksum-use-fractional): (org-time-clocksum-use-effort-durations): (org-agenda-files): (org-cycle-hide-archived-subtrees): (org-cycle): (org-global-cycle): (org-tree-to-indirect-buffer): (org-insert-heading): (org-store-link): (org-insert-link): (org-mark-ring-push): (org-refile): (org-todo): (org-show-todo-tree): (org-reveal): (org-check-deadlines): (org-switchb): (org-cdlatex-mode): (org-toggle-latex-fragment): (org-ctrl-c-ctrl-c): (org-toggle-heading): (org-indent-line): (org-yank): (org-speedbar-set-agenda-restriction): * lisp/ox-html.el (org-html-htmlize-output-type): * lisp/ox-icalendar.el (org-icalendar-combined-agenda-file): * lisp/ox-publish.el (org-publish-project-alist): * lisp/ox.el (org-export-in-background): (org-export-stack-mode): (org-export--stack-source-at-point): (org-export-dispatch): Improve quotes and formatting in docstrings.
2016-10-15 15:36:47 +00: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 23:31:23 +00: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)
(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 23:31:23 +00:00
(user-error "Not in an export block"))
(let* ((type (downcase (or (org-element-property :type element)
;; Missing export-block type. Fallback
;; to default mode.
"fundamental")))
(mode (org-src-get-lang-mode 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 23:31:23 +00:00
(unless (functionp mode) (error "No such language mode: %s" mode))
(org-src--edit-element
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 23:31:23 +00:00
t))
(defun org-edit-src-code (&optional code edit-buffer-name)
"Edit the source or example block at point.
\\<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 23:31:23 +00:00
The code is copied to a separate buffer and the appropriate mode
Improve docstrings * lisp/ob-core.el (org-confirm-babel-evaluate): (org-babel-no-eval-on-ctrl-c-ctrl-c): (org-babel-hash-at-point): * lisp/org-agenda.el (org-agenda-custom-commands): (org-stuck-projects): (org-agenda): (org-timeline): (org-todo-list): (org-agenda-filter-by-tag): (org-agenda-log-mode): (org-agenda-refile): (org-agenda-show-and-scroll-up): (org-agenda-tree-to-indirect-buffer): (org-agenda-show-the-flagging-note): (org-agenda-to-appt): * lisp/org-capture.el (org-capture-mode): (org-capture-use-agenda-date): (org-capture): * lisp/org-clock.el (org-clock-in): (org-clock-display): * lisp/org-colview.el (org-columns--display-here): (org-columns): * lisp/org-footnote.el (org-footnote-section): * lisp/org-gnus.el (org-gnus-prefer-web-links): * lisp/org-lint.el (org-lint): * lisp/org-list.el (org-plain-list-ordered-item-terminator): (org-list-allow-alphabetical): (org-list-automatic-rules): (org-list-use-circular-motion): * lisp/org-protocol.el (org-protocol-store-link): (org-protocol-create-for-org): * lisp/org-src.el (org-src-preserve-indentation): (org-edit-src-content-indentation): (org-src-mode-hook): (org-src-mode): (org-edit-table.el): (org-edit-export-block): (org-edit-src-code): (org-edit-fixed-width-region): * lisp/org-table.el (org-table-automatic-realign): (org-table-copy-increment): (org-table-formula-evaluate-inline): (org-table-allow-automatic-line-recalculation): (org-table-edit-field): (orgtbl-ascii-plot): * lisp/org-timer.el (org-timer): * lisp/org.el (org-deadline-string): (org-comment-string): (org-ellipsis): (org-show-context-detail): (org-indirect-buffer-display): (org-cycle-global-at-bob): (org-insert-heading-respect-content): (org-enable-table-editor): (org-context-in-file-links): (org-display-internal-link-with-indirect-buffer): (org-file-apps): (org-refile-targets): (org-todo-keywords): (org-use-fast-todo-selection): (org-treat-insert-todo-heading-as-state-change): (org-time-clocksum-use-fractional): (org-time-clocksum-use-effort-durations): (org-agenda-files): (org-cycle-hide-archived-subtrees): (org-cycle): (org-global-cycle): (org-tree-to-indirect-buffer): (org-insert-heading): (org-store-link): (org-insert-link): (org-mark-ring-push): (org-refile): (org-todo): (org-show-todo-tree): (org-reveal): (org-check-deadlines): (org-switchb): (org-cdlatex-mode): (org-toggle-latex-fragment): (org-ctrl-c-ctrl-c): (org-toggle-heading): (org-indent-line): (org-yank): (org-speedbar-set-agenda-restriction): * lisp/ox-html.el (org-html-htmlize-output-type): * lisp/ox-icalendar.el (org-icalendar-combined-agenda-file): * lisp/ox-publish.el (org-publish-project-alist): * lisp/ox.el (org-export-in-background): (org-export-stack-mode): (org-export--stack-source-at-point): (org-export-dispatch): Improve quotes and formatting in docstrings.
2016-10-15 15:36:47 +00:00
is turned on. When done, exit with `\\[org-edit-src-exit]'. This \
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 23:31:23 +00: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))
(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 23:31:23 +00: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)))
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 23:31:23 +00:00
(babel-info (and (eq type 'src-block)
(org-babel-get-src-block-info 'light)))
deactivate-mark)
(when (and (eq type 'src-block) (not (functionp lang-f)))
(error "No such language mode: %s" lang-f))
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 23:31:23 +00:00
(org-src--edit-element
element
(or edit-buffer-name
(org-src--construct-edit-buffer-name (buffer-name) lang))
lang-f
(and (null code)
(lambda () (org-escape-code-in-region (point-min) (point-max))))
(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 23:31:23 +00:00
;; Finalize buffer.
(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 23:31:23 +00:00
(when (eq type 'src-block)
(setq 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 23:31:23 +00:00
(let ((edit-prep-func (intern (concat "org-babel-edit-prep:" lang))))
(when (fboundp edit-prep-func)
(funcall edit-prep-func babel-info))))
t)))
(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 ()
2018-09-20 09:23:49 +00:00
;; Inline source 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 org-src--babel-info babel-info)
(setq 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 23:31:23 +00:00
(defun org-edit-fixed-width-region ()
"Edit the fixed-width ASCII drawing at point.
Improve docstrings * lisp/ob-core.el (org-confirm-babel-evaluate): (org-babel-no-eval-on-ctrl-c-ctrl-c): (org-babel-hash-at-point): * lisp/org-agenda.el (org-agenda-custom-commands): (org-stuck-projects): (org-agenda): (org-timeline): (org-todo-list): (org-agenda-filter-by-tag): (org-agenda-log-mode): (org-agenda-refile): (org-agenda-show-and-scroll-up): (org-agenda-tree-to-indirect-buffer): (org-agenda-show-the-flagging-note): (org-agenda-to-appt): * lisp/org-capture.el (org-capture-mode): (org-capture-use-agenda-date): (org-capture): * lisp/org-clock.el (org-clock-in): (org-clock-display): * lisp/org-colview.el (org-columns--display-here): (org-columns): * lisp/org-footnote.el (org-footnote-section): * lisp/org-gnus.el (org-gnus-prefer-web-links): * lisp/org-lint.el (org-lint): * lisp/org-list.el (org-plain-list-ordered-item-terminator): (org-list-allow-alphabetical): (org-list-automatic-rules): (org-list-use-circular-motion): * lisp/org-protocol.el (org-protocol-store-link): (org-protocol-create-for-org): * lisp/org-src.el (org-src-preserve-indentation): (org-edit-src-content-indentation): (org-src-mode-hook): (org-src-mode): (org-edit-table.el): (org-edit-export-block): (org-edit-src-code): (org-edit-fixed-width-region): * lisp/org-table.el (org-table-automatic-realign): (org-table-copy-increment): (org-table-formula-evaluate-inline): (org-table-allow-automatic-line-recalculation): (org-table-edit-field): (orgtbl-ascii-plot): * lisp/org-timer.el (org-timer): * lisp/org.el (org-deadline-string): (org-comment-string): (org-ellipsis): (org-show-context-detail): (org-indirect-buffer-display): (org-cycle-global-at-bob): (org-insert-heading-respect-content): (org-enable-table-editor): (org-context-in-file-links): (org-display-internal-link-with-indirect-buffer): (org-file-apps): (org-refile-targets): (org-todo-keywords): (org-use-fast-todo-selection): (org-treat-insert-todo-heading-as-state-change): (org-time-clocksum-use-fractional): (org-time-clocksum-use-effort-durations): (org-agenda-files): (org-cycle-hide-archived-subtrees): (org-cycle): (org-global-cycle): (org-tree-to-indirect-buffer): (org-insert-heading): (org-store-link): (org-insert-link): (org-mark-ring-push): (org-refile): (org-todo): (org-show-todo-tree): (org-reveal): (org-check-deadlines): (org-switchb): (org-cdlatex-mode): (org-toggle-latex-fragment): (org-ctrl-c-ctrl-c): (org-toggle-heading): (org-indent-line): (org-yank): (org-speedbar-set-agenda-restriction): * lisp/ox-html.el (org-html-htmlize-output-type): * lisp/ox-icalendar.el (org-icalendar-combined-agenda-file): * lisp/ox-publish.el (org-publish-project-alist): * lisp/ox.el (org-export-in-background): (org-export-stack-mode): (org-export--stack-source-at-point): (org-export-dispatch): Improve quotes and formatting in docstrings.
2016-10-15 15:36:47 +00: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 23:31:23 +00: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
Improve docstrings * lisp/ob-core.el (org-confirm-babel-evaluate): (org-babel-no-eval-on-ctrl-c-ctrl-c): (org-babel-hash-at-point): * lisp/org-agenda.el (org-agenda-custom-commands): (org-stuck-projects): (org-agenda): (org-timeline): (org-todo-list): (org-agenda-filter-by-tag): (org-agenda-log-mode): (org-agenda-refile): (org-agenda-show-and-scroll-up): (org-agenda-tree-to-indirect-buffer): (org-agenda-show-the-flagging-note): (org-agenda-to-appt): * lisp/org-capture.el (org-capture-mode): (org-capture-use-agenda-date): (org-capture): * lisp/org-clock.el (org-clock-in): (org-clock-display): * lisp/org-colview.el (org-columns--display-here): (org-columns): * lisp/org-footnote.el (org-footnote-section): * lisp/org-gnus.el (org-gnus-prefer-web-links): * lisp/org-lint.el (org-lint): * lisp/org-list.el (org-plain-list-ordered-item-terminator): (org-list-allow-alphabetical): (org-list-automatic-rules): (org-list-use-circular-motion): * lisp/org-protocol.el (org-protocol-store-link): (org-protocol-create-for-org): * lisp/org-src.el (org-src-preserve-indentation): (org-edit-src-content-indentation): (org-src-mode-hook): (org-src-mode): (org-edit-table.el): (org-edit-export-block): (org-edit-src-code): (org-edit-fixed-width-region): * lisp/org-table.el (org-table-automatic-realign): (org-table-copy-increment): (org-table-formula-evaluate-inline): (org-table-allow-automatic-line-recalculation): (org-table-edit-field): (orgtbl-ascii-plot): * lisp/org-timer.el (org-timer): * lisp/org.el (org-deadline-string): (org-comment-string): (org-ellipsis): (org-show-context-detail): (org-indirect-buffer-display): (org-cycle-global-at-bob): (org-insert-heading-respect-content): (org-enable-table-editor): (org-context-in-file-links): (org-display-internal-link-with-indirect-buffer): (org-file-apps): (org-refile-targets): (org-todo-keywords): (org-use-fast-todo-selection): (org-treat-insert-todo-heading-as-state-change): (org-time-clocksum-use-fractional): (org-time-clocksum-use-effort-durations): (org-agenda-files): (org-cycle-hide-archived-subtrees): (org-cycle): (org-global-cycle): (org-tree-to-indirect-buffer): (org-insert-heading): (org-store-link): (org-insert-link): (org-mark-ring-push): (org-refile): (org-todo): (org-show-todo-tree): (org-reveal): (org-check-deadlines): (org-switchb): (org-cdlatex-mode): (org-toggle-latex-fragment): (org-ctrl-c-ctrl-c): (org-toggle-heading): (org-indent-line): (org-yank): (org-speedbar-set-agenda-restriction): * lisp/ox-html.el (org-html-htmlize-output-type): * lisp/ox-icalendar.el (org-icalendar-combined-agenda-file): * lisp/ox-publish.el (org-publish-project-alist): * lisp/ox.el (org-export-in-background): (org-export-stack-mode): (org-export--stack-source-at-point): (org-export-dispatch): Improve quotes and formatting in docstrings.
2016-10-15 15:36:47 +00: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 23:31:23 +00:00
the area in the Org mode buffer."
(interactive)
(let ((element (org-element-at-point)))
(unless (and (eq (org-element-type element) 'fixed-width)
(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 23:31:23 +00: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
(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 23:31:23 +00:00
;; Return success.
t))
(defun org-edit-src-abort ()
"Abort editing of the src code and return to the Org buffer."
(interactive)
(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 23:31:23 +00:00
(defun org-edit-src-continue (event)
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 23:31:23 +00:00
"Unconditionally return to buffer editing area under point.
Throw an error if there is no such buffer.
EVENT is passed to `mouse-set-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 23:31:23 +00:00
(interactive "e")
(mouse-set-point event)
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 23:31:23 +00:00
(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 ((write-back-buf (generate-new-buffer "*org-src-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 23:31:23 +00:00
(beg org-src--beg-marker)
(end org-src--end-marker)
(overlay org-src--overlay))
(org-src--contents-for-write-back write-back-buf)
(with-current-buffer (org-src-source-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 23:31:23 +00:00
(undo-boundary)
(goto-char beg)
;; Temporarily disable read-only features of OVERLAY in order to
;; insert new contents.
(delete-overlay overlay)
(let ((expecting-bol (bolp)))
(if (version< emacs-version "27.1")
(progn (delete-region beg end)
(insert (with-current-buffer write-back-buf (buffer-string))))
2021-09-29 07:22:47 +00:00
(save-restriction
(narrow-to-region beg end)
(org-replace-buffer-contents write-back-buf 0.1 nil)
2021-09-29 07:22:47 +00:00
(goto-char (point-max))))
(when (and expecting-bol (not (bolp))) (insert "\n")))
(kill-buffer write-back-buf)
(save-buffer)
(move-overlay overlay beg (point))))
;; `write-contents-functions' requires the function to return
;; 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 23:31:23 +00: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"))
(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 23:31:23 +00:00
(end org-src--end-marker)
(write-back org-src--allow-write-back)
(remote org-src--remote)
(coordinates (and (not remote)
(org-src--coordinates (point) 1 (point-max))))
(write-back-buf
(and write-back (generate-new-buffer "*org-src-write-back*"))))
(when write-back (org-src--contents-for-write-back write-back-buf))
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 23:31:23 +00:00
(set-buffer-modified-p nil)
;; Switch to source buffer. Kill sub-editing buffer.
(let ((edit-buffer (current-buffer))
(source-buffer (marker-buffer beg)))
(unless source-buffer
(when write-back-buf (kill-buffer write-back-buf))
(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 23:31:23 +00:00
(kill-buffer edit-buffer))
;; Insert modified code. Ensure it ends with a newline character.
(org-with-wide-buffer
(when (and write-back
(not (equal (buffer-substring beg end)
(with-current-buffer write-back-buf
(buffer-string)))))
(undo-boundary)
(goto-char beg)
(let ((expecting-bol (bolp)))
(if (version< emacs-version "27.1")
(progn (delete-region beg end)
(insert (with-current-buffer write-back-buf
(buffer-string))))
2021-09-29 07:22:47 +00:00
(save-restriction
(narrow-to-region beg end)
(org-replace-buffer-contents write-back-buf 0.1 nil)
2021-09-29 07:22:47 +00:00
(goto-char (point-max))))
(when (and expecting-bol (not (bolp))) (insert "\n")))))
(when write-back-buf (kill-buffer write-back-buf))
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 23:31:23 +00: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.
(unless remote
(goto-char beg)
(cond
;; Block is hidden; move at start of block.
((if (eq org-fold-core-style 'text-properties)
(org-fold-folded-p nil 'block)
(cl-some (lambda (o) (eq (overlay-get o 'invisible) 'org-hide-block))
(overlays-at (point))))
(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 23:31:23 +00: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
(unwind-protect
(set-window-configuration org-src--saved-temp-window-config)
(setq org-src--saved-temp-window-config nil)))))
(provide 'org-src)
;;; org-src.el ends here