From 8cc7b72160b2214311526aa072175d580e648aff Mon Sep 17 00:00:00 2001
From: Bastien <bzg@gnu.org>
Date: Wed, 29 Apr 2015 07:56:37 +0200
Subject: [PATCH] Backport commit 25166a91 from Emacs master branch.

---
 doc/org.texi     | 2 +-
 lisp/ox-ascii.el | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/org.texi b/doc/org.texi
index 95382cde1..5f248e940 100644
--- 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
 @settitle The Org Manual
diff --git a/lisp/ox-ascii.el b/lisp/ox-ascii.el
index cd2a9af10..7e24f903a 100644
--- a/lisp/ox-ascii.el
+++ b/lisp/ox-ascii.el
@@ -1965,7 +1965,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
-- 
2.11.4.GIT