Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
emacs
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
4
Issues
4
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
emacs
emacs
Commits
73d3db82
Commit
73d3db82
authored
Dec 06, 2013
by
Bastien Guerry
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Merge Org 8.2.4
parent
64ed4306
Changes
27
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
27 changed files
with
622 additions
and
434 deletions
+622
-434
doc/misc/ChangeLog
doc/misc/ChangeLog
+9
-0
doc/misc/org.texi
doc/misc/org.texi
+8
-7
etc/refcards/orgcard.tex
etc/refcards/orgcard.tex
+1
-1
lisp/org/ChangeLog
lisp/org/ChangeLog
+184
-0
lisp/org/ob-latex.el
lisp/org/ob-latex.el
+3
-3
lisp/org/ob-plantuml.el
lisp/org/ob-plantuml.el
+2
-2
lisp/org/ob-python.el
lisp/org/ob-python.el
+2
-2
lisp/org/ob-ruby.el
lisp/org/ob-ruby.el
+1
-3
lisp/org/org-agenda.el
lisp/org/org-agenda.el
+10
-9
lisp/org/org-archive.el
lisp/org/org-archive.el
+1
-0
lisp/org/org-clock.el
lisp/org/org-clock.el
+3
-0
lisp/org/org-colview.el
lisp/org/org-colview.el
+5
-0
lisp/org/org-compat.el
lisp/org/org-compat.el
+6
-4
lisp/org/org-crypt.el
lisp/org/org-crypt.el
+6
-4
lisp/org/org-docview.el
lisp/org/org-docview.el
+3
-5
lisp/org/org-element.el
lisp/org/org-element.el
+6
-4
lisp/org/org-id.el
lisp/org/org-id.el
+4
-0
lisp/org/org-macs.el
lisp/org/org-macs.el
+0
-8
lisp/org/org-table.el
lisp/org/org-table.el
+4
-1
lisp/org/org.el
lisp/org/org.el
+170
-186
lisp/org/ox-ascii.el
lisp/org/ox-ascii.el
+65
-96
lisp/org/ox-html.el
lisp/org/ox-html.el
+63
-29
lisp/org/ox-latex.el
lisp/org/ox-latex.el
+9
-15
lisp/org/ox-odt.el
lisp/org/ox-odt.el
+21
-22
lisp/org/ox-publish.el
lisp/org/ox-publish.el
+3
-2
lisp/org/ox-texinfo.el
lisp/org/ox-texinfo.el
+13
-19
lisp/org/ox.el
lisp/org/ox.el
+20
-12
No files found.
doc/misc/ChangeLog
View file @
73d3db82
2013-12-06 Nicolas Goaziou <n.goaziou@gmail.com>
* org.texi (Creating one-off styles): Use new export snippet
syntax.
* org.texi (Export settings): documentation describing how text
above the first heading is ignored when an :export: tag is in a
file.
2013-12-05 Michael Albinus <michael.albinus@gmx.de>
* dbus.texi (Type Conversion): Clarify unibyte-ness of strings.
...
...
doc/misc/org.texi
View file @
73d3db82
...
...
@@ -2,7 +2,7 @@
@c %**start of header
@setfilename ../../info/org
@settitle The Org Manual
@set VERSION 8.2.
3
(GNU Emacs 24.3)
@set VERSION 8.2.
4
(GNU Emacs 24.3)
@c Use proper quote and backtick for code sections in PDF output
@c Cf. Texinfo manual 14.2
...
...
@@ -10518,7 +10518,8 @@ clocktable.
The tags that select a tree for export (@code{org-export-select-tags}). The
default value is @code{:export:}. Within a subtree tagged with
@code{:export:}, you can still exclude entries with @code{:noexport:} (see
below).
below). When headlines are selectively exported with @code{:export:}
anywhere in a file, text before the first headline is ignored.
@item EXCLUDE_TAGS
The tags that exclude a tree from export (@code{org-export-exclude-tags}).
...
...
@@ -12542,13 +12543,13 @@ file. The use of this feature is better illustrated with couple of examples.
@enumerate
@item Embedding ODT tags as part of regular text
You can include simple OpenDocument tags by prefixing them with
@samp{@@}. For example, to highlight a region of text do the following:
You can inline OpenDocument syntax by enclosing it within
@samp{@@@@odt:...@@@@} markup. For example, to highlight a region of text do
the following:
@example
@@<text:span text:style-name="Highlight">This is a
highlighted text@@</text:span>. But this is a
regular text.
@@@@odt:<text:span text:style-name="Highlight">This is a highlighted
text</text:span>@@@@. But this is a regular text.
@end example
@strong{Hint:} To see the above example in action, edit your
...
...
etc/refcards/orgcard.tex
View file @
73d3db82
% Reference Card for Org Mode
\def\orgversionnumber
{
8.2.
3
}
\def\orgversionnumber
{
8.2.
4
}
\def\versionyear
{
2013
}
% latest update
\input
emacsver.tex
...
...
lisp/org/ChangeLog
View file @
73d3db82
2013-12-06 Achim Gratz <Stromeko@Stromeko.DE>
* org-crypt.el: Declare `epg-context´.
(org-encrypt-string): Correct indentation.
* org.el (org-version): Replace `_version´ by `version1´.
2013-12-06 Alexander Vorobiev <alexander.vorobiev@gmail.com> (tiny change)
* org-compat.el (org-get-x-clipboard): Use w32-get-clipboard-data
to get the clipboard data under Windows.
2013-12-06 Bastien Guerry <bzg@gnu.org>
* ox.el (org-export-with-sub-superscripts):
* org.el (org-use-sub-superscripts): Fix version and enhance
docstring again.
* ox.el (org-export-with-sub-superscripts):
* org.el (org-use-sub-superscripts): Enhance docstrings.
* org-macs.el (org-autoload): Delete.
* org-docview.el ("docview"): Fix declarations and require
doc-view directly.
* org-id.el (org-id-copy)
(org-id-get-with-outline-path-completion)
(org-id-get-with-outline-drilling, org-id-new):
* org-colview.el:
(org-colview-initial-truncate-line-value)
(org-columns-open-link, org-string-to-number):
* org-clock.el:
(org-clock-put-overlay, org-count-quarter, org-clock-loaded):
* org-archive.el (org-get-local-archive-location):
* org-agenda.el (org-agenda-todo-custom-ignore-p):
Autoload.
* org.el (org-return-follows-link):
* ob-python.el (org-babel-python-command): Don't use :set.
* ox-odt.el (org-odt-content-template-file): Fix version.
* ox-texinfo.el (org-texinfo-filename): Fix default value.
(org-texinfo-format-headline-function): Use 'ignore as the
default value.
(org-texinfo-format-drawer-function): Use a function as the
default value. Update docstring.
(org-texinfo-drawer): Always use
`org-texinfo-format-drawer-function' as it is now a function
by default.
(org-texinfo-headline): Compare
`org-texinfo-format-headline-function' against 'ignore.
(org-texinfo-inlinetask): Compare
`org-texinfo-format-inlinetask-function' against 'ignore.
* ox-odt.el (org-odt-format-drawer-function): Use a function as
the default value. Update docstring.
(org-odt-format-headline-function)
(org-odt-format-inlinetask-function): Fix default value.
(org-odt-drawer): Always use `org-odt-format-drawer-function'
as it is now a function by default.
(org-odt-format-headline--wrap): Compare
`org-odt-format-headline-function' against 'ignore.
* ox-latex.el (org-latex-format-drawer-function): Use a function
as the default value. Update docstring.
(org-latex-format-inlinetask-function): Fix default value.
(org-latex-drawer): Always use
`org-latex-format-drawer-function' as it is now a function by
default.
(org-latex-inlinetask): Compare
`org-latex-format-inlinetask-function' against 'ignore.
* ox-html.el (org-html-format-drawer-function): Use a function as
the default value. Update docstring.
(org-html-format-headline-function)
(org-html-format-inlinetask-function): Fix default value.
(org-html--format-toc-headline)
(org-html-format-headline--wrap): Compare
`org-html-format-headline-function' against 'ignore.
(org-html-inlinetask): Compare
`org-html-format-inlinetask-function' against 'ignore.
* ox-ascii.el (org-ascii-format-drawer-function): Use a
function as the default value. Update docstring.
(org-ascii-drawer): Always use
`org-ascii-format-drawer-function' as it is now a function by
default.
(org-ascii-format-inlinetask-default): New function.
(org-ascii-format-inlinetask-function): Use
`org-ascii-format-inlinetask-default' as the default.
* org.el (org-mouse-1-follows-link): Use :set to set the default
value. Update custom type.
(org-log-note-headings): Fix order or list items in the custom
type.
(orgstruct-heading-prefix-regexp): Use an empty string as the
default value. Use 'regexp as the custom type.
(orgstruct-make-binding): Tiny docstring enhancement. Assume
`orgstruct-heading-prefix-regexp' is a string.
* org-agenda.el (org-agenda-search-view-max-outline-level): Set
default value to 0. Update docstring.
(org-agenda-deadline-leaders): Fix custom type.
(org-search-view): Assume
`org-agenda-search-view-max-outline-level' is a number.
* ob-ruby.el (org-babel-ruby-nil-to): Fix custom type.
* ob-python.el (org-babel-python-mode): Use :set to set the
default value.
(org-babel-python-None-to): Fix custom type.
* ob-plantuml.el (org-plantuml-jar-path): Fix default value.
(org-babel-execute:plantuml): Assume `org-plantuml-jar-path' is a
string.
* ob-latex.el (org-babel-latex-htlatex): Fix default value.
(org-babel-latex-htlatex-packages): Fix custom type.
(org-babel-execute:latex): Assume `org-babel-latex-htlatex' is a
string.
* ox-odt.el (org-odt-display-outline-level): Fix version.
* ox-odt.el (org-odt-inline-formula-rules)
(org-odt-inline-image-rules, org-odt-use-date-fields): Add version
and package-version.
* ox-html.el (org-html-format-drawer-function)
(org-html-format-headline-function)
(org-html-format-inlinetask-function)
(org-html-creator-string): Add version and package-version.
* ox-html.el (org-html-text-markup-alist): Fix version.
* org-agenda.el (org-agenda-set-restriction-lock): Autoload.
* 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'.
2013-12-06 Nicolas Goaziou <n.goaziou@gmail.com>
* org.el (org-ctrl-c-ctrl-c): When point is on an unsupported
object, look for something to do at a higher level instead of
bailing out.
* ox-html.el (org-html-format-latex): Add an argument. Ensure
latex header is the same as specified in the original buffer when
exporting a LaTeX fragment or environment.
(org-html-latex-environment, org-html-latex-fragment): Apply
signature change.
* ox-publish.el (org-publish-cache-ctime-of-src): Return an error
when publishing a non-existent file.
* org-element.el (org-element-paragraph-separate): More accurate
regexp.
* org.el (org-entry-get): Widen buffer in order to retrieve
properties, as `org-entry-properties' and
`org-entry-get-with-inheritance' already do.
* ox-html.el (org-html--format-toc-headline): Add missing headline
number in TOC entries.
* org.el (org-entry-properties): Ignore narrowing when retrieving
current headline properties.
2013-12-06 Thierry Volpiatto <thierry.volpiatto@gmail.com> (tiny change)
* org-crypt.el (org-encrypt-string, org-encrypt-entry)
(org-decrypt-entry): Fix warning.
2013-11-17 Paul Eggert <eggert@cs.ucla.edu>
Spelling fixes.
lisp/org/ob-latex.el
View file @
73d3db82
...
...
@@ -50,7 +50,7 @@
'
((
:results
.
"latex"
)
(
:exports
.
"results"
))
"Default arguments to use when evaluating a LaTeX source block."
)
(
defcustom
org-babel-latex-htlatex
nil
(
defcustom
org-babel-latex-htlatex
""
"The htlatex command to enable conversion of latex to SVG or HTML."
:group
'org-babel
:type
'string
)
...
...
@@ -59,7 +59,7 @@
'
(
"[usenames]{color}"
"{tikz}"
"{color}"
"{listings}"
"{amsmath}"
)
"Packages to use for htlatex export."
:group
'org-babel
:type
'
(
list
string
))
:type
'
(
list
(
string
)
))
(
defun
org-babel-expand-body:latex
(
body
params
)
"Expand BODY according to PARAMS, return the expanded body."
...
...
@@ -141,7 +141,7 @@ This function is called by `org-babel-execute-src-block'."
(
delete-file
transient-pdf-file
))))))
((
and
(
or
(
string-match
"\\.svg$"
out-file
)
(
string-match
"\\.html$"
out-file
))
org-babel-latex-htlatex
)
(
not
(
string=
""
org-babel-latex-htlatex
))
)
(
with-temp-file
tex-file
(
insert
(
concat
"\\documentclass[preview]{standalone}
...
...
lisp/org/ob-plantuml.el
View file @
73d3db82
...
...
@@ -40,7 +40,7 @@
'
((
:results
.
"file"
)
(
:exports
.
"results"
))
"Default arguments for evaluating a plantuml source block."
)
(
defcustom
org-plantuml-jar-path
nil
(
defcustom
org-plantuml-jar-path
""
"Path to the plantuml.jar file."
:group
'org-babel
:version
"24.1"
...
...
@@ -55,7 +55,7 @@ This function is called by `org-babel-execute-src-block'."
(
cmdline
(
cdr
(
assoc
:cmdline
params
)))
(
in-file
(
org-babel-temp-file
"plantuml-"
))
(
java
(
or
(
cdr
(
assoc
:java
params
))
""
))
(
cmd
(
if
(
not
org-plantuml-jar-path
)
(
cmd
(
if
(
string=
""
org-plantuml-jar-path
)
(
error
"`org-plantuml-jar-path' is not set"
)
(
concat
"java "
java
" -jar "
(
shell-quote-argument
...
...
lisp/org/ob-python.el
View file @
73d3db82
...
...
@@ -54,7 +54,7 @@ This will typically be either 'python or 'python-mode."
:group
'org-babel
:version
"24.4"
:package-version
'
(
Org
.
"8.0"
)
:type
'
function
)
:type
'
symbol
)
(
defvar
org-src-preserve-indentation
)
...
...
@@ -70,7 +70,7 @@ This will typically be either 'python or 'python-mode."
:group
'org-babel
:version
"24.4"
:package-version
'
(
Org
.
"8.0"
)
:type
's
tring
)
:type
's
ymbol
)
(
defun
org-babel-execute:python
(
body
params
)
"Execute a block of Python code with Babel.
...
...
lisp/org/ob-ruby.el
View file @
73d3db82
...
...
@@ -62,9 +62,7 @@
:group
'org-babel
:version
"24.4"
:package-version
'
(
Org
.
"8.0"
)
:type
'string
)
:type
'symbol
)
(
defun
org-babel-execute:ruby
(
body
params
)
"Execute a block of Ruby code with Babel.
...
...
lisp/org/org-agenda.el
View file @
73d3db82
...
...
@@ -1419,13 +1419,14 @@ When nil, they may also match part of a word."
:version "24.1"
:type 'boolean)
(defcustom org-agenda-search-view-max-outline-level
nil
(defcustom org-agenda-search-view-max-outline-level
0
"Maximum outline level to display in search view.
E.g. when this is set to 1, the search view will only
show headlines of level 1."
show headlines of level 1. When set to 0, the default
value, don't limit agenda view by outline level."
:group 'org-agenda-search-view
:version "24.4"
:package-version '(Org . "8.
0
")
:package-version '(Org . "8.
3
")
:type 'integer)
(defgroup org-agenda-time-grid nil
...
...
@@ -1746,10 +1747,9 @@ to capture the number of days."
:version "24.4"
:package-version '(Org . "8.0")
:type '(list
(string :tag "Deadline today ")
(choice :tag "Deadline relative"
(string :tag "Format string")
(function))))
(string :tag "Deadline today ")
(string :tag "Deadline in the future ")
(string :tag "Deadline in the past ")))
(defcustom org-agenda-remove-times-when-in-prefix t
"Non-nil means remove duplicate time specifications in agenda items.
...
...
@@ -4583,7 +4583,7 @@ in `org-agenda-text-search-extra-files'."
(goto-char (max (point-min) (1- (point))))
(while (re-search-forward regexp nil t)
(org-back-to-heading t)
(while (and
org-agenda-search-view-max-outline-level
(while (and
(not (zerop org-agenda-search-view-max-outline-level))
(> (org-reduced-level (org-outline-level))
org-agenda-search-view-max-outline-level)
(forward-line -1)
...
...
@@ -4593,7 +4593,7 @@ in `org-agenda-text-search-extra-files'."
beg1 (point)
end (progn
(outline-next-heading)
(while (and
org-agenda-search-view-max-outline-level
(while (and
(not (zerop org-agenda-search-view-max-outline-level))
(> (org-reduced-level (org-outline-level))
org-agenda-search-view-max-outline-level)
(forward-line 1)
...
...
@@ -5451,6 +5451,7 @@ This function is invoked if `org-agenda-todo-ignore-deadlines',
(>= days n)
(<= days n))))
;;;###autoload
(defun org-agenda-check-for-timestamp-as-reason-to-ignore-todo-item
(&optional end)
"Do we have a reason to ignore this TODO entry because it has a time stamp?"
...
...
lisp/org/org-archive.el
View file @
73d3db82
...
...
@@ -135,6 +135,7 @@ information."
(
match-string
1
))
(
t
org-archive-location
))))))
;;;###autoload
(
defun
org-add-archive-files
(
files
)
"Splice the archive files into the list of files.
This implies visiting all these files and finding out what the
...
...
lisp/org/org-clock.el
View file @
73d3db82
...
...
@@ -1871,6 +1871,7 @@ will be easy to remove."
(
overlay-put
ov
'end-glyph
(
make-glyph
tx
)))
(
push
ov
org-clock-overlays
)))
;;;###autoload
(
defun
org-clock-remove-overlays
(
&optional
beg
end
noremove
)
"Remove the occur highlights from the buffer.
BEG and END are ignored. If NOREMOVE is nil, remove this function
...
...
@@ -2143,6 +2144,7 @@ If you can combine both, the month starting day will have priority."
((
=
n
3
)
"3rd"
)
((
=
n
4
)
"4th"
)))
;;;###autoload
(
defun
org-clocktable-shift
(
dir
n
)
"Try to shift the :block date of the clocktable at point.
Point must be in the #+BEGIN: line of a clocktable, or this function
...
...
@@ -2752,6 +2754,7 @@ This function is made for clock tables."
(
defvar
org-clock-loaded
nil
"Was the clock file loaded?"
)
;;;###autoload
(
defun
org-clock-update-time-maybe
()
"If this is a CLOCK line, update it and return t.
Otherwise, return nil."
...
...
lisp/org/org-colview.el
View file @
73d3db82
...
...
@@ -323,6 +323,7 @@ for the duration of the command.")
(
defvar
org-colview-initial-truncate-line-value
nil
"Remember the value of `truncate-lines' across colview."
)
;;;###autoload
(
defun
org-columns-remove-overlays
()
"Remove all currently active column overlays."
(
interactive
)
...
...
@@ -670,6 +671,7 @@ around it."
(
let
((
value
(
get-char-property
(
point
)
'org-columns-value
)))
(
org-open-link-from-string
value
arg
)))
;;;###autoload
(
defun
org-columns-get-format-and-top-level
()
(
let
((
fmt
(
org-columns-get-format
)))
(
org-columns-goto-top-level
)
...
...
@@ -951,6 +953,8 @@ display, or in the #+COLUMNS line of the current buffer."
(
defvar
org-inlinetask-min-level
(
if
(
featurep
'org-inlinetask
)
org-inlinetask-min-level
15
))
;;;###autoload
(
defun
org-columns-compute
(
property
)
"Sum the values of property PROPERTY hierarchically, for the entire buffer."
(
interactive
)
...
...
@@ -1054,6 +1058,7 @@ display, or in the #+COLUMNS line of the current buffer."
(
setq
sum
(
+
(
string-to-number
(
pop
l
))
(
/
sum
60
))))
sum
)))
;;;###autoload
(
defun
org-columns-number-to-string
(
n
fmt
&optional
printf
)
"Convert a computed column number to a string value, according to FMT."
(
cond
...
...
lisp/org/org-compat.el
View file @
73d3db82
...
...
@@ -190,10 +190,12 @@ If DELETE is non-nil, delete all those overlays."
found
))
(
defun
org-get-x-clipboard
(
value
)
"Get the value of the x clipboard, compatible with XEmacs, and GNU Emacs 21."
(
if
(
eq
window-system
'x
)
(
let
((
x
(
org-get-x-clipboard-compat
value
)))
(
if
x
(
org-no-properties
x
)))))
"Get the value of the x or Windows clipboard, compatible with XEmacs, and GNU Emacs 21."
(
cond
((
eq
window-system
'x
)
(
let
((
x
(
org-get-x-clipboard-compat
value
)))
(
if
x
(
org-no-properties
x
))))
((
and
(
eq
window-system
'w32
)
(
fboundp
'w32-get-clipboard-data
))
(
w32-get-clipboard-data
))))
(
defsubst
org-decompose-region
(
beg
end
)
"Decompose from BEG to END."
...
...
lisp/org/org-crypt.el
View file @
73d3db82
...
...
@@ -73,6 +73,8 @@
compress-algorithm
))
(
declare-function
epg-encrypt-string
"epg"
(
context
plain
recipients
&optional
sign
always-trust
))
(
defvar
epg-context
)
(
defgroup
org-crypt
nil
"Org Crypt."
...
...
@@ -161,8 +163,8 @@ See `org-crypt-disable-auto-save'."
(
if
(
and
(
string=
crypt-key
(
get-text-property
0
'org-crypt-key
str
))
(
string=
(
sha1
str
)
(
get-text-property
0
'org-crypt-checksum
str
)))
(
get-text-property
0
'org-crypt-text
str
)
(
let
((
epg-context
(
epg-make-context
nil
t
t
)
))
(
epg-encrypt-string
epg-context
str
(
epg-list-keys
epg-context
crypt-key
)
))))
(
set
(
make-local-variable
'epg-context
)
(
epg-make-context
nil
t
t
))
(
epg-encrypt-string
epg-context
str
(
epg-list-keys
epg-context
crypt-key
))))
(
defun
org-encrypt-entry
()
"Encrypt the content of the current headline."
...
...
@@ -170,11 +172,11 @@ See `org-crypt-disable-auto-save'."
(
require
'epg
)
(
save-excursion
(
org-back-to-heading
t
)
(
set
(
make-local-variable
'epg-context
)
(
epg-make-context
nil
t
t
))
(
let
((
start-heading
(
point
)))
(
forward-line
)
(
when
(
not
(
looking-at
"-----BEGIN PGP MESSAGE-----"
))
(
let
((
folded
(
outline-invisible-p
))
(
epg-context
(
epg-make-context
nil
t
t
))
(
crypt-key
(
org-crypt-key-for-heading
))
(
beg
(
point
))
end
encrypted-text
)
...
...
@@ -206,11 +208,11 @@ See `org-crypt-disable-auto-save'."
(
forward-line
)
(
when
(
looking-at
"-----BEGIN PGP MESSAGE-----"
)
(
org-crypt-check-auto-save
)
(
set
(
make-local-variable
'epg-context
)
(
epg-make-context
nil
t
t
))
(
let*
((
end
(
save-excursion
(
search-forward
"-----END PGP MESSAGE-----"
)
(
forward-line
)
(
point
)))
(
epg-context
(
epg-make-context
nil
t
t
))
(
encrypted-text
(
buffer-substring-no-properties
(
point
)
end
))
(
decrypted-text
(
decode-coding-string
...
...
lisp/org/org-docview.el
View file @
73d3db82
...
...
@@ -44,12 +44,10 @@
(
require
'org
)
(
require
'doc-view
)
(
declare-function
doc-view-goto-page
"ext:doc-view"
(
page
))
(
declare-function
image-mode-window-get
"ext:image-mode"
(
prop
&optional
winprops
))
(
org-autoload
"doc-view"
'
(
doc-view-goto-page
))
(
declare-function
doc-view-goto-page
"doc-view"
(
page
))
(
declare-function
image-mode-window-get
"image-mode"
(
prop
&optional
winprops
))
(
org-add-link-type
"docview"
'org-docview-open
'org-docview-export
)
(
add-hook
'org-store-link-functions
'org-docview-store-link
)
...
...
lisp/org/org-element.el
View file @
73d3db82
...
...
@@ -143,10 +143,12 @@
"$"
"\\|"
;; Tables (any type).
"\\(?:|\\|\\+-[-+]\\)"
"\\|"
;; Blocks (any type), Babel calls, drawers (any type),
;; fixed-width areas and keywords. Note: this is only an
;; indication and need some thorough check.
"[#:]"
"\\|"
;; Blocks (any type), Babel calls and keywords. Note: this
;; is only an indication and need some thorough check.
"#\\(?:[+ ]\\|$\\)"
"\\|"
;; Drawers (any type) and fixed-width areas. This is also
;; only an indication.
":"
"\\|"
;; Horizontal rules.
"-\\{5,\\}[ \t]*$"
"\\|"
;; LaTeX environments.
...
...
lisp/org/org-id.el
View file @
73d3db82
...
...
@@ -233,6 +233,7 @@ With optional argument FORCE, force the creation of a new ID."
(
org-entry-put
(
point
)
"ID"
nil
))
(
org-id-get
(
point
)
'create
))
;;;###autoload
(
defun
org-id-copy
()
"Copy the ID of the entry at point to the kill ring.
Create an ID if necessary."
...
...
@@ -258,6 +259,7 @@ In any case, the ID of the entry is returned."
(
org-id-add-location
id
(
buffer-file-name
(
buffer-base-buffer
)))
id
)))))
;;;###autoload
(
defun
org-id-get-with-outline-path-completion
(
&optional
targets
)
"Use `outline-path-completion' to retrieve the ID of an entry.
TARGETS may be a setting for `org-refile-targets' to define
...
...
@@ -274,6 +276,7 @@ If necessary, the ID is created."
(
prog1
(
org-id-get
pom
'create
)
(
move-marker
pom
nil
))))
;;;###autoload
(
defun
org-id-get-with-outline-drilling
(
&optional
targets
)
"Use an outline-cycling interface to retrieve the ID of an entry.
This only finds entries in the current buffer, using `org-get-location'.
...
...
@@ -320,6 +323,7 @@ With optional argument MARKERP, return the position as a new marker."
;; Creating new IDs
;;;###autoload
(
defun
org-id-new
(
&optional
prefix
)
"Create a new globally unique ID.
...
...
lisp/org/org-macs.el
View file @
73d3db82
...
...
@@ -283,14 +283,6 @@ we turn off invisibility temporarily. Use this in a `let' form."
(
<=
(
match-beginning
n
)
pos
)
(
>=
(
match-end
n
)
pos
)))
(
defun
org-autoload
(
file
functions
)
"Establish autoload for all FUNCTIONS in FILE, if not bound already."
(
let
((
d
(
format
"Documentation will be available after `%s.el' is loaded."
file
))
f
)
(
while
(
setq
f
(
pop
functions
))
(
or
(
fboundp
f
)
(
autoload
f
file
d
t
)))))
(
defun
org-match-line
(
re
)
"Looking-at at the beginning of the current line."
(
save-excursion
...
...
lisp/org/org-table.el
View file @
73d3db82
...
...
@@ -915,6 +915,7 @@ When nil, simply write \"#ERROR\" in corrupted fields.")
(
setq
org-table-may-need-update
nil
)
))
;;;###autoload
(
defun
org-table-begin
(
&optional
table-type
)
"Find the beginning of the table and return its position.
With argument TABLE-TYPE, go to the beginning of a table.el-type table."
...
...
@@ -928,6 +929,7 @@ With argument TABLE-TYPE, go to the beginning of a table.el-type table."
(
beginning-of-line
2
)
(
point
))))
;;;###autoload
(
defun
org-table-end
(
&optional
table-type
)
"Find the end of the table and return its position.
With argument TABLE-TYPE, go to the end of a table.el-type table."
...
...
@@ -1199,6 +1201,7 @@ Return t when the line exists, nil if it does not exist."
(< (setq cnt (1+ cnt)) N)))
(= cnt N)))
;;;###autoload
(defun org-table-blank-field ()
"
Blank
the
current
table
field
or
active
region.
"
(interactive)
...
...
@@ -4121,7 +4124,7 @@ to execute outside of tables."
'(arg)
(concat "
In
tables,
run
`
" (symbol-name fun) "
'.\n
"
"
Outside
of
tables,
run
the
binding
of
`
"
(mapconcat
(lambda (x) (format "
%s
" x))
keys "
'
or
`
")
(mapconcat
#'key-description
keys "
'
or
`
")
"
'.
")
'(interactive "
p
")
(list 'if
...
...
lisp/org/org.el
View file @
73d3db82
This diff is collapsed.
Click to expand it.
lisp/org/ox-ascii.el
View file @
73d3db82
...
...
@@ -336,7 +336,8 @@ Otherwise, place it right after it."
:package-version
'
(
Org
.
"8.0"
)
:type
'string
)
(
defcustom
org-ascii-format-drawer-function
nil
(
defcustom
org-ascii-format-drawer-function
(
lambda
(
name
contents
width
)
contents
)
"Function called to format a drawer in ASCII.
The function must accept three parameters:
...
...
@@ -347,63 +348,32 @@ The function must accept three parameters:
The function should return either the string to be exported or
nil to ignore the drawer.
For example, the variable could be set to the following function
in order to mimic default behaviour:
\(defun org-ascii-format-drawer-default (name contents width)
\"Format a drawer element for ASCII export.\"
contents)"
The default value simply returns the value of CONTENTS."
:group
'org-export-ascii
:version
"24.4"
:package-version
'
(
Org
.
"8.0"
)
:type
'function
)
(
defcustom
org-ascii-format-inlinetask-function
nil
(
defcustom
org-ascii-format-inlinetask-function
'org-ascii-format-inlinetask-default
"Function called to format an inlinetask in ASCII.
The function must accept six parameters:
TODO the todo keyword, as a string
TODO-TYPE the todo type, a symbol among `todo', `done' and nil.
PRIORITY the inlinetask priority, as a string
NAME the inlinetask name, as a string.
TAGS the inlinetask tags, as a list of strings.
CONTENTS the contents of the inlinetask, as a string.
The function must accept nine parameters:
TODO the todo keyword, as a string