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 @@
;;; timer.el --- run a function with args at some time in future -*- lexical-binding: t -*-
;; Copyright (C) 1996, 2001-2018 Free Software Foundation, Inc.
;; Copyright (C) 1996, 2001-2019 Free Software Foundation, Inc.
;; Maintainer: emacs-devel@gnu.org
;; Package: emacs