Browse Source

Merge remote branch 'origin/maint'

Jambunathan K 13 years ago
parent
commit
79bf7dfe7e
1 changed files with 6 additions and 1 deletions
  1. 6 1
      lisp/org-odt.el

+ 6 - 1
lisp/org-odt.el

@@ -414,7 +414,10 @@ Interactive commands `org-export-as-odt' and
 then use `org-export-odt-convert-process' to convert the
 then use `org-export-odt-convert-process' to convert the
 resulting document to this format.  During customization of this
 resulting document to this format.  During customization of this
 variable, the list of valid values are populated based on
 variable, the list of valid values are populated based on
-`org-export-odt-convert-capabilities'."
+`org-export-odt-convert-capabilities'.
+
+You can set this option on per-file basis using file local
+values.  See Info node `(emacs) File Variables'."
   :group 'org-export-odt
   :group 'org-export-odt
   :version "24.1"
   :version "24.1"
   :type '(choice :convert-widget
   :type '(choice :convert-widget
@@ -425,6 +428,8 @@ variable, the list of valid values are populated based on
 		   ,@(mapcar (lambda (c)
 		   ,@(mapcar (lambda (c)
 			       `(const :tag ,c ,c))
 			       `(const :tag ,c ,c))
 			     (org-lparse-reachable-formats "odt")))))
 			     (org-lparse-reachable-formats "odt")))))
+;;;###autoload
+(put 'org-export-odt-preferred-output-format 'safe-local-variable 'stringp)
 
 
 (defmacro org-odt-cleanup-xml-buffers (&rest body)
 (defmacro org-odt-cleanup-xml-buffers (&rest body)
   `(let ((org-odt-zip-dir
   `(let ((org-odt-zip-dir