Merge from origin/emacs-26

2fcf2df Fix copyright years by hand
26bed8b Update copyright year to 2019
2814292 Fix value of default frame height.  (Bug#33921)
This commit is contained in:
Paul Eggert 2018-12-31 17:57:29 -08:00
commit ba809612c0
2626 changed files with 2716 additions and 2683 deletions

View file

@ -1,6 +1,6 @@
;;; image-file.el --- support for visiting image files
;;
;; Copyright (C) 2000-2018 Free Software Foundation, Inc.
;; Copyright (C) 2000-2019 Free Software Foundation, Inc.
;;
;; Author: Miles Bader <miles@gnu.org>
;; Keywords: multimedia