[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108015: Fix major bug in the Org>ODT exporter.

[Bastien Guerry]

------------------------------------------------------------
revno: 108015
committer: Bastien Guerry <address@hidden>
branch nick: emacs-24
timestamp: Fri 2012-05-25 23:09:08 +0200
message:
  Fix major bug in the Org>ODT exporter.
modified:
  lisp/org/ChangeLog
  lisp/org/org-odt.el
  lisp/org/org.el

=== modified file 'lisp/org/ChangeLog'
--- a/lisp/org/ChangeLog        2012-05-25 07:39:32 +0000
+++ b/lisp/org/ChangeLog        2012-05-25 21:09:08 +0000
@@ -1,3 +1,20 @@
+2012-05-25 Mark Shoulson <address@hidden>  (tiny change)
+
+       * org.el (org-fontify-entities): Fix bug: The entities \sup[123]
+       and \there4 were not "prettified" when org-pretty-entities was
+       enabled.
+
+2012-05-235  Nicolas Goaziou  <address@hidden>
+
+       * org.el (org-font-lock-add-priority-faces): Restrict priorities
+       fontification to headlines and inlinetasks.
+
+2012-05-25  Jambunathan K  <address@hidden>
+
+       * org-odt.el (org-odt-init-outfile): Fix previous commit.  Make
+       sure that nxml-mode is loaded before let-binding
+       `nxml-auto-insert-xml-declaration-flag'.
+
 2012-05-25  Jambunathan K  <address@hidden>
 
        * org-odt.el (org-odt-init-outfile)

=== modified file 'lisp/org/org-odt.el'
--- a/lisp/org/org-odt.el       2012-05-25 07:39:32 +0000
+++ b/lisp/org/org-odt.el       2012-05-25 21:09:08 +0000
@@ -2211,9 +2211,9 @@
         (content-file (expand-file-name "content.xml" outdir)))
 
     ;; init conten.xml
-    (with-current-buffer
-       (let ((nxml-auto-insert-xml-declaration-flag nil))
-         (find-file-noselect content-file t)))
+    (require 'nxml-mode)
+    (let ((nxml-auto-insert-xml-declaration-flag nil))
+      (find-file-noselect content-file t))
 
     ;; reset variables
     (setq org-odt-manifest-file-entries nil

=== modified file 'lisp/org/org.el'
--- a/lisp/org/org.el   2012-05-25 07:39:32 +0000
+++ b/lisp/org/org.el   2012-05-25 21:09:08 +0000
@@ -5917,7 +5917,7 @@
     (when org-pretty-entities
       (catch 'match
        (while (re-search-forward
-               
"\\\\\\(frac[13][24]\\|[a-zA-Z]+\\)\\($\\|{}\\|[^[:alpha:]\n]\\)"
+               
"\\\\\\(there4\\|sup[123]\\|frac[13][24]\\|[a-zA-Z]+\\)\\($\\|{}\\|[^[:alpha:]\n]\\)"
                limit t)
          (if (and (not (org-in-indented-comment-line))
                   (setq ee (org-entity-get (match-string 1)))
@@ -5990,14 +5990,15 @@
 (defun org-font-lock-add-priority-faces (limit)
   "Add the special priority faces."
   (while (re-search-forward "\\[#\\([A-Z0-9]\\)\\]" limit t)
-    (add-text-properties
-     (match-beginning 0) (match-end 0)
-     (list 'face (or (org-face-from-face-or-color
-                     'priority 'org-special-keyword
-                     (cdr (assoc (char-after (match-beginning 1))
-                                 org-priority-faces)))
-                    'org-special-keyword)
-          'font-lock-fontified t))))
+    (when (save-match-data (org-at-heading-p))
+      (add-text-properties
+       (match-beginning 0) (match-end 0)
+       (list 'face (or (org-face-from-face-or-color
+                       'priority 'org-special-keyword
+                       (cdr (assoc (char-after (match-beginning 1))
+                                   org-priority-faces)))
+                      'org-special-keyword)
+            'font-lock-fontified t)))))
 
 (defun org-get-tag-face (kwd)
   "Get the right face for a TODO keyword KWD.