Merge Org 7.8.11 -- important bug fixes.

diff --git a/doc/misc/org.texi b/doc/misc/org.texi
index d4353e26eba151677fe48ca31ac7d7dcd70e1dec..c5e59c9c7e8e840cef04aba745472e017c9ad034 100644 (file)
--- a/doc/misc/org.texi
+++ b/doc/misc/org.texi
@@ -4,8 +4,8 @@
 @setfilename ../../info/org
 @settitle The Org Manual
 
-@set VERSION 7.8.10
-@set DATE May 2012
+@set VERSION 7.8.11
+@set DATE mai 2012
 
 @c Use proper quote and backtick for code sections in PDF output
 @c Cf. Texinfo manual 14.2

diff --git a/etc/refcards/orgcard.pdf b/etc/refcards/orgcard.pdf
index 44cc7bf89ae68d81d05a5049c75a6165834923db..2b474bf4e93dc94b194ea088c0d00bc92354f963 100644 (file)
Binary files a/etc/refcards/orgcard.pdf and b/etc/refcards/orgcard.pdf differ

diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex
index 6bebbaa9f614548a98f5eba1db1710e44355ad52..3c0584d6db4fa77e8495ac4e9ab6e83b1c217494 100644 (file)
--- a/etc/refcards/orgcard.tex
+++ b/etc/refcards/orgcard.tex
@@ -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
 

diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 19f6a15dc9c8ec735e70adf76a2608ceae72e3b4..24133ef850d406e67e3e3e5ca503b179593afa72 100644 (file)
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,33 @@
+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

diff --git a/lisp/org/ob-plantuml.el b/lisp/org/ob-plantuml.el
index 55729eb417228e126601d2fb29153e4179d3d6d1..7da689393a3f5ea2db70224415ac34805929cc8e 100644 (file)
--- a/lisp/org/ob-plantuml.el
+++ b/lisp/org/ob-plantuml.el
@@ -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")

diff --git a/lisp/org/ob.el b/lisp/org/ob.el
index 69d7da4cb0ecc161688b2512afb89b1d2d2fc1e1..05122487588c2fce4b13c01b2a94f7e98f8de3d9 100644 (file)
--- a/lisp/org/ob.el
+++ b/lisp/org/ob.el
@@ -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."

diff --git a/lisp/org/org-exp-blocks.el b/lisp/org/org-exp-blocks.el
index 7d466cec65db8d90947ad2def8c743eaaa426dc6..fbac659209052413beb65d242842cf56f65860c0 100644 (file)
--- a/lisp/org/org-exp-blocks.el
+++ b/lisp/org/org-exp-blocks.el
@@ -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)

diff --git a/lisp/org/org-lparse.el b/lisp/org/org-lparse.el
index c9669dd8ab4d54a58532a008d5880e928bb8b4f0..9c3cd5b481108fb5ffda9dde63b2a8975c66a027 100644 (file)
--- a/lisp/org/org-lparse.el
+++ b/lisp/org/org-lparse.el
@@ -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

diff --git a/lisp/org/org-odt.el b/lisp/org/org-odt.el
index 2e984a575bd32e34c2453c645659bfb24bd85020..8475eaae58fa5e84a325627fe6a313e4daad662e 100644 (file)
--- a/lisp/org/org-odt.el
+++ b/lisp/org/org-odt.el
@@ -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")

diff --git a/lisp/org/org.el b/lisp/org/org.el
index 4710bd5bd8681bcebedaaa466d672eea87bd0f45..fd5250a24be193eb2a9c5a136b3087e32cf766e2 100644 (file)
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -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 @@ identifier."
 
 ;;; 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 @@ 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