74 files changed, 41 insertions, 158 deletions

diff --git a/admin/authors.el b/admin/authors.el
index 092da68dbce..3d7850af57d 100644
--- a/admin/authors.el
+++ b/admin/authors.el
@@ -1,4 +1,4 @@
-;;; authors.el --- utility for maintaining Emacs's AUTHORS file -*-coding: utf-8 -*-
+;;; authors.el --- utility for maintaining Emacs's AUTHORS file
 
 ;; Copyright (C) 2000-2015 Free Software Foundation, Inc.
 
diff --git a/etc/themes/wombat-theme.el b/etc/themes/wombat-theme.el
index d49f9bf636f..734731a1ffa 100644
--- a/etc/themes/wombat-theme.el
+++ b/etc/themes/wombat-theme.el
@@ -1,4 +1,4 @@
-;;; wombat-theme.el --- Custom face theme for Emacs  -*-coding: utf-8 -*-
+;;; wombat-theme.el --- Custom face theme for Emacs
 
 ;; Copyright (C) 2011-2015 Free Software Foundation, Inc.
 
diff --git a/lisp/battery.el b/lisp/battery.el
index b9ce5b49093..b33e906f21e 100644
--- a/lisp/battery.el
+++ b/lisp/battery.el
@@ -1,4 +1,4 @@
-;;; battery.el --- display battery status information  -*- coding: utf-8 -*-
+;;; battery.el --- display battery status information
 
 ;; Copyright (C) 1997-1998, 2000-2015 Free Software Foundation, Inc.
 
