[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108014: Merge Org 7.8.11 -- impor
From: |
Bastien Guerry |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108014: Merge Org 7.8.11 -- important bug fixes. |
Date: |
Fri, 25 May 2012 09:39:32 +0200 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 108014
committer: Bastien Guerry <address@hidden>
branch nick: emacs-24
timestamp: Fri 2012-05-25 09:39:32 +0200
message:
Merge Org 7.8.11 -- important bug fixes.
modified:
doc/misc/org.texi
etc/refcards/orgcard.pdf
etc/refcards/orgcard.tex
lisp/org/ChangeLog
lisp/org/ob-plantuml.el
lisp/org/ob.el
lisp/org/org-exp-blocks.el
lisp/org/org-lparse.el
lisp/org/org-odt.el
lisp/org/org.el
=== modified file 'doc/misc/org.texi'
--- a/doc/misc/org.texi 2012-05-16 17:33:50 +0000
+++ b/doc/misc/org.texi 2012-05-25 07:39:32 +0000
@@ -4,8 +4,8 @@
@setfilename ../../info/org
@settitle The Org Manual
address@hidden VERSION 7.8.10
address@hidden DATE May 2012
address@hidden VERSION 7.8.11
address@hidden DATE mai 2012
@c Use proper quote and backtick for code sections in PDF output
@c Cf. Texinfo manual 14.2
=== modified file 'etc/refcards/orgcard.pdf'
Binary files a/etc/refcards/orgcard.pdf 2012-05-16 17:33:50 +0000 and
b/etc/refcards/orgcard.pdf 2012-05-25 07:39:32 +0000 differ
=== modified file 'etc/refcards/orgcard.tex'
--- a/etc/refcards/orgcard.tex 2012-05-16 17:33:50 +0000
+++ b/etc/refcards/orgcard.tex 2012-05-25 07:39:32 +0000
@@ -1,5 +1,5 @@
% Reference Card for Org Mode
-\def\orgversionnumber{7.8.10}
+\def\orgversionnumber{7.8.11}
\def\versionyear{2012} % latest update
\def\year{2012} % latest copyright year
=== modified file 'lisp/org/ChangeLog'
--- a/lisp/org/ChangeLog 2012-05-16 21:53:39 +0000
+++ b/lisp/org/ChangeLog 2012-05-25 07:39:32 +0000
@@ -1,3 +1,33 @@
+2012-05-25 Jambunathan K <address@hidden>
+
+ * org-odt.el (org-odt-init-outfile)
+ (org-odt-write-manifest-file): Disable
+ `nxml-auto-insert-xml-declaration-flag'.
+
+2012-05-25 Bastien Guerry <address@hidden>
+
+ * org.el (org-scan-tags): Fix bug when building the scanner
+ regexp.
+
+2012-05-25 Eric Schulte <address@hidden>
+
+ * 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 <address@hidden>
+
+ * ob-plantuml.el (org-babel-execute:plantuml): Adding a :java
+ header argument to plantuml.
+
+2012-05-25 Eric Schulte <address@hidden>
+
+ * 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 <address@hidden>
* ob.el (org-babel-parse-src-block-match): Save match data during
=== modified file 'lisp/org/ob-plantuml.el'
--- a/lisp/org/ob-plantuml.el 2012-04-03 12:02:21 +0000
+++ b/lisp/org/ob-plantuml.el 2012-05-25 07:39:32 +0000
@@ -55,9 +55,10 @@
(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")
=== modified file 'lisp/org/ob.el'
--- a/lisp/org/ob.el 2012-05-16 21:53:39 +0000
+++ b/lisp/org/ob.el 2012-05-25 07:39:32 +0000
@@ -1958,11 +1958,16 @@
(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 @@
(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."
=== modified file 'lisp/org/org-exp-blocks.el'
--- a/lisp/org/org-exp-blocks.el 2012-04-03 12:02:21 +0000
+++ b/lisp/org/org-exp-blocks.el 2012-05-25 07:39:32 +0000
@@ -211,7 +211,13 @@
(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)
=== modified file 'lisp/org/org-lparse.el'
--- a/lisp/org/org-lparse.el 2012-04-01 09:49:25 +0000
+++ b/lisp/org/org-lparse.el 2012-05-25 07:39:32 +0000
@@ -1111,9 +1111,6 @@
(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
=== modified file 'lisp/org/org-odt.el'
--- a/lisp/org/org-odt.el 2012-04-26 17:30:04 +0000
+++ b/lisp/org/org-odt.el 2012-05-25 07:39:32 +0000
@@ -2211,7 +2211,9 @@
(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 @@
(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")
=== modified file 'lisp/org/org.el'
--- a/lisp/org/org.el 2012-05-16 17:33:50 +0000
+++ b/lisp/org/org.el 2012-05-25 07:39:32 +0000
@@ -6,7 +6,7 @@
;; Maintainer: Bastien Guerry <bzg at gnu dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
-;; Version: 7.8.10
+;; Version: 7.8.11
;;
;; This file is part of GNU Emacs.
;;
@@ -206,7 +206,7 @@
;;; Version
-(defconst org-version "7.8.10"
+(defconst org-version "7.8.11"
"The version number of the file org.el.")
;;;###autoload
@@ -12828,10 +12828,7 @@
org-outline-regexp)
" *\\(\\<\\("
(mapconcat 'regexp-quote org-todo-keywords-1 "\\|")
- (org-re
- (if todo-only
- "\\>\\)\\)[
\t]+\\(.*?\\)\\(:[[:alnum:address@hidden:]+:\\)?[ \t]*$"
- "\\>\\)\\)? *\\([^
].*?\\)\\(:[[:alnum:address@hidden:]+:\\)?[ \t]*$"))))
+ (org-re "\\)\\>\\)?
*\\(.*?\\)\\(:[[:alnum:address@hidden:]+:\\)?[ \t]*$")))
(props (list 'face 'default
'done-face 'org-agenda-done
'undone-face 'default
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/emacs-24 r108014: Merge Org 7.8.11 -- important bug fixes.,
Bastien Guerry <=