summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Leech-Pepin <jonathan.leechpepin@gmail.com>2013-04-23 09:25:46 -0400
committerJonathan Leech-Pepin <jonathan.leechpepin@gmail.com>2013-04-23 09:25:46 -0400
commitfea4b5c3adee820cde4b1257dee603c0d29ea8b2 (patch)
tree1c53a8cb132dc22a73c5255dd4ce79bc7a4b6b6e
parent4873682eb12c741c8c7b1ecc862df9d042a4dec6 (diff)
downloadorg-mode-fea4b5c3adee820cde4b1257dee603c0d29ea8b2.tar.gz
ox-texinfo: Default to buffer-file-coding-system when exporting
* lisp/ox-texinfo.el (org-texinfo-coding-system): Clarify default setting. (org-texinfo-template): Ensure buffer-file-coding-system is used when org-texinfo-coding-system is not set.
-rw-r--r--lisp/ox-texinfo.el13
1 files changed, 8 insertions, 5 deletions
diff --git a/lisp/ox-texinfo.el b/lisp/ox-texinfo.el
index b566324..9cdd08e 100644
--- a/lisp/ox-texinfo.el
+++ b/lisp/ox-texinfo.el
@@ -149,7 +149,9 @@
:type '(string :tag "Export Filename"))
(defcustom org-texinfo-coding-system nil
- "Default document encoding for Texinfo output."
+ "Default document encoding for Texinfo output.
+
+If `nil' it will default to `buffer-file-coding-system'."
:group 'org-export-texinfo
:type 'coding-system)
@@ -693,7 +695,9 @@ holding export options."
;; `.' in text.
(dirspacing (- 29 (length dirtitle)))
(menu (org-texinfo-make-menu info 'main))
- (detail-menu (org-texinfo-make-menu info 'detailed)))
+ (detail-menu (org-texinfo-make-menu info 'detailed))
+ (coding-system (or org-texinfo-coding-system
+ buffer-file-coding-system)))
(concat
;; Header
header "\n"
@@ -701,9 +705,8 @@ holding export options."
;; Filename and Title
"@setfilename " info-filename "\n"
"@settitle " title "\n"
- (if org-texinfo-coding-system
- (format "@documentencoding %s\n"
- (upcase (symbol-name org-texinfo-coding-system))) "\n")
+ (format "@documentencoding %s\n"
+ (upcase (symbol-name coding-system))) "\n"
(format "@documentlanguage %s\n" lang)
"\n\n"
"@c Version and Contact Info\n"