main 1c917791 076/257: Merge branch 'master' into elpa

[Tassilo Horn]

branch: main
commit 1c9177918642cc84162148117a06ff4c6a00a854
Merge: 89ef95af 7ce3c117
Author: Tassilo Horn <tsdh@gnu.org>
Commit: Tassilo Horn <tsdh@gnu.org>

    Merge branch 'master' into elpa
---
 tex-jp.el | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tex-jp.el b/tex-jp.el
index 717e1ab5..3771f449 100644
--- a/tex-jp.el
+++ b/tex-jp.el
@@ -1,7 +1,6 @@
 ;;; tex-jp.el --- Support for Japanese TeX.  -*- coding: iso-2022-jp-unix; -*-
 
-;; Copyright (C) 2002-2007, 2012, 2016  Free Software Foundation, Inc.
-;; Copyright (C) 1999, 2001 Hidenobu Nabetani <nabe@debian.or.jp>
+;; Copyright (C) 1999, 2001-2007, 2012, 2016  Free Software Foundation, Inc.
 
 ;; Author:     KOBAYASHI Shinji <koba@flab.fujitsu.co.jp>,
 ;;             Hidenobu Nabetani <nabe@debian.or.jp>