diff --git a/lisp/calc/calc-aent.el b/lisp/calc/calc-aent.el
index 2319c484498..6336c3362fb 100644
--- a/lisp/calc/calc-aent.el
+++ b/lisp/calc/calc-aent.el
@@ -1266,7 +1266,6 @@ If the current Calc language does not use placeholders, return nil."
 (provide 'calc-aent)
 
 ;; Local variables:
-;; coding: utf-8
 ;; generated-autoload-file: "calc-loaddefs.el"
 ;; End:
 
diff --git a/lisp/calc/calc-ext.el b/lisp/calc/calc-ext.el
index 933c446875e..9adf66f23bd 100644
--- a/lisp/calc/calc-ext.el
+++ b/lisp/calc/calc-ext.el
@@ -3507,8 +3507,4 @@ A key may contain additional specs for Inverse, Hyperbolic, and Inv+Hyp.")
 
 (provide 'calc-ext)
 
-;; Local variables:
-;; coding: utf-8
-;; End:
-
 ;;; calc-ext.el ends here
diff --git a/lisp/calc/calc-lang.el b/lisp/calc/calc-lang.el
index 6b3b949424d..94366060a41 100644
--- a/lisp/calc/calc-lang.el
+++ b/lisp/calc/calc-lang.el
@@ -2525,8 +2525,4 @@ order to Calc's."
 
 (provide 'calc-lang)
 
-;; Local variables:
-;; coding: utf-8
-;; End:
-
 ;;; calc-lang.el ends here
diff --git a/lisp/calc/calc-store.el b/lisp/calc/calc-store.el
index 21209c66677..2684e627883 100644
--- a/lisp/calc/calc-store.el
+++ b/lisp/calc/calc-store.el
@@ -677,8 +677,4 @@
 
 (provide 'calc-store)
 
-;; Local variables:
-;; coding: utf-8
-;; End:
-
 ;;; calc-store.el ends here
diff --git a/lisp/calc/calc-units.el b/lisp/calc/calc-units.el
index 4373e52eb87..a450d8f82a9 100644
--- a/lisp/calc/calc-units.el
+++ b/lisp/calc/calc-units.el
@@ -2163,8 +2163,4 @@ If non-nil, return a list consisting of the note and the cents coefficient."
 
 (provide 'calc-units)
 
-;; Local variables:
-;; coding: utf-8
-;; End:
-
 ;;; calc-units.el ends here
diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el
index b4b0ad8b185..de7bfb8cbef 100644
--- a/lisp/calc/calc.el
+++ b/lisp/calc/calc.el
@@ -3918,8 +3918,4 @@ See Info node `(calc)Defining Functions'."
 
 (provide 'calc)
 
-;; Local variables:
-;; coding: utf-8
-;; End:
-
 ;;; calc.el ends here
diff --git a/lisp/calc/calccomp.el b/lisp/calc/calccomp.el
index a3432c14b15..119f41993c3 100644
--- a/lisp/calc/calccomp.el
+++ b/lisp/calc/calccomp.el
@@ -1670,8 +1670,4 @@
 
 (provide 'calccomp)
 
-;; Local variables:
-;; coding: utf-8
-;; End:
-
 ;;; calccomp.el ends here
diff --git a/lisp/calendar/cal-bahai.el b/lisp/calendar/cal-bahai.el
index 998dc6c7056..d0b3021ea60 100644
--- a/lisp/calendar/cal-bahai.el
+++ b/lisp/calendar/cal-bahai.el
@@ -324,8 +324,4 @@ Prefix argument ARG will make the entry nonmarking."
 
 (provide 'cal-bahai)
 
-;; Local Variables:
-;; coding: utf-8
-;; End:
-
 ;;; cal-bahai.el ends here
diff --git a/lisp/calendar/cal-french.el b/lisp/calendar/cal-french.el
index b88adb9b636..33e8e8e0618 100644
--- a/lisp/calendar/cal-french.el
+++ b/lisp/calendar/cal-french.el
@@ -256,8 +256,4 @@ Echo French Revolutionary date unless NOECHO is non-nil."
 
 (provide 'cal-french)
 
-;; Local Variables:
-;; coding: utf-8
-;; End:
-
 ;;; cal-french.el ends here
diff --git a/lisp/calendar/cal-menu.el b/lisp/calendar/cal-menu.el
index 251d811bc52..211f16c22f7 100644
--- a/lisp/calendar/cal-menu.el
+++ b/lisp/calendar/cal-menu.el
@@ -280,8 +280,4 @@ is non-nil."
 
 (provide 'cal-menu)
 
-;; Local Variables:
-;; coding: utf-8
-;; End:
-
 ;;; cal-menu.el ends here
diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index 86e5477aa6f..f188b68b050 100644
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -2635,7 +2635,6 @@ If called by a mouse-event, pops up a menu with the result."
 
 ;; Local variables:
 ;; byte-compile-dynamic: t
-;; coding: utf-8
 ;; End:
 
 ;;; calendar.el ends here
diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el
index a1370bbc5e3..7382abf67fc 100644
--- a/lisp/calendar/diary-lib.el
+++ b/lisp/calendar/diary-lib.el
@@ -2534,8 +2534,4 @@ entry is found the user is asked to confirm its addition."
 
 (provide 'diary-lib)
 
-;; Local Variables:
-;; coding: utf-8
-;; End:
-
 ;;; diary-lib.el ends here
diff --git a/lisp/calendar/holidays.el b/lisp/calendar/holidays.el
index bd3a558dc2c..307ab4deb82 100644
--- a/lisp/calendar/holidays.el
+++ b/lisp/calendar/holidays.el
@@ -823,8 +823,4 @@ arguments, it returns the date of Pascha (Greek Orthodox Easter)."
 
 (provide 'holidays)
 
-;; Local Variables:
-;; coding: utf-8
-;; End:
-
 ;;; holidays.el ends here
diff --git a/lisp/calendar/icalendar.el b/lisp/calendar/icalendar.el
index 4b71530febb..0955e72aa04 100644
--- a/lisp/calendar/icalendar.el
+++ b/lisp/calendar/icalendar.el
@@ -1,4 +1,4 @@
-;;; icalendar.el --- iCalendar implementation -*-coding: utf-8 -*-
+;;; icalendar.el --- iCalendar implementation
 
 ;; Copyright (C) 2002-2015 Free Software Foundation, Inc.
 
diff --git a/lisp/color.el b/lisp/color.el
index 3471243a656..d572222021b 100644
--- a/lisp/color.el
+++ b/lisp/color.el
@@ -1,4 +1,4 @@
-;;; color.el --- Color manipulation library -*- coding: utf-8; lexical-binding:t -*-
+;;; color.el --- Color manipulation library -*- lexical-binding:t -*-
 
 ;; Copyright (C) 2010-2015 Free Software Foundation, Inc.
 
diff --git a/lisp/desktop.el b/lisp/desktop.el
index 9d023e3dc89..e95a8c9288b 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -1590,7 +1590,3 @@ If there are no buffers left to create, kill the timer."
 (provide 'desktop)
 
 ;;; desktop.el ends here
-
-;; Local Variables:
-;; coding: utf-8
-;; End:
diff --git a/lisp/dnd.el b/lisp/dnd.el
index 3e161dcfb51..d4fb0889f0a 100644
--- a/lisp/dnd.el
+++ b/lisp/dnd.el
@@ -1,4 +1,4 @@
-;;; dnd.el --- drag and drop support.  -*- coding: utf-8 -*-
+;;; dnd.el --- drag and drop support
 
 ;; Copyright (C) 2005-2015 Free Software Foundation, Inc.
 
diff --git a/lisp/emacs-lisp/cconv.el b/lisp/emacs-lisp/cconv.el
index 0f75f0a1664..efa9a3da011 100644
--- a/lisp/emacs-lisp/cconv.el
+++ b/lisp/emacs-lisp/cconv.el
@@ -1,4 +1,4 @@
-;;; cconv.el --- Closure conversion for statically scoped Emacs lisp. -*- lexical-binding: t; coding: utf-8 -*-
+;;; cconv.el --- Closure conversion for statically scoped Emacs lisp. -*- lexical-binding: t -*-
 
 ;; Copyright (C) 2011-2015 Free Software Foundation, Inc.
 
diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index d5d8ef0a8a1..c42094f0f0c 100644
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -1,4 +1,4 @@
-;;; cl-macs.el --- Common Lisp macros  -*- lexical-binding: t; coding: utf-8 -*-
+;;; cl-macs.el --- Common Lisp macros  -*- lexical-binding: t -*-
 
 ;; Copyright (C) 1993, 2001-2015 Free Software Foundation, Inc.
 
diff --git a/lisp/emacs-lisp/copyright.el b/lisp/emacs-lisp/copyright.el
index 1317d699d25..50f880d7b33 100644
--- a/lisp/emacs-lisp/copyright.el
+++ b/lisp/emacs-lisp/copyright.el
@@ -375,9 +375,4 @@ If FIX is non-nil, run `copyright-fix-years' instead."
 
 (provide 'copyright)
 
-;; For the copyright sign:
-;; Local Variables:
-;; coding: utf-8
-;; End:
-
 ;;; copyright.el ends here
diff --git a/lisp/emacs-lisp/macroexp.el b/lisp/emacs-lisp/macroexp.el
index 2c33d39c32f..8bf49b01689 100644
--- a/lisp/emacs-lisp/macroexp.el
+++ b/lisp/emacs-lisp/macroexp.el
@@ -1,4 +1,4 @@
-;;; macroexp.el --- Additional macro-expansion support -*- lexical-binding: t; coding: utf-8 -*-
+;;; macroexp.el --- Additional macro-expansion support -*- lexical-binding: t -*-
 ;;
 ;; Copyright (C) 2004-2015 Free Software Foundation, Inc.
 ;;
diff --git a/lisp/emacs-lisp/pcase.el b/lisp/emacs-lisp/pcase.el
index ea4f38add76..8bcb447cfbb 100644
--- a/lisp/emacs-lisp/pcase.el
+++ b/lisp/emacs-lisp/pcase.el
@@ -1,4 +1,4 @@
-;;; pcase.el --- ML-style pattern-matching macro for Elisp -*- lexical-binding: t; coding: utf-8 -*-
+;;; pcase.el --- ML-style pattern-matching macro for Elisp -*- lexical-binding: t -*-
 
 ;; Copyright (C) 2010-2015 Free Software Foundation, Inc.
 
diff --git a/lisp/emacs-lisp/shadow.el b/lisp/emacs-lisp/shadow.el
index 17e3be7d3ff..229bb587488 100644
--- a/lisp/emacs-lisp/shadow.el
+++ b/lisp/emacs-lisp/shadow.el
@@ -286,7 +286,3 @@ version unless you know what you are doing.\n")
 (provide 'shadow)
 
 ;;; shadow.el ends here
-
-;; Local Variables:
-;; coding: utf-8
-;; End:
diff --git a/lisp/emacs-lisp/tabulated-list.el b/lisp/emacs-lisp/tabulated-list.el
index cd61eb9ae56..47ecd2b7922 100644
--- a/lisp/emacs-lisp/tabulated-list.el
+++ b/lisp/emacs-lisp/tabulated-list.el
@@ -581,8 +581,4 @@ as the ewoc pretty-printer."
 
 (provide 'tabulated-list)
 
-;; Local Variables:
-;; coding: utf-8
-;; End:
-
 ;;; tabulated-list.el ends here
diff --git a/lisp/filesets.el b/lisp/filesets.el
index ab332bbeff0..28d0cd85582 100644
--- a/lisp/filesets.el
+++ b/lisp/filesets.el
@@ -1,4 +1,4 @@
-;;; filesets.el --- handle group of files -*- coding: utf-8 -*-
+;;; filesets.el --- handle group of files
 
 ;; Copyright (C) 2002-2015 Free Software Foundation, Inc.
 
diff --git a/lisp/fringe.el b/lisp/fringe.el
index 8f40c46c3d3..8524f2ad2a2 100644
--- a/lisp/fringe.el
+++ b/lisp/fringe.el
@@ -1,4 +1,4 @@
-;;; fringe.el --- fringe setup and control  -*- coding: utf-8 -*-
+;;; fringe.el --- fringe setup and control
 
 ;; Copyright (C) 2002-2015 Free Software Foundation, Inc.
 
diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el
index 0a0a0b346c0..719cb50ac77 100644
--- a/lisp/htmlfontify.el
+++ b/lisp/htmlfontify.el
@@ -2433,8 +2433,4 @@ Use a fallback method for obtaining the rgb values for a color.
 
 (provide 'htmlfontify)
 
-;; Local Variables:
-;; coding: utf-8
-;; End:
-
 ;;; htmlfontify.el ends here
diff --git a/lisp/ibuffer.el b/lisp/ibuffer.el
index 5065b661101..92eb068df34 100644
--- a/lisp/ibuffer.el
+++ b/lisp/ibuffer.el
@@ -2974,8 +2974,4 @@ defaults to one.
 
 (run-hooks 'ibuffer-load-hook)
 
-;; Local Variables:
-;; coding: utf-8
-;; End:
-
 ;;; ibuffer.el ends here
diff --git a/lisp/mail/footnote.el b/lisp/mail/footnote.el
index 86bb9e89618..839e24c8a90 100644
--- a/lisp/mail/footnote.el
+++ b/lisp/mail/footnote.el
@@ -1,4 +1,4 @@
-;;; footnote.el --- footnote support for message mode  -*- coding: utf-8;-*-
+;;; footnote.el --- footnote support for message mode
 
 ;; Copyright (C) 1997, 2000-2015 Free Software Foundation, Inc.
 
diff --git a/lisp/mail/mail-extr.el b/lisp/mail/mail-extr.el
index a7057ca21c8..35138985ed7 100644
--- a/lisp/mail/mail-extr.el
+++ b/lisp/mail/mail-extr.el
@@ -1,4 +1,4 @@
-;;; mail-extr.el --- extract full name and address from RFC 822 mail header -*- coding: utf-8 -*-
+;;; mail-extr.el --- extract full name and address from RFC 822 mail header
 
 ;; Copyright (C) 1991-1994, 1997, 2001-2015 Free Software Foundation,
 ;; Inc.
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 4c0f2b98257..9269d7f7d83 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -2078,7 +2078,6 @@ you can move to one of them and type C-c C-c to recover that one."
 
 ;; Local Variables:
 ;; byte-compile-dynamic: t
-;; coding: utf-8
 ;; End:
 
 ;;; sendmail.el ends here
diff --git a/lisp/mail/uce.el b/lisp/mail/uce.el
index 74939d1c975..5db135728ea 100644
--- a/lisp/mail/uce.el
+++ b/lisp/mail/uce.el
@@ -375,7 +375,3 @@ You might need to set `uce-mail-reader' before using this."
 (provide 'uce)
 
 ;;; uce.el ends here
-
-;; Local Variables:
-;; coding: utf-8
-;; End:
diff --git a/lisp/man.el b/lisp/man.el
index fbfa6f0c7f7..90d658a3e76 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -1,4 +1,4 @@
-;;; man.el --- browse UNIX manual pages  -*- coding: utf-8 -*-
+;;; man.el --- browse UNIX manual pages
 
 ;; Copyright (C) 1993-1994, 1996-1997, 2001-2015 Free Software
 ;; Foundation, Inc.
diff --git a/lisp/net/eudc-bob.el b/lisp/net/eudc-bob.el
index f01f671de9e..e48af4dc205 100644
--- a/lisp/net/eudc-bob.el
+++ b/lisp/net/eudc-bob.el
@@ -1,4 +1,4 @@
-;;; eudc-bob.el --- Binary Objects Support for EUDC -*- coding: utf-8 -*-
+;;; eudc-bob.el --- Binary Objects Support for EUDC
 
 ;; Copyright (C) 1999-2015 Free Software Foundation, Inc.
 
diff --git a/lisp/net/eudc-export.el b/lisp/net/eudc-export.el
index ec0914d636b..c60911ff0c5 100644
--- a/lisp/net/eudc-export.el
+++ b/lisp/net/eudc-export.el
@@ -1,4 +1,4 @@
-;;; eudc-export.el --- functions to export EUDC query results -*- coding: utf-8 -*-
+;;; eudc-export.el --- functions to export EUDC query results
 
 ;; Copyright (C) 1998-2015 Free Software Foundation, Inc.
 
diff --git a/lisp/net/eudc-hotlist.el b/lisp/net/eudc-hotlist.el
index 7416ad090eb..55a2fd9a20a 100644
--- a/lisp/net/eudc-hotlist.el
+++ b/lisp/net/eudc-hotlist.el
@@ -1,4 +1,4 @@
-;;; eudc-hotlist.el --- hotlist management for EUDC -*- coding: utf-8 -*-
+;;; eudc-hotlist.el --- hotlist management for EUDC
 
 ;; Copyright (C) 1998-2015 Free Software Foundation, Inc.
 
diff --git a/lisp/net/eudc-vars.el b/lisp/net/eudc-vars.el
index 5e994a3a38f..8cffa8e466a 100644
--- a/lisp/net/eudc-vars.el
+++ b/lisp/net/eudc-vars.el
@@ -1,4 +1,4 @@
-;;; eudc-vars.el --- Emacs Unified Directory Client -*- coding: utf-8 -*-
+;;; eudc-vars.el --- Emacs Unified Directory Client
 
 ;; Copyright (C) 1998-2015 Free Software Foundation, Inc.
 
diff --git a/lisp/net/eudc.el b/lisp/net/eudc.el
index 66dbc65da9c..7280d9d2625 100644
--- a/lisp/net/eudc.el
+++ b/lisp/net/eudc.el
@@ -1,4 +1,4 @@
-;;; eudc.el --- Emacs Unified Directory Client -*- coding: utf-8 -*-
+;;; eudc.el --- Emacs Unified Directory Client
 
 ;; Copyright (C) 1998-2015 Free Software Foundation, Inc.
 
diff --git a/lisp/net/eudcb-bbdb.el b/lisp/net/eudcb-bbdb.el
index bd5d4536aab..0545304b4a3 100644
--- a/lisp/net/eudcb-bbdb.el
+++ b/lisp/net/eudcb-bbdb.el
@@ -1,4 +1,4 @@
-;;; eudcb-bbdb.el --- Emacs Unified Directory Client - BBDB Backend -*- coding: utf-8 -*-
+;;; eudcb-bbdb.el --- Emacs Unified Directory Client - BBDB Backend
 
 ;; Copyright (C) 1998-2015 Free Software Foundation, Inc.
 
diff --git a/lisp/net/eudcb-ldap.el b/lisp/net/eudcb-ldap.el
index d22dff615ee..b50d29ddae8 100644
--- a/lisp/net/eudcb-ldap.el
+++ b/lisp/net/eudcb-ldap.el
@@ -1,4 +1,4 @@
-;;; eudcb-ldap.el --- Emacs Unified Directory Client - LDAP Backend -*- coding: utf-8 -*-
+;;; eudcb-ldap.el --- Emacs Unified Directory Client - LDAP Backend
 
 ;; Copyright (C) 1998-2015 Free Software Foundation, Inc.
 
diff --git a/lisp/net/eudcb-ph.el b/lisp/net/eudcb-ph.el
index a135e9ba059..f144bf695f5 100644
--- a/lisp/net/eudcb-ph.el
+++ b/lisp/net/eudcb-ph.el
@@ -1,4 +1,4 @@
-;;; eudcb-ph.el --- Emacs Unified Directory Client - CCSO PH/QI Backend -*- coding: utf-8 -*-
+;;; eudcb-ph.el --- Emacs Unified Directory Client - CCSO PH/QI Backend
 
 ;; Copyright (C) 1998-2015 Free Software Foundation, Inc.
 
diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index 0ce77b9055c..fb450e8a95e 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -2050,8 +2050,4 @@ The preference is a float determined from `shr-prefer-media-type'."
 
 (provide 'shr)
 
-;; Local Variables:
-;; coding: utf-8
-;; End:
-
 ;;; shr.el ends here
diff --git a/lisp/obsolete/iso-insert.el b/lisp/obsolete/iso-insert.el
index 358d0fc4bbe..3df786e1f2b 100644
--- a/lisp/obsolete/iso-insert.el
+++ b/lisp/obsolete/iso-insert.el
@@ -1,4 +1,4 @@
-;;; iso-insert.el --- insert functions for ISO 8859/1  -*- coding: utf-8;-*-
+;;; iso-insert.el --- insert functions for ISO 8859/1
 
 ;; Copyright (C) 1987, 1994, 2001-2015 Free Software Foundation, Inc.
 
diff --git a/lisp/play/5x5.el b/lisp/play/5x5.el
index 0258f1e4e4a..a07b381d057 100644
--- a/lisp/play/5x5.el
+++ b/lisp/play/5x5.el
@@ -1,4 +1,4 @@
-;;; 5x5.el --- simple little puzzle game -*- coding: utf-8 -*-
+;;; 5x5.el --- simple little puzzle game
 
 ;; Copyright (C) 1999-2015 Free Software Foundation, Inc.
 
diff --git a/lisp/play/bubbles.el b/lisp/play/bubbles.el
index 1e06f1ba9de..4dc4c774550 100644
--- a/lisp/play/bubbles.el
+++ b/lisp/play/bubbles.el
@@ -1,4 +1,4 @@
-;;; bubbles.el --- Puzzle game for Emacs -*- coding: utf-8 -*-
+;;; bubbles.el --- Puzzle game for Emacs
 
 ;; Copyright (C) 2007-2015 Free Software Foundation, Inc.
 
diff --git a/lisp/play/handwrite.el b/lisp/play/handwrite.el
index 62a8fe4bb0b..30e8357e86a 100644
--- a/lisp/play/handwrite.el
+++ b/lisp/play/handwrite.el
@@ -1,4 +1,4 @@
-;;; handwrite.el --- turns your emacs buffer into a handwritten document -*- coding: utf-8; -*-
+;;; handwrite.el --- turns your emacs buffer into a handwritten document
 
 ;; Copyright (C) 1996, 2001-2015 Free Software Foundation, Inc.
 
diff --git a/lisp/play/morse.el b/lisp/play/morse.el
index bbd3e6bc970..e35147dceb4 100644
--- a/lisp/play/morse.el
+++ b/lisp/play/morse.el
@@ -1,4 +1,4 @@
-;;; morse.el --- convert text to morse code and back             -*- coding: utf-8 -*-
+;;; morse.el --- convert text to morse code and back
 
 ;; Copyright (C) 1995, 2001-2015 Free Software Foundation, Inc.
 
diff --git a/lisp/progmodes/cmacexp.el b/lisp/progmodes/cmacexp.el
index 0f5b1bb8c6a..9953cae2bef 100644
--- a/lisp/progmodes/cmacexp.el
+++ b/lisp/progmodes/cmacexp.el
@@ -405,7 +405,3 @@ Optional arg DISPLAY non-nil means show messages in the echo area."
       (kill-buffer outbuf))))
 
 ;;; cmacexp.el ends here
-
-;; Local Variables:
-;; coding: utf-8
-;; End:
diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el
index 0ac59e1a1ea..5c938fd1a93 100644
--- a/lisp/progmodes/f90.el
+++ b/lisp/progmodes/f90.el
@@ -2382,8 +2382,4 @@ escape character."
 
 (provide 'f90)
 
-;; Local Variables:
-;; coding: utf-8
-;; End:
-
 ;;; f90.el ends here
diff --git a/lisp/progmodes/hideshow.el b/lisp/progmodes/hideshow.el
index 845abc09842..dba497b1f41 100644
--- a/lisp/progmodes/hideshow.el
+++ b/lisp/progmodes/hideshow.el
@@ -1,4 +1,4 @@
-;;; hideshow.el --- minor mode cmds to selectively display code/comment blocks -*- coding: utf-8 -*-
+;;; hideshow.el --- minor mode cmds to selectively display code/comment blocks
 
 ;; Copyright (C) 1994-2015 Free Software Foundation, Inc.
 
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index ab994f38252..f2140159e64 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -3571,8 +3571,4 @@ If one hasn't been set, or if it's stale, prompt for a new one."
 
 (provide 'js)
 
-;; Local Variables:
-;; coding: utf-8
-;; End:
-
 ;; js.el ends here
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index b641e300163..6ff12b54976 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -5123,7 +5123,6 @@ returned as is."
 (provide 'python)
 
 ;; Local Variables:
-;; coding: utf-8
 ;; indent-tabs-mode: nil
 ;; End:
 
diff --git a/lisp/ruler-mode.el b/lisp/ruler-mode.el
index 4f68909ed4c..f1b5da497c9 100644
--- a/lisp/ruler-mode.el
+++ b/lisp/ruler-mode.el
@@ -775,8 +775,4 @@ Optional argument PROPS specifies other text properties to apply."
 
 (provide 'ruler-mode)
 
-;; Local Variables:
-;; coding: utf-8
-;; End:
-
 ;;; ruler-mode.el ends here
diff --git a/lisp/skeleton.el b/lisp/skeleton.el
index 69bd500fa95..67d9faca3e4 100644
--- a/lisp/skeleton.el
+++ b/lisp/skeleton.el
@@ -1,4 +1,4 @@
-;;; skeleton.el --- Lisp language extension for writing statement skeletons -*- coding: utf-8 -*-
+;;; skeleton.el --- Lisp language extension for writing statement skeletons
 
 ;; Copyright (C) 1993-1996, 2001-2015 Free Software Foundation, Inc.
 
diff --git a/lisp/subr.el b/lisp/subr.el
index b1b363864f9..e1769074ee5 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1,4 +1,4 @@
-;;; subr.el --- basic lisp subroutines for Emacs  -*- coding: utf-8; lexical-binding:t -*-
+;;; subr.el --- basic lisp subroutines for Emacs  -*- lexical-binding:t -*-
 
 ;; Copyright (C) 1985-1986, 1992, 1994-1995, 1999-2015 Free Software
 ;; Foundation, Inc.
diff --git a/lisp/tempo.el b/lisp/tempo.el
index 6e2f978b5b7..93df15a8934 100644
--- a/lisp/tempo.el
+++ b/lisp/tempo.el
@@ -759,7 +759,3 @@ space bar, and looks something like this:
 (provide 'tempo)
 
 ;;; tempo.el ends here
-
-;; Local Variables:
-;; coding: utf-8
-;; End:
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index ebd76a679a3..5eb6f115f8b 100644
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -1,4 +1,4 @@
-;;; x-win.el --- parse relevant switches and set up for X  -*-coding: utf-8; lexical-binding:t -*-
+;;; x-win.el --- parse relevant switches and set up for X  -*- lexical-binding:t -*-
 
 ;; Copyright (C) 1993-1994, 2001-2015 Free Software Foundation, Inc.
 
diff --git a/lisp/textmodes/conf-mode.el b/lisp/textmodes/conf-mode.el
index 770571a264e..7d81bbca7d5 100644
--- a/lisp/textmodes/conf-mode.el
+++ b/lisp/textmodes/conf-mode.el
@@ -1,4 +1,4 @@
-;;; conf-mode.el --- Simple major mode for editing conf/ini/properties files -*- coding: utf-8 -*-
+;;; conf-mode.el --- Simple major mode for editing conf/ini/properties files
 
 ;; Copyright (C) 2004-2015 Free Software Foundation, Inc.
 
diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index 5f2fbcda04c..a97facf5427 100644
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -1,4 +1,4 @@
-;;; fill.el --- fill commands for Emacs         -*- coding: utf-8 -*-
+;;; fill.el --- fill commands for Emacs
 
 ;; Copyright (C) 1985-1986, 1992, 1994-1997, 1999, 2001-2015 Free
 ;; Software Foundation, Inc.
diff --git a/lisp/textmodes/paragraphs.el b/lisp/textmodes/paragraphs.el
index 8bcc71ed531..58c65678802 100644
--- a/lisp/textmodes/paragraphs.el
+++ b/lisp/textmodes/paragraphs.el
@@ -536,8 +536,4 @@ the current sentence with the one containing the mark."
   (interactive "*p")
   (transpose-subr 'forward-sentence arg))
 
-;; Local Variables:
-;; coding: utf-8
-;; End:
-
 ;;; paragraphs.el ends here
diff --git a/lisp/textmodes/po.el b/lisp/textmodes/po.el
index 99ec2916067..a5f39461498 100644
--- a/lisp/textmodes/po.el
+++ b/lisp/textmodes/po.el
@@ -1,4 +1,4 @@
-;;; po.el --- basic support of PO translation files -*- coding: utf-8; -*-
+;;; po.el --- basic support of PO translation files
 
 ;; Copyright (C) 1995-1998, 2000-2015 Free Software Foundation, Inc.
 
diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el
index bf15b2628f9..cbeded2c61b 100644
--- a/lisp/textmodes/tex-mode.el
+++ b/lisp/textmodes/tex-mode.el
@@ -1,4 +1,4 @@
-;;; tex-mode.el --- TeX, LaTeX, and SliTeX mode commands -*- coding: utf-8 -*-
+;;; tex-mode.el --- TeX, LaTeX, and SliTeX mode commands
 
 ;; Copyright (C) 1985-1986, 1989, 1992, 1994-1999, 2001-2015 Free
 ;; Software Foundation, Inc.
diff --git a/lisp/textmodes/texinfo.el b/lisp/textmodes/texinfo.el
index 57218177d7b..2b606ed002e 100644
--- a/lisp/textmodes/texinfo.el
+++ b/lisp/textmodes/texinfo.el
@@ -1,4 +1,4 @@
-;;; texinfo.el --- major mode for editing Texinfo files -*- coding: utf-8 -*-
+;;; texinfo.el --- major mode for editing Texinfo files
 
 ;; Copyright (C) 1985, 1988-1993, 1996-1997, 2000-2015 Free Software
 ;; Foundation, Inc.
diff --git a/lisp/textmodes/tildify.el b/lisp/textmodes/tildify.el
index 0e645fcdd38..f1a42f2b688 100644
--- a/lisp/textmodes/tildify.el
+++ b/lisp/textmodes/tildify.el
@@ -508,9 +508,4 @@ variable will be set to the representation."
 
 (provide 'tildify)
 
-
-;; Local variables:
-;; coding: utf-8
-;; End:
-
 ;;; tildify.el ends here
diff --git a/lisp/time.el b/lisp/time.el
index d35f5b93964..dec594061a4 100644
--- a/lisp/time.el
+++ b/lisp/time.el
@@ -1,4 +1,4 @@
-;;; time.el --- display time, load and mail indicator in mode line of Emacs -*-coding: utf-8 -*-
+;;; time.el --- display time, load and mail indicator in mode line of Emacs
 
 ;; Copyright (C) 1985-1987, 1993-1994, 1996, 2000-2015 Free Software
 ;; Foundation, Inc.
diff --git a/lisp/vc/cvs-status.el b/lisp/vc/cvs-status.el
index dc43094796e..cf1f49cbeee 100644
--- a/lisp/vc/cvs-status.el
+++ b/lisp/vc/cvs-status.el
@@ -1,4 +1,4 @@
-;;; cvs-status.el --- major mode for browsing `cvs status' output -*- coding: utf-8; lexical-binding: t -*-
+;;; cvs-status.el --- major mode for browsing `cvs status' output -*- lexical-binding: t -*-
 
 ;; Copyright (C) 1999-2015 Free Software Foundation, Inc.
 
diff --git a/lisp/wdired.el b/lisp/wdired.el
index a9e1e2acc2a..8ee9a83d1d2 100644
--- a/lisp/wdired.el
+++ b/lisp/wdired.el
@@ -849,7 +849,6 @@ Like original function but it skips read-only words."
 (provide 'wdired)
 
 ;; Local Variables:
-;; coding: utf-8
 ;; byte-compile-dynamic: t
 ;; End:
 
diff --git a/lisp/woman.el b/lisp/woman.el
index 8fe1bfa0446..81319fa6a9f 100644
--- a/lisp/woman.el
+++ b/lisp/woman.el
@@ -4627,9 +4627,4 @@ logging the message."
 
 (provide 'woman)
 
-
-;; Local Variables:
-;; coding: utf-8
-;; End:
-
 ;;; woman.el ends here
diff --git a/lisp/x-dnd.el b/lisp/x-dnd.el
index b99db489a99..8ec5dfc65c0 100644
--- a/lisp/x-dnd.el
+++ b/lisp/x-dnd.el
@@ -1,4 +1,4 @@
-;;; x-dnd.el --- drag and drop support for X  -*- coding: utf-8 -*-
+;;; x-dnd.el --- drag and drop support for X
 
 ;; Copyright (C) 2004-2015 Free Software Foundation, Inc.
 
diff --git a/test/automated/mule-util.el b/test/automated/mule-util.el
index 038881a7915..24b56c0969b 100644
--- a/test/automated/mule-util.el
+++ b/test/automated/mule-util.el
@@ -1,4 +1,4 @@
-;;; mule-util --- tests for international/mule-util.el -*- coding: utf-8; -*-
+;;; mule-util --- tests for international/mule-util.el
 
 ;; Copyright (C) 2002-2015 Free Software Foundation, Inc.
 
diff --git a/test/automated/python-tests.el b/test/automated/python-tests.el
index d9b4c3e1b06..44b05e2b476 100644
--- a/test/automated/python-tests.el
+++ b/test/automated/python-tests.el
@@ -5216,7 +5216,6 @@ class SomeClass:
 (provide 'python-tests)
 
 ;; Local Variables:
-;; coding: utf-8
 ;; indent-tabs-mode: nil
 ;; End: