Update source file encoding list

Update admin/notes/unicode, along with coding system cookies in
other files, so that the two match each other better.
* admin/notes/unicode: lisp/language/ethio-util.el and
lisp/language/ethiopic.el also use utf-8-emacs.
* admin/notes/hydra, doc/misc/dbus.texi, doc/misc/org.texi:
* doc/misc/remember.texi, etc/refcards/cs-dired-ref.tex:
* etc/refcards/cs-refcard.tex, etc/refcards/cs-survival.tex:
* etc/refcards/sk-dired-ref.tex, etc/refcards/sk-refcard.tex:
* etc/refcards/sk-survival.tex:
Add "coding: utf-8" so that this file is not mishandled in a
Latin-1 or Big-5 locale.
* lisp/international/robin.el, lisp/org/ox-ascii.el:
Specify utf-8, not utf-8-emacs, as these are plain UTF-8 files.
* lisp/language/ethio-util.el: Fix trailer.

14 files changed, 17 insertions, 17 deletions

diff --git a/admin/notes/hydra b/admin/notes/hydra
index 7f8615de975..80ce787b6b0 100644
--- a/admin/notes/hydra
+++ b/admin/notes/hydra
@@ -1,4 +1,4 @@
--*- outline -*-
+-*- mode: outline; coding: utf-8 -*-
 
 Copyright (C) 2013-2015 Free Software Foundation, Inc.
 See the end of the file for license conditions.
diff --git a/admin/notes/unicode b/admin/notes/unicode
index 13971ef18c0..028bcc187af 100644
--- a/admin/notes/unicode
+++ b/admin/notes/unicode
@@ -167,8 +167,8 @@ nontrivial changes to the build process.
         leim/CXTERM-DIC/QJ.tit
         leim/CXTERM-DIC/SW.tit
         leim/CXTERM-DIC/TONEPY.tit
-        leim/MISC-DIC/pinyin.map
         leim/MISC-DIC/CTLau.html
+        leim/MISC-DIC/pinyin.map
         leim/MISC-DIC/ziranma.cin
 
  * cp850
@@ -237,9 +237,11 @@ nontrivial changes to the build process.
 
      These files contain characters that cannot be encoded in UTF-8.
 
-        lisp/language/tibetan.el
-        lisp/language/tibet-util.el
+        lisp/language/ethio-util.el
+        lisp/language/ethiopic.el
         lisp/language/ind-util.el
+        lisp/language/tibet-util.el
+        lisp/language/tibetan.el
         lisp/leim/quail/ethiopic.el
         lisp/leim/quail/tibetan.el
 
diff --git a/doc/misc/dbus.texi b/doc/misc/dbus.texi
index 2eef4f4e7e7..da18236bcf5 100644
--- a/doc/misc/dbus.texi
+++ b/doc/misc/dbus.texi
@@ -1,4 +1,4 @@
-\input texinfo   @c -*-texinfo-*-
+\input texinfo  @c -*- coding: utf-8 -*-
 @setfilename ../../info/dbus.info
 @c %**start of header
 @settitle Using of D-Bus
diff --git a/doc/misc/org.texi b/doc/misc/org.texi
index a2cc51ec259..a013632b4da 100644
--- a/doc/misc/org.texi
+++ b/doc/misc/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/doc/misc/remember.texi b/doc/misc/remember.texi
index 13594d97a97..d64d0eaab62 100644
--- a/doc/misc/remember.texi
+++ b/doc/misc/remember.texi
@@ -1,4 +1,4 @@
-\input texinfo @c -*-texinfo-*-
+\input texinfo  @c -*- mode: texinfo; coding: utf-8 -*-
 @c %**start of header
 @setfilename ../../info/remember.info
 @settitle Remember Manual
diff --git a/etc/refcards/cs-dired-ref.tex b/etc/refcards/cs-dired-ref.tex
index 29a9b09ce57..ac1d27ae5b3 100644
--- a/etc/refcards/cs-dired-ref.tex
+++ b/etc/refcards/cs-dired-ref.tex
@@ -1,4 +1,4 @@
-% Reference Card for Dired
+% Reference Card for Dired -*- coding: utf-8 -*-
 
 % Copyright (C) 2000-2015 Free Software Foundation, Inc.
 
diff --git a/etc/refcards/cs-refcard.tex b/etc/refcards/cs-refcard.tex
index 29ea258103e..3158b5bc64b 100644
--- a/etc/refcards/cs-refcard.tex
+++ b/etc/refcards/cs-refcard.tex
@@ -1,4 +1,4 @@
-% Reference Card for GNU Emacs
+% Reference Card for GNU Emacs -*- coding: utf-8 -*-
 
 % Copyright (C) 1987, 1993, 1996-1997, 2001-2015 Free Software
 % Foundation, Inc.
diff --git a/etc/refcards/cs-survival.tex b/etc/refcards/cs-survival.tex
index 72162c3a7df..cdf261a498e 100644
--- a/etc/refcards/cs-survival.tex
+++ b/etc/refcards/cs-survival.tex
@@ -1,4 +1,4 @@
-% Title:  GNU Emacs Survival Card
+% Title:  GNU Emacs Survival Card -*- coding: utf-8 -*-
 
 % Copyright (C) 2000-2015 Free Software Foundation, Inc.
 
diff --git a/etc/refcards/sk-dired-ref.tex b/etc/refcards/sk-dired-ref.tex
index 8f898560b03..57a4b5b424a 100644
--- a/etc/refcards/sk-dired-ref.tex
+++ b/etc/refcards/sk-dired-ref.tex
@@ -1,4 +1,4 @@
-% Reference Card for Dired
+% Reference Card for Dired -*- coding: utf-8 -*-
 
 % Copyright (C) 2000-2015 Free Software Foundation, Inc.
 
diff --git a/etc/refcards/sk-refcard.tex b/etc/refcards/sk-refcard.tex
index a8d07607cc8..e2df212fa6a 100644
--- a/etc/refcards/sk-refcard.tex
+++ b/etc/refcards/sk-refcard.tex
@@ -1,4 +1,4 @@
-% Reference Card for GNU Emacs
+% Reference Card for GNU Emacs -*- coding: utf-8 -*-
 
 % Copyright (C) 1987, 1993, 1996-1997, 2001-2015 Free Software
 % Foundation, Inc.
diff --git a/etc/refcards/sk-survival.tex b/etc/refcards/sk-survival.tex
index 363716c8bff..9f25b6ad52d 100644
--- a/etc/refcards/sk-survival.tex
+++ b/etc/refcards/sk-survival.tex
@@ -1,4 +1,4 @@
-% Title:  GNU Emacs Survival Card
+% Title:  GNU Emacs Survival Card -*- coding: utf-8 -*-
 
 % Copyright (C) 2000-2015 Free Software Foundation, Inc.
 
diff --git a/lisp/international/robin.el b/lisp/international/robin.el
index 897075f0faf..8254180fcc1 100644
--- a/lisp/international/robin.el
+++ b/lisp/international/robin.el
@@ -576,7 +576,7 @@ used."
 (provide 'robin)
 
 ;; Local Variables:
-;; coding: utf-8-emacs
+;; coding: utf-8
 ;; End:
 
 ;;; robin.el ends here
diff --git a/lisp/language/ethio-util.el b/lisp/language/ethio-util.el
index 8575e7b6a93..a27f74907b0 100644
--- a/lisp/language/ethio-util.el
+++ b/lisp/language/ethio-util.el
@@ -2071,5 +2071,3 @@ mark."
 (provide 'ethio-util)
 
 ;;; ethio-util.el ends here
-
-;;; ethio-util.el ends here
diff --git a/lisp/org/ox-ascii.el b/lisp/org/ox-ascii.el
index 65b6f7528dd..a3284d9b905 100644
--- a/lisp/org/ox-ascii.el
+++ b/lisp/org/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