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
Open sidebar
emacs
emacs
Commits
2a88ee23
Commit
2a88ee23
authored
May 25, 2012
by
Bastien Guerry
Browse files
Merge Org 7.8.11 -- important bug fixes.
parent
2f9b9adb
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
61 additions
and
20 deletions
+61
-20
doc/misc/org.texi
doc/misc/org.texi
+2
-2
etc/refcards/orgcard.pdf
etc/refcards/orgcard.pdf
+0
-0
etc/refcards/orgcard.tex
etc/refcards/orgcard.tex
+1
-1
lisp/org/ChangeLog
lisp/org/ChangeLog
+30
-0
lisp/org/ob-plantuml.el
lisp/org/ob-plantuml.el
+2
-1
lisp/org/ob.el
lisp/org/ob.el
+11
-4
lisp/org/org-exp-blocks.el
lisp/org/org-exp-blocks.el
+7
-1
lisp/org/org-lparse.el
lisp/org/org-lparse.el
+0
-3
lisp/org/org-odt.el
lisp/org/org-odt.el
+5
-2
lisp/org/org.el
lisp/org/org.el
+3
-6
No files found.
doc/misc/org.texi
View file @
2a88ee23
...
...
@@ -4,8 +4,8 @@
@setfilename ../../info/org
@settitle The Org Manual
@set VERSION 7.8.1
0
@set DATE
May
2012
@set VERSION 7.8.1
1
@set DATE
mai
2012
@c Use proper quote and backtick for code sections in PDF output
@c Cf. Texinfo manual 14.2
...
...
etc/refcards/orgcard.pdf
View file @
2a88ee23
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
etc/refcards/orgcard.tex
View file @
2a88ee23
% Reference Card for Org Mode
\def\orgversionnumber
{
7.8.1
0
}
\def\orgversionnumber
{
7.8.1
1
}
\def\versionyear
{
2012
}
% latest update
\def\year
{
2012
}
% latest copyright year
...
...
lisp/org/ChangeLog
View file @
2a88ee23
2012-05-25 Jambunathan K <kjambunathan@gmail.com>
* org-odt.el (org-odt-init-outfile)
(org-odt-write-manifest-file): Disable
`nxml-auto-insert-xml-declaration-flag'.
2012-05-25 Bastien Guerry <bzg@gnu.org>
* org.el (org-scan-tags): Fix bug when building the scanner
regexp.
2012-05-25 Eric Schulte <eric.schulte@gmx.com>
* ob.el (org-babel-capitalize-examplize-region-markers): Controls
the capitalization of begin and end example blocks.
(org-babel-examplize-region): Optionally capitalize example block
delimiters.
2012-05-25 Eric Schulte <eric.schulte@gmx.com>
* ob-plantuml.el (org-babel-execute:plantuml): Adding a :java
header argument to plantuml.
2012-05-25 Eric Schulte <eric.schulte@gmx.com>
* org-exp-blocks.el (org-export-blocks-preprocess): Even when the
body of a block is not indented the boundary markers should be
indented to their original positions so things like list
indentation still work.
2012-05-16 Eric Schulte <eric.schulte@gmx.com>
* ob.el (org-babel-parse-src-block-match): Save match data during
...
...
lisp/org/ob-plantuml.el
View file @
2a88ee23
...
...
@@ -55,9 +55,10 @@ This function is called by `org-babel-execute-src-block'."
(
error
"plantuml requires a \":file\" header argument"
)))
(
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
)
(
error
"`org-plantuml-jar-path' is not set"
)
(
concat
"java -jar "
(
concat
"java
"
java
"
-jar "
(
shell-quote-argument
(
expand-file-name
org-plantuml-jar-path
))
(
if
(
string=
(
file-name-extension
out-file
)
"svg"
)
...
...
lisp/org/ob.el
View file @
2a88ee23
...
...
@@ -1958,11 +1958,16 @@ file's directory then expand relative links."
(
stringp
(
car
result
))
(
stringp
(
cadr
result
)))
(
format
"[[file:%s][%s]]"
(
car
result
)
(
cadr
result
))))))
(
defvar
org-babel-capitalize-examplize-region-markers
nil
"Make true to capitalize begin/end example markers inserted by code blocks."
)
(
defun
org-babel-examplize-region
(
beg
end
&optional
results-switches
)
"Comment out region using the inline '==' or ': ' org example quote."
(
interactive
"*r"
)
(
flet
((
chars-between
(
b
e
)
(
not
(
string-match
"^[\\s]*$"
(
buffer-substring
b
e
)))))
(
not
(
string-match
"^[\\s]*$"
(
buffer-substring
b
e
))))
(
maybe-cap
(
str
)
(
if
org-babel-capitalize-examplize-region-markers
(
upcase
str
)
str
)))
(
if
(
or
(
chars-between
(
save-excursion
(
goto-char
beg
)
(
point-at-bol
))
beg
)
(
chars-between
end
(
save-excursion
(
goto-char
end
)
(
point-at-eol
))))
(
save-excursion
...
...
@@ -1979,10 +1984,12 @@ file's directory then expand relative links."
(
t
(
goto-char
beg
)
(
insert
(
if
results-switches
(
format
"#+begin_example%s\n"
results-switches
)
"#+begin_example\n"
))
(
format
"%s%s\n"
(
maybe-cap
"#+begin_example"
)
results-switches
)
(
maybe-cap
"#+begin_example\n"
)))
(
if
(
markerp
end
)
(
goto-char
end
)
(
forward-char
(
-
end
beg
)))
(
insert
"#+end_example\n"
))))))))
(
insert
(
maybe-cap
"#+end_example\n"
))))))))
)
(
defun
org-babel-update-block-body
(
new-body
)
"Update the body of the current code block to NEW-BODY."
...
...
lisp/org/org-exp-blocks.el
View file @
2a88ee23
...
...
@@ -211,7 +211,13 @@ which defaults to the value of `org-export-blocks-witheld'."
(
when
replacement
(
delete-region
match-start
match-end
)
(
goto-char
match-start
)
(
insert
replacement
)
(
unless
preserve-indent
(
if
preserve-indent
;; indent only the code block markers
(
save-excursion
(
indent-line-to
indentation
)
; indent end_block
(
goto-char
match-start
)
(
indent-line-to
indentation
))
; indent begin_block
;; indent everything
(
indent-code-rigidly
match-start
(
point
)
indentation
)))))
;; cleanup markers
(
set-marker
match-start
nil
)
...
...
lisp/org/org-lparse.el
View file @
2a88ee23
...
...
@@ -1111,9 +1111,6 @@ version."
(
unless
body-only
(
org-lparse-end
'DOCUMENT-CONTENT
))
(
unless
(
plist-get
opt-plist
:buffer-will-be-killed
)
(
set-auto-mode
t
))
(
org-lparse-end
'EXPORT
)
;; kill collection buffer
...
...
lisp/org/org-odt.el
View file @
2a88ee23
...
...
@@ -2211,7 +2211,9 @@ captions on export.")
(
content-file
(
expand-file-name
"content.xml"
outdir
)))
;; init conten.xml
(
with-current-buffer
(
find-file-noselect
content-file
t
))
(
with-current-buffer
(
let
((
nxml-auto-insert-xml-declaration-flag
nil
))
(
find-file-noselect
content-file
t
)))
;; reset variables
(
setq
org-odt-manifest-file-entries
nil
...
...
@@ -2320,7 +2322,8 @@ visually."
(
make-directory
"META-INF"
)
(
let
((
manifest-file
(
expand-file-name
"META-INF/manifest.xml"
)))
(
with-current-buffer
(
find-file-noselect
manifest-file
t
)
(
let
((
nxml-auto-insert-xml-declaration-flag
nil
))
(
find-file-noselect
manifest-file
t
))
(
insert
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>
<manifest:manifest xmlns:manifest=\"urn:oasis:names:tc:opendocument:xmlns:manifest:1.0\" manifest:version=\"1.2\">\n"
)
...
...
lisp/org/org.el
View file @
2a88ee23
...
...
@@ -6,7 +6,7 @@
;; Maintainer: Bastien Guerry <bzg at gnu dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
;; Version: 7.8.1
0
;; Version: 7.8.1
1
;;
;; This file is part of GNU Emacs.
;;
...
...
@@ -206,7 +206,7 @@ identifier."
;;; Version
(defconst org-version "7.8.1
0
"
(defconst org-version "7.8.1
1
"
"The version number of the file org.el.")
;;;###autoload
...
...
@@ -12828,10 +12828,7 @@ headlines matching this string."
org-outline-regexp)
" *\\(\\<\\("
(mapconcat 'regexp-quote org-todo-keywords-1 "\\|")
(org-re
(if todo-only
"\\>\\)\\)[ \t]+\\(.*?\\)\\(:[[:alnum:]_@#%:]+:\\)?[ \t]*$"
"\\>\\)\\)? *\\([^ ].*?\\)\\(:[[:alnum:]_@#%:]+:\\)?[ \t]*$"))))
(org-re "\\)\\>\\)? *\\(.*?\\)\\(:[[:alnum:]_@#%:]+:\\)?[ \t]*$")))
(props (list 'face 'default
'done-face 'org-agenda-done
'undone-face 'default
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment