diff options
| author | Bastien <bzg@gnu.org> | 2015-04-29 07:57:07 +0200 |
|---|---|---|
| committer | Bastien <bzg@gnu.org> | 2015-04-29 07:57:07 +0200 |
| commit | 86dcd907719c97530a266686694a7dc7bd25449a (patch) | |
| tree | 70df53d8b4ab4c135a0961d6f22a62466dec7e8f | |
| parent | 2e2f68467c4da2928b9b42b89f0ff164bb4b8722 (diff) | |
| parent | 8cc7b72160b2214311526aa072175d580e648aff (diff) | |
| download | org-mode-86dcd907719c97530a266686694a7dc7bd25449a.tar.gz | |
Merge branch 'maint'
| -rw-r--r-- | doc/org.texi | 2 | ||||
| -rw-r--r-- | lisp/ox-ascii.el | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/org.texi b/doc/org.texi index 9d5632c..7b78417 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.info @settitle The Org Manual diff --git a/lisp/ox-ascii.el b/lisp/ox-ascii.el index a5da541..daf3988 100644 --- 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 |