Merge from origin/emacs-25

2e2a806 Fix copyright years by hand
5badc81 Update copyright year to 2017
This commit is contained in:
Paul Eggert 2017-01-01 01:10:47 -08:00
commit bcf244ef9b
2494 changed files with 10381 additions and 2526 deletions

View file

@ -1,7 +1,7 @@
;;; derived.el --- allow inheritance of major modes
;; (formerly mode-clone.el)
;; Copyright (C) 1993-1994, 1999, 2001-2016 Free Software Foundation,
;; Copyright (C) 1993-1994, 1999, 2001-2017 Free Software Foundation,
;; Inc.
;; Author: David Megginson (dmeggins@aix1.uottawa.ca)