Merge branch 'maint'

2015-04-29 07:57:07 +02:00 · 2015-04-29 07:57:07 +02:00 · 86dcd90771
parent 2e2f68467c 8cc7b72160
commit 86dcd90771
2 changed files with 2 additions and 2 deletions
--- a/doc/org.texi
+++ b/doc/org.texi
@ -1,4 +1,4 @@
-\input texinfo
+\input texinfo  @c -*- coding: utf-8 -*-
@c %**start of header
@setfilename ../../info/org.info
@settitle The Org Manual
--- a/lisp/ox-ascii.el
+++ b/lisp/ox-ascii.el
@ -2131,7 +2131,7 @@ Return output file name."

 ;; Local variables:
 ;; generated-autoload-file: "org-loaddefs.el"
-;; coding: utf-8-emacs
+;; coding: utf-8
 ;; End:

 ;;; ox-ascii.el ends